diff --git a/api/UniversalCraft.api b/api/UniversalCraft.api index eae3df4..1a6e4d1 100644 --- a/api/UniversalCraft.api +++ b/api/UniversalCraft.api @@ -90,14 +90,14 @@ public class gg/essential/universal/UGraphics { public static field EMPTY_WITH_FONT_ID Lnet/minecraft/network/chat/Style; @1.16.2-forge public static field EMPTY_WITH_FONT_ID Lnet/minecraft/util/text/Style; - @1.16.2-fabric,1.17.1-fabric,1.18.1-fabric,1.19-fabric,1.19.1-fabric,1.19.2-fabric,1.19.3-fabric,1.19.4-fabric,1.20-fabric,1.20.1-fabric,1.20.2-fabric,1.20.4-fabric,1.20.6-fabric + @1.16.2-fabric,1.17.1-fabric,1.18.1-fabric,1.19-fabric,1.19.1-fabric,1.19.2-fabric,1.19.3-fabric,1.19.4-fabric,1.20-fabric,1.20.1-fabric,1.20.2-fabric,1.20.4-fabric,1.20.6-fabric,1.21-fabric public static field EMPTY_WITH_FONT_ID Lnet/minecraft/text/Style; public static field ZERO_TEXT_ALPHA I @1.8.9-forge public fun (Lnet/minecraft/client/renderer/WorldRenderer;)V @1.17.1-forge,1.18.1-forge,1.19.2-forge,1.19.3-forge,1.19.4-forge,1.20.1-forge,1.20.2-forge,1.20.4-forge public fun (Lcom/mojang/blaze3d/vertex/BufferBuilder;)V - @1.16.2-fabric,1.17.1-fabric,1.18.1-fabric,1.19-fabric,1.19.1-fabric,1.19.2-fabric,1.19.3-fabric,1.19.4-fabric,1.20-fabric,1.20.1-fabric,1.20.2-fabric,1.20.4-fabric,1.20.6-fabric + @1.16.2-fabric,1.17.1-fabric,1.18.1-fabric,1.19-fabric,1.19.1-fabric,1.19.2-fabric,1.19.3-fabric,1.19.4-fabric,1.20-fabric,1.20.1-fabric,1.20.2-fabric,1.20.4-fabric,1.20.6-fabric,1.21-fabric public fun (Lnet/minecraft/client/render/BufferBuilder;)V @1.12.2-forge,1.16.2-forge public fun (Lnet/minecraft/client/renderer/BufferBuilder;)V @@ -107,9 +107,9 @@ public class gg/essential/universal/UGraphics { @1.17.1-forge,1.18.1-forge,1.19.2-forge,1.19.3-forge,1.19.4-forge,1.20.1-forge,1.20.2-forge,1.20.4-forge public fun begin (ILcom/mojang/blaze3d/vertex/VertexFormat;)Lgg/essential/universal/UGraphics; public fun begin (ILgg/essential/universal/UGraphics$CommonVertexFormats;)Lgg/essential/universal/UGraphics; - @1.16.2-fabric,1.17.1-fabric,1.18.1-fabric,1.19-fabric,1.19.1-fabric,1.19.2-fabric,1.19.3-fabric,1.19.4-fabric,1.20-fabric,1.20.1-fabric,1.20.2-fabric,1.20.4-fabric,1.20.6-fabric + @1.16.2-fabric,1.17.1-fabric,1.18.1-fabric,1.19-fabric,1.19.1-fabric,1.19.2-fabric,1.19.3-fabric,1.19.4-fabric,1.20-fabric,1.20.1-fabric,1.20.2-fabric,1.20.4-fabric,1.20.6-fabric,1.21-fabric public fun begin (ILnet/minecraft/client/render/VertexFormat;)Lgg/essential/universal/UGraphics; - @1.16.2-fabric,1.17.1-fabric,1.18.1-fabric,1.19-fabric,1.19.1-fabric,1.19.2-fabric,1.19.3-fabric,1.19.4-fabric,1.20-fabric,1.20.1-fabric,1.20.2-fabric,1.20.4-fabric,1.20.6-fabric + @1.16.2-fabric,1.17.1-fabric,1.18.1-fabric,1.19-fabric,1.19.1-fabric,1.19.2-fabric,1.19.3-fabric,1.19.4-fabric,1.20-fabric,1.20.1-fabric,1.20.2-fabric,1.20.4-fabric,1.20.6-fabric,1.21-fabric public fun beginRenderLayer (Lnet/minecraft/client/render/RenderLayer;)Lgg/essential/universal/UGraphics; @1.12.2-forge,1.16.2-forge,1.8.9-forge public fun begin (ILnet/minecraft/client/renderer/vertex/VertexFormat;)Lgg/essential/universal/UGraphics; @@ -120,12 +120,12 @@ public class gg/essential/universal/UGraphics { public fun beginWithActiveShader (Lgg/essential/universal/UGraphics$DrawMode;Lgg/essential/universal/UGraphics$CommonVertexFormats;)Lgg/essential/universal/UGraphics; @1.17.1-forge,1.18.1-forge,1.19.2-forge,1.19.3-forge,1.19.4-forge,1.20.1-forge,1.20.2-forge,1.20.4-forge public fun beginWithDefaultShader (Lgg/essential/universal/UGraphics$DrawMode;Lcom/mojang/blaze3d/vertex/VertexFormat;)Lgg/essential/universal/UGraphics; - @1.16.2-fabric,1.17.1-fabric,1.18.1-fabric,1.19-fabric,1.19.1-fabric,1.19.2-fabric,1.19.3-fabric,1.19.4-fabric,1.20-fabric,1.20.1-fabric,1.20.2-fabric,1.20.4-fabric,1.20.6-fabric + @1.16.2-fabric,1.17.1-fabric,1.18.1-fabric,1.19-fabric,1.19.1-fabric,1.19.2-fabric,1.19.3-fabric,1.19.4-fabric,1.20-fabric,1.20.1-fabric,1.20.2-fabric,1.20.4-fabric,1.20.6-fabric,1.21-fabric public fun beginWithActiveShader (Lgg/essential/universal/UGraphics$DrawMode;Lnet/minecraft/client/render/VertexFormat;)Lgg/essential/universal/UGraphics; @1.12.2-forge,1.16.2-forge,1.8.9-forge public fun beginWithActiveShader (Lgg/essential/universal/UGraphics$DrawMode;Lnet/minecraft/client/renderer/vertex/VertexFormat;)Lgg/essential/universal/UGraphics; public fun beginWithDefaultShader (Lgg/essential/universal/UGraphics$DrawMode;Lgg/essential/universal/UGraphics$CommonVertexFormats;)Lgg/essential/universal/UGraphics; - @1.16.2-fabric,1.17.1-fabric,1.18.1-fabric,1.19-fabric,1.19.1-fabric,1.19.2-fabric,1.19.3-fabric,1.19.4-fabric,1.20-fabric,1.20.1-fabric,1.20.2-fabric,1.20.4-fabric,1.20.6-fabric + @1.16.2-fabric,1.17.1-fabric,1.18.1-fabric,1.19-fabric,1.19.1-fabric,1.19.2-fabric,1.19.3-fabric,1.19.4-fabric,1.20-fabric,1.20.1-fabric,1.20.2-fabric,1.20.4-fabric,1.20.6-fabric,1.21-fabric public fun beginWithDefaultShader (Lgg/essential/universal/UGraphics$DrawMode;Lnet/minecraft/client/render/VertexFormat;)Lgg/essential/universal/UGraphics; @1.12.2-forge,1.16.2-forge,1.8.9-forge public fun beginWithDefaultShader (Lgg/essential/universal/UGraphics$DrawMode;Lnet/minecraft/client/renderer/vertex/VertexFormat;)Lgg/essential/universal/UGraphics; @@ -135,9 +135,9 @@ public class gg/essential/universal/UGraphics { public static fun bindTexture (ILnet/minecraft/resources/ResourceLocation;)V @1.17.1-forge,1.18.1-forge,1.19.2-forge,1.19.3-forge,1.19.4-forge,1.20.1-forge,1.20.2-forge,1.20.4-forge public static fun bindTexture (Lnet/minecraft/resources/ResourceLocation;)V - @1.16.2-fabric,1.17.1-fabric,1.18.1-fabric,1.19-fabric,1.19.1-fabric,1.19.2-fabric,1.19.3-fabric,1.19.4-fabric,1.20-fabric,1.20.1-fabric,1.20.2-fabric,1.20.4-fabric,1.20.6-fabric + @1.16.2-fabric,1.17.1-fabric,1.18.1-fabric,1.19-fabric,1.19.1-fabric,1.19.2-fabric,1.19.3-fabric,1.19.4-fabric,1.20-fabric,1.20.1-fabric,1.20.2-fabric,1.20.4-fabric,1.20.6-fabric,1.21-fabric public static fun bindTexture (ILnet/minecraft/util/Identifier;)V - @1.16.2-fabric,1.17.1-fabric,1.18.1-fabric,1.19-fabric,1.19.1-fabric,1.19.2-fabric,1.19.3-fabric,1.19.4-fabric,1.20-fabric,1.20.1-fabric,1.20.2-fabric,1.20.4-fabric,1.20.6-fabric + @1.16.2-fabric,1.17.1-fabric,1.18.1-fabric,1.19-fabric,1.19.1-fabric,1.19.2-fabric,1.19.3-fabric,1.19.4-fabric,1.20-fabric,1.20.1-fabric,1.20.2-fabric,1.20.4-fabric,1.20.6-fabric,1.21-fabric public static fun bindTexture (Lnet/minecraft/util/Identifier;)V @1.12.2-forge,1.16.2-forge,1.8.9-forge public static fun bindTexture (ILnet/minecraft/util/ResourceLocation;)V @@ -161,6 +161,7 @@ public class gg/essential/universal/UGraphics { public static fun disableLight (I)V public static fun disableLighting ()V public static fun disableTexture2D ()V + @1.12.2-forge,1.16.2-fabric,1.16.2-forge,1.17.1-fabric,1.17.1-forge,1.18.1-fabric,1.18.1-forge,1.19-fabric,1.19.1-fabric,1.19.2-fabric,1.19.2-forge,1.19.3-fabric,1.19.3-forge,1.19.4-fabric,1.19.4-forge,1.20-fabric,1.20.1-fabric,1.20.1-forge,1.20.2-fabric,1.20.2-forge,1.20.4-fabric,1.20.4-forge,1.20.6-fabric,1.8.9-forge public static fun draw ()V public fun drawDirect ()V public fun drawSorted (III)V @@ -183,7 +184,7 @@ public class gg/essential/universal/UGraphics { public static fun getStringWidth (Ljava/lang/String;)I @1.17.1-forge,1.18.1-forge,1.19.2-forge,1.19.3-forge,1.19.4-forge,1.20.1-forge,1.20.2-forge,1.20.4-forge public static fun getTessellator ()Lcom/mojang/blaze3d/vertex/Tesselator; - @1.16.2-fabric,1.17.1-fabric,1.18.1-fabric,1.19-fabric,1.19.1-fabric,1.19.2-fabric,1.19.3-fabric,1.19.4-fabric,1.20-fabric,1.20.1-fabric,1.20.2-fabric,1.20.4-fabric,1.20.6-fabric + @1.16.2-fabric,1.17.1-fabric,1.18.1-fabric,1.19-fabric,1.19.1-fabric,1.19.2-fabric,1.19.3-fabric,1.19.4-fabric,1.20-fabric,1.20.1-fabric,1.20.2-fabric,1.20.4-fabric,1.20.6-fabric,1.21-fabric public static fun getTessellator ()Lnet/minecraft/client/render/Tessellator; @1.12.2-forge,1.16.2-forge,1.8.9-forge public static fun getTessellator ()Lnet/minecraft/client/renderer/Tessellator; @@ -221,7 +222,7 @@ public class gg/essential/universal/UGraphics { @1.12.2-forge,1.16.2-fabric,1.16.2-forge,1.8.9-forge public static fun scale (FFF)V public static fun setActiveTexture (I)V - @1.17.1-fabric,1.17.1-forge,1.18.1-fabric,1.18.1-forge,1.19-fabric,1.19.1-fabric,1.19.2-fabric,1.19.2-forge,1.19.3-fabric,1.19.3-forge,1.19.4-fabric,1.19.4-forge,1.20-fabric,1.20.1-fabric,1.20.1-forge,1.20.2-fabric,1.20.2-forge,1.20.4-fabric,1.20.4-forge,1.20.6-fabric + @1.17.1-fabric,1.17.1-forge,1.18.1-fabric,1.18.1-forge,1.19-fabric,1.19.1-fabric,1.19.2-fabric,1.19.2-forge,1.19.3-fabric,1.19.3-forge,1.19.4-fabric,1.19.4-forge,1.20-fabric,1.20.1-fabric,1.20.1-forge,1.20.2-fabric,1.20.2-forge,1.20.4-fabric,1.20.4-forge,1.20.6-fabric,1.21-fabric public static fun setShader (Ljava/util/function/Supplier;)V public static fun shadeModel (I)V public fun tex (DD)Lgg/essential/universal/UGraphics; @@ -243,7 +244,7 @@ public final class gg/essential/universal/UGraphics$CommonVertexFormats : java/l public static final field POSITION_TEXTURE_LIGHT_COLOR Lgg/essential/universal/UGraphics$CommonVertexFormats; @1.17.1-forge,1.18.1-forge,1.19.2-forge,1.19.3-forge,1.19.4-forge,1.20.1-forge,1.20.2-forge,1.20.4-forge public final field mc Lcom/mojang/blaze3d/vertex/VertexFormat; - @1.16.2-fabric,1.17.1-fabric,1.18.1-fabric,1.19-fabric,1.19.1-fabric,1.19.2-fabric,1.19.3-fabric,1.19.4-fabric,1.20-fabric,1.20.1-fabric,1.20.2-fabric,1.20.4-fabric,1.20.6-fabric + @1.16.2-fabric,1.17.1-fabric,1.18.1-fabric,1.19-fabric,1.19.1-fabric,1.19.2-fabric,1.19.3-fabric,1.19.4-fabric,1.20-fabric,1.20.1-fabric,1.20.2-fabric,1.20.4-fabric,1.20.6-fabric,1.21-fabric public final field mc Lnet/minecraft/client/render/VertexFormat; @1.12.2-forge,1.16.2-forge,1.8.9-forge public final field mc Lnet/minecraft/client/renderer/vertex/VertexFormat; @@ -261,7 +262,7 @@ public final class gg/essential/universal/UGraphics$DrawMode : java/lang/Enum { public static fun fromGl (I)Lgg/essential/universal/UGraphics$DrawMode; @1.16.2-forge,1.17.1-forge,1.18.1-forge,1.19.2-forge,1.19.3-forge,1.19.4-forge,1.20.1-forge,1.20.2-forge,1.20.4-forge public static fun fromRenderLayer (Lnet/minecraft/client/renderer/RenderType;)Lgg/essential/universal/UGraphics$DrawMode; - @1.16.2-fabric,1.17.1-fabric,1.18.1-fabric,1.19-fabric,1.19.1-fabric,1.19.2-fabric,1.19.3-fabric,1.19.4-fabric,1.20-fabric,1.20.1-fabric,1.20.2-fabric,1.20.4-fabric,1.20.6-fabric + @1.16.2-fabric,1.17.1-fabric,1.18.1-fabric,1.19-fabric,1.19.1-fabric,1.19.2-fabric,1.19.3-fabric,1.19.4-fabric,1.20-fabric,1.20.1-fabric,1.20.2-fabric,1.20.4-fabric,1.20.6-fabric,1.21-fabric public static fun fromRenderLayer (Lnet/minecraft/client/render/RenderLayer;)Lgg/essential/universal/UGraphics$DrawMode; public static fun valueOf (Ljava/lang/String;)Lgg/essential/universal/UGraphics$DrawMode; public static fun values ()[Lgg/essential/universal/UGraphics$DrawMode; @@ -285,9 +286,9 @@ public final class gg/essential/universal/UGuiButton { public static final fun getX (Lnet/minecraft/client/gui/components/AbstractWidget;)I @1.17.1-forge,1.18.1-forge,1.19.2-forge,1.19.3-forge,1.19.4-forge,1.20.1-forge,1.20.2-forge,1.20.4-forge public static final fun getY (Lnet/minecraft/client/gui/components/AbstractWidget;)I - @1.17.1-fabric,1.18.1-fabric,1.19-fabric,1.19.1-fabric,1.19.2-fabric,1.19.3-fabric,1.19.4-fabric,1.20-fabric,1.20.1-fabric,1.20.2-fabric,1.20.4-fabric,1.20.6-fabric + @1.17.1-fabric,1.18.1-fabric,1.19-fabric,1.19.1-fabric,1.19.2-fabric,1.19.3-fabric,1.19.4-fabric,1.20-fabric,1.20.1-fabric,1.20.2-fabric,1.20.4-fabric,1.20.6-fabric,1.21-fabric public static final fun getX (Lnet/minecraft/client/gui/widget/ClickableWidget;)I - @1.17.1-fabric,1.18.1-fabric,1.19-fabric,1.19.1-fabric,1.19.2-fabric,1.19.3-fabric,1.19.4-fabric,1.20-fabric,1.20.1-fabric,1.20.2-fabric,1.20.4-fabric,1.20.6-fabric + @1.17.1-fabric,1.18.1-fabric,1.19-fabric,1.19.1-fabric,1.19.2-fabric,1.19.3-fabric,1.19.4-fabric,1.20-fabric,1.20.1-fabric,1.20.2-fabric,1.20.4-fabric,1.20.6-fabric,1.21-fabric public static final fun getY (Lnet/minecraft/client/gui/widget/ClickableWidget;)I @1.16.2-forge public static final fun getX (Lnet/minecraft/client/gui/widget/Widget;)I @@ -309,7 +310,7 @@ public final class gg/essential/universal/UImage { public fun (Lcom/mojang/blaze3d/platform/NativeImage;)V @1.16.2-forge public fun (Lnet/minecraft/client/renderer/texture/NativeImage;)V - @1.16.2-fabric,1.17.1-fabric,1.18.1-fabric,1.19-fabric,1.19.1-fabric,1.19.2-fabric,1.19.3-fabric,1.19.4-fabric,1.20-fabric,1.20.1-fabric,1.20.2-fabric,1.20.4-fabric,1.20.6-fabric + @1.16.2-fabric,1.17.1-fabric,1.18.1-fabric,1.19-fabric,1.19.1-fabric,1.19.2-fabric,1.19.3-fabric,1.19.4-fabric,1.20-fabric,1.20.1-fabric,1.20.2-fabric,1.20.4-fabric,1.20.6-fabric,1.21-fabric public fun (Lnet/minecraft/client/texture/NativeImage;)V @1.12.2-forge,1.8.9-forge public fun (Ljava/awt/image/BufferedImage;)V @@ -320,7 +321,7 @@ public final class gg/essential/universal/UImage { public final fun getNativeImage ()Lcom/mojang/blaze3d/platform/NativeImage; @1.16.2-forge public final fun getNativeImage ()Lnet/minecraft/client/renderer/texture/NativeImage; - @1.16.2-fabric,1.17.1-fabric,1.18.1-fabric,1.19-fabric,1.19.1-fabric,1.19.2-fabric,1.19.3-fabric,1.19.4-fabric,1.20-fabric,1.20.1-fabric,1.20.2-fabric,1.20.4-fabric,1.20.6-fabric + @1.16.2-fabric,1.17.1-fabric,1.18.1-fabric,1.19-fabric,1.19.1-fabric,1.19.2-fabric,1.19.3-fabric,1.19.4-fabric,1.20-fabric,1.20.1-fabric,1.20.2-fabric,1.20.4-fabric,1.20.6-fabric,1.21-fabric public final fun getNativeImage ()Lnet/minecraft/client/texture/NativeImage; @1.12.2-forge,1.8.9-forge public final fun getNativeImage ()Ljava/awt/image/BufferedImage; @@ -450,7 +451,7 @@ public final class gg/essential/universal/UKeyboard { public static final fun getKeyName (II)Ljava/lang/String; @1.17.1-forge,1.18.1-forge,1.19.2-forge,1.19.3-forge,1.19.4-forge,1.20.1-forge,1.20.2-forge,1.20.4-forge public static final fun getKeyName (Lnet/minecraft/client/KeyMapping;)Ljava/lang/String; - @1.17.1-fabric,1.18.1-fabric,1.19-fabric,1.19.1-fabric,1.19.2-fabric,1.19.3-fabric,1.19.4-fabric,1.20-fabric,1.20.1-fabric,1.20.2-fabric,1.20.4-fabric,1.20.6-fabric + @1.17.1-fabric,1.18.1-fabric,1.19-fabric,1.19.1-fabric,1.19.2-fabric,1.19.3-fabric,1.19.4-fabric,1.20-fabric,1.20.1-fabric,1.20.2-fabric,1.20.4-fabric,1.20.6-fabric,1.21-fabric public static final fun getKeyName (Lnet/minecraft/client/option/KeyBinding;)Ljava/lang/String; @1.16.2-fabric public static final fun getKeyName (Lnet/minecraft/client/options/KeyBinding;)Ljava/lang/String; @@ -505,14 +506,14 @@ public final class gg/essential/universal/UMatrixStack { public fun (Lcom/mojang/blaze3d/matrix/MatrixStack$Entry;)V @1.16.2-forge public fun (Lcom/mojang/blaze3d/matrix/MatrixStack;)V - @1.16.2-fabric,1.17.1-fabric,1.18.1-fabric,1.19-fabric,1.19.1-fabric,1.19.2-fabric,1.19.3-fabric,1.19.4-fabric,1.20-fabric,1.20.1-fabric,1.20.2-fabric,1.20.4-fabric,1.20.6-fabric + @1.16.2-fabric,1.17.1-fabric,1.18.1-fabric,1.19-fabric,1.19.1-fabric,1.19.2-fabric,1.19.3-fabric,1.19.4-fabric,1.20-fabric,1.20.1-fabric,1.20.2-fabric,1.20.4-fabric,1.20.6-fabric,1.21-fabric public fun (Lnet/minecraft/client/util/math/MatrixStack$Entry;)V - @1.16.2-fabric,1.17.1-fabric,1.18.1-fabric,1.19-fabric,1.19.1-fabric,1.19.2-fabric,1.19.3-fabric,1.19.4-fabric,1.20-fabric,1.20.1-fabric,1.20.2-fabric,1.20.4-fabric,1.20.6-fabric + @1.16.2-fabric,1.17.1-fabric,1.18.1-fabric,1.19-fabric,1.19.1-fabric,1.19.2-fabric,1.19.3-fabric,1.19.4-fabric,1.20-fabric,1.20.1-fabric,1.20.2-fabric,1.20.4-fabric,1.20.6-fabric,1.21-fabric public fun (Lnet/minecraft/client/util/math/MatrixStack;)V public final fun applyToGlobalState ()V public final fun fork ()Lgg/essential/universal/UMatrixStack; public final fun isEmpty ()Z - @1.19.3-fabric,1.19.3-forge,1.19.4-fabric,1.19.4-forge,1.20-fabric,1.20.1-fabric,1.20.1-forge,1.20.2-fabric,1.20.2-forge,1.20.4-fabric,1.20.4-forge,1.20.6-fabric + @1.19.3-fabric,1.19.3-forge,1.19.4-fabric,1.19.4-forge,1.20-fabric,1.20.1-fabric,1.20.1-forge,1.20.2-fabric,1.20.2-forge,1.20.4-fabric,1.20.4-forge,1.20.6-fabric,1.21-fabric public final fun multiply (Lorg/joml/Quaternionf;)V @1.17.1-forge,1.18.1-forge,1.19.2-forge public final fun multiply (Lcom/mojang/math/Quaternion;)V @@ -539,7 +540,7 @@ public final class gg/essential/universal/UMatrixStack { public final fun toMC ()Lcom/mojang/blaze3d/vertex/PoseStack; @1.16.2-forge public final fun toMC ()Lcom/mojang/blaze3d/matrix/MatrixStack; - @1.16.2-fabric,1.17.1-fabric,1.18.1-fabric,1.19-fabric,1.19.1-fabric,1.19.2-fabric,1.19.3-fabric,1.19.4-fabric,1.20-fabric,1.20.1-fabric,1.20.2-fabric,1.20.4-fabric,1.20.6-fabric + @1.16.2-fabric,1.17.1-fabric,1.18.1-fabric,1.19-fabric,1.19.1-fabric,1.19.2-fabric,1.19.3-fabric,1.19.4-fabric,1.20-fabric,1.20.1-fabric,1.20.2-fabric,1.20.4-fabric,1.20.6-fabric,1.21-fabric public final fun toMC ()Lnet/minecraft/client/util/math/MatrixStack; public final fun translate (DDD)V public final fun translate (FFF)V @@ -556,15 +557,15 @@ public final class gg/essential/universal/UMatrixStack$Compat { } public final class gg/essential/universal/UMatrixStack$Entry { - @1.19.3-fabric,1.19.3-forge,1.19.4-fabric,1.19.4-forge,1.20-fabric,1.20.1-fabric,1.20.1-forge,1.20.2-fabric,1.20.2-forge,1.20.4-fabric,1.20.4-forge,1.20.6-fabric + @1.19.3-fabric,1.19.3-forge,1.19.4-fabric,1.19.4-forge,1.20-fabric,1.20.1-fabric,1.20.1-forge,1.20.2-fabric,1.20.2-forge,1.20.4-fabric,1.20.4-forge,1.20.6-fabric,1.21-fabric public fun (Lorg/joml/Matrix4f;Lorg/joml/Matrix3f;)V - @1.19.3-fabric,1.19.3-forge,1.19.4-fabric,1.19.4-forge,1.20-fabric,1.20.1-fabric,1.20.1-forge,1.20.2-fabric,1.20.2-forge,1.20.4-fabric,1.20.4-forge,1.20.6-fabric + @1.19.3-fabric,1.19.3-forge,1.19.4-fabric,1.19.4-forge,1.20-fabric,1.20.1-fabric,1.20.1-forge,1.20.2-fabric,1.20.2-forge,1.20.4-fabric,1.20.4-forge,1.20.6-fabric,1.21-fabric public final fun component1 ()Lorg/joml/Matrix4f; - @1.19.3-fabric,1.19.3-forge,1.19.4-fabric,1.19.4-forge,1.20-fabric,1.20.1-fabric,1.20.1-forge,1.20.2-fabric,1.20.2-forge,1.20.4-fabric,1.20.4-forge,1.20.6-fabric + @1.19.3-fabric,1.19.3-forge,1.19.4-fabric,1.19.4-forge,1.20-fabric,1.20.1-fabric,1.20.1-forge,1.20.2-fabric,1.20.2-forge,1.20.4-fabric,1.20.4-forge,1.20.6-fabric,1.21-fabric public final fun component2 ()Lorg/joml/Matrix3f; - @1.19.3-fabric,1.19.3-forge,1.19.4-fabric,1.19.4-forge,1.20-fabric,1.20.1-fabric,1.20.1-forge,1.20.2-fabric,1.20.2-forge,1.20.4-fabric,1.20.4-forge,1.20.6-fabric + @1.19.3-fabric,1.19.3-forge,1.19.4-fabric,1.19.4-forge,1.20-fabric,1.20.1-fabric,1.20.1-forge,1.20.2-fabric,1.20.2-forge,1.20.4-fabric,1.20.4-forge,1.20.6-fabric,1.21-fabric public final fun copy (Lorg/joml/Matrix4f;Lorg/joml/Matrix3f;)Lgg/essential/universal/UMatrixStack$Entry; - @1.19.3-fabric,1.19.3-forge,1.19.4-fabric,1.19.4-forge,1.20-fabric,1.20.1-fabric,1.20.1-forge,1.20.2-fabric,1.20.2-forge,1.20.4-fabric,1.20.4-forge,1.20.6-fabric + @1.19.3-fabric,1.19.3-forge,1.19.4-fabric,1.19.4-forge,1.20-fabric,1.20.1-fabric,1.20.1-forge,1.20.2-fabric,1.20.2-forge,1.20.4-fabric,1.20.4-forge,1.20.6-fabric,1.21-fabric public static synthetic fun copy$default (Lgg/essential/universal/UMatrixStack$Entry;Lorg/joml/Matrix4f;Lorg/joml/Matrix3f;ILjava/lang/Object;)Lgg/essential/universal/UMatrixStack$Entry; @1.17.1-forge,1.18.1-forge,1.19.2-forge public fun (Lcom/mojang/math/Matrix4f;Lcom/mojang/math/Matrix3f;)V @@ -608,7 +609,7 @@ public final class gg/essential/universal/UMatrixStack$Entry { public static synthetic fun copy$default (Lgg/essential/universal/UMatrixStack$Entry;Lorg/lwjgl/util/vector/Matrix4f;Lorg/lwjgl/util/vector/Matrix3f;ILjava/lang/Object;)Lgg/essential/universal/UMatrixStack$Entry; public final fun deepCopy ()Lgg/essential/universal/UMatrixStack$Entry; public fun equals (Ljava/lang/Object;)Z - @1.19.3-fabric,1.19.3-forge,1.19.4-fabric,1.19.4-forge,1.20-fabric,1.20.1-fabric,1.20.1-forge,1.20.2-fabric,1.20.2-forge,1.20.4-fabric,1.20.4-forge,1.20.6-fabric + @1.19.3-fabric,1.19.3-forge,1.19.4-fabric,1.19.4-forge,1.20-fabric,1.20.1-fabric,1.20.1-forge,1.20.2-fabric,1.20.2-forge,1.20.4-fabric,1.20.4-forge,1.20.6-fabric,1.21-fabric public final fun getModel ()Lorg/joml/Matrix4f; @1.17.1-forge,1.18.1-forge,1.19.2-forge public final fun getModel ()Lcom/mojang/math/Matrix4f; @@ -619,7 +620,7 @@ public final class gg/essential/universal/UMatrixStack$Entry { @1.12.2-forge,1.8.9-forge public final fun getModel ()Lorg/lwjgl/util/vector/Matrix4f; public final fun getModelAsArray ()[F - @1.19.3-fabric,1.19.3-forge,1.19.4-fabric,1.19.4-forge,1.20-fabric,1.20.1-fabric,1.20.1-forge,1.20.2-fabric,1.20.2-forge,1.20.4-fabric,1.20.4-forge,1.20.6-fabric + @1.19.3-fabric,1.19.3-forge,1.19.4-fabric,1.19.4-forge,1.20-fabric,1.20.1-fabric,1.20.1-forge,1.20.2-fabric,1.20.2-forge,1.20.4-fabric,1.20.4-forge,1.20.6-fabric,1.21-fabric public final fun getNormal ()Lorg/joml/Matrix3f; @1.17.1-forge,1.18.1-forge,1.19.2-forge public final fun getNormal ()Lcom/mojang/math/Matrix3f; @@ -634,7 +635,7 @@ public final class gg/essential/universal/UMatrixStack$Entry { public final fun toMCStack ()Lcom/mojang/blaze3d/vertex/PoseStack; @1.16.2-forge public final fun toMCStack ()Lcom/mojang/blaze3d/matrix/MatrixStack; - @1.16.2-fabric,1.17.1-fabric,1.18.1-fabric,1.19-fabric,1.19.1-fabric,1.19.2-fabric,1.19.3-fabric,1.19.4-fabric,1.20-fabric,1.20.1-fabric,1.20.2-fabric,1.20.4-fabric,1.20.6-fabric + @1.16.2-fabric,1.17.1-fabric,1.18.1-fabric,1.19-fabric,1.19.1-fabric,1.19.2-fabric,1.19.3-fabric,1.19.4-fabric,1.20-fabric,1.20.1-fabric,1.20.2-fabric,1.20.4-fabric,1.20.6-fabric,1.21-fabric public final fun toMCStack ()Lnet/minecraft/client/util/math/MatrixStack; public fun toString ()Ljava/lang/String; } @@ -648,22 +649,22 @@ public final class gg/essential/universal/UMinecraft { public static final fun getFontRenderer ()Lnet/minecraft/client/gui/Font; @1.16.2-forge public static final fun getChatGUI ()Lnet/minecraft/client/gui/NewChatGui; - @1.16.2-fabric,1.17.1-fabric,1.18.1-fabric,1.19-fabric,1.19.1-fabric,1.19.2-fabric,1.19.3-fabric,1.19.4-fabric,1.20-fabric,1.20.1-fabric,1.20.2-fabric,1.20.4-fabric,1.20.6-fabric + @1.16.2-fabric,1.17.1-fabric,1.18.1-fabric,1.19-fabric,1.19.1-fabric,1.19.2-fabric,1.19.3-fabric,1.19.4-fabric,1.20-fabric,1.20.1-fabric,1.20.2-fabric,1.20.4-fabric,1.20.6-fabric,1.21-fabric public static final fun getChatGUI ()Lnet/minecraft/client/gui/hud/ChatHud; - @1.16.2-fabric,1.17.1-fabric,1.18.1-fabric,1.19-fabric,1.19.1-fabric,1.19.2-fabric,1.19.3-fabric,1.19.4-fabric,1.20-fabric,1.20.1-fabric,1.20.2-fabric,1.20.4-fabric,1.20.6-fabric + @1.16.2-fabric,1.17.1-fabric,1.18.1-fabric,1.19-fabric,1.19.1-fabric,1.19.2-fabric,1.19.3-fabric,1.19.4-fabric,1.20-fabric,1.20.1-fabric,1.20.2-fabric,1.20.4-fabric,1.20.6-fabric,1.21-fabric public static final fun getFontRenderer ()Lnet/minecraft/client/font/TextRenderer; @1.12.2-forge,1.8.9-forge public static final fun getChatGUI ()Lnet/minecraft/client/gui/GuiNewChat; @1.12.2-forge,1.16.2-forge,1.8.9-forge public static final fun getFontRenderer ()Lnet/minecraft/client/gui/FontRenderer; public static final fun getGuiScale ()I - @1.16.2-fabric,1.17.1-fabric,1.18.1-fabric,1.19-fabric,1.19.1-fabric,1.19.2-fabric,1.19.3-fabric,1.19.4-fabric,1.20-fabric,1.20.1-fabric,1.20.2-fabric,1.20.4-fabric,1.20.6-fabric + @1.16.2-fabric,1.17.1-fabric,1.18.1-fabric,1.19-fabric,1.19.1-fabric,1.19.2-fabric,1.19.3-fabric,1.19.4-fabric,1.20-fabric,1.20.1-fabric,1.20.2-fabric,1.20.4-fabric,1.20.6-fabric,1.21-fabric public static final fun getMinecraft ()Lnet/minecraft/client/MinecraftClient; - @1.16.2-fabric,1.17.1-fabric,1.18.1-fabric,1.19-fabric,1.19.1-fabric,1.19.2-fabric,1.19.3-fabric,1.19.4-fabric,1.20-fabric,1.20.1-fabric,1.20.2-fabric,1.20.4-fabric,1.20.6-fabric + @1.16.2-fabric,1.17.1-fabric,1.18.1-fabric,1.19-fabric,1.19.1-fabric,1.19.2-fabric,1.19.3-fabric,1.19.4-fabric,1.20-fabric,1.20.1-fabric,1.20.2-fabric,1.20.4-fabric,1.20.6-fabric,1.21-fabric public static final fun getNetHandler ()Lnet/minecraft/client/network/ClientPlayNetworkHandler; - @1.16.2-fabric,1.17.1-fabric,1.18.1-fabric,1.19-fabric,1.19.1-fabric,1.19.2-fabric,1.19.3-fabric,1.19.4-fabric,1.20-fabric,1.20.1-fabric,1.20.2-fabric,1.20.4-fabric,1.20.6-fabric + @1.16.2-fabric,1.17.1-fabric,1.18.1-fabric,1.19-fabric,1.19.1-fabric,1.19.2-fabric,1.19.3-fabric,1.19.4-fabric,1.20-fabric,1.20.1-fabric,1.20.2-fabric,1.20.4-fabric,1.20.6-fabric,1.21-fabric public static final fun getPlayer ()Lnet/minecraft/client/network/ClientPlayerEntity; - @1.17.1-fabric,1.18.1-fabric,1.19-fabric,1.19.1-fabric,1.19.2-fabric,1.19.3-fabric,1.19.4-fabric,1.20-fabric,1.20.1-fabric,1.20.2-fabric,1.20.4-fabric,1.20.6-fabric + @1.17.1-fabric,1.18.1-fabric,1.19-fabric,1.19.1-fabric,1.19.2-fabric,1.19.3-fabric,1.19.4-fabric,1.20-fabric,1.20.1-fabric,1.20.2-fabric,1.20.4-fabric,1.20.6-fabric,1.21-fabric public static final fun getSettings ()Lnet/minecraft/client/option/GameOptions; @1.16.2-fabric public static final fun getSettings ()Lnet/minecraft/client/options/GameOptions; @@ -690,7 +691,7 @@ public final class gg/essential/universal/UMinecraft { public static final fun getTime ()J @1.17.1-forge,1.18.1-forge,1.19.2-forge,1.19.3-forge,1.19.4-forge,1.20.1-forge,1.20.2-forge,1.20.4-forge public static final fun getWorld ()Lnet/minecraft/client/multiplayer/ClientLevel; - @1.16.2-fabric,1.16.2-forge,1.17.1-fabric,1.18.1-fabric,1.19-fabric,1.19.1-fabric,1.19.2-fabric,1.19.3-fabric,1.19.4-fabric,1.20-fabric,1.20.1-fabric,1.20.2-fabric,1.20.4-fabric,1.20.6-fabric + @1.16.2-fabric,1.16.2-forge,1.17.1-fabric,1.18.1-fabric,1.19-fabric,1.19.1-fabric,1.19.2-fabric,1.19.3-fabric,1.19.4-fabric,1.20-fabric,1.20.1-fabric,1.20.2-fabric,1.20.4-fabric,1.20.6-fabric,1.21-fabric public static final fun getWorld ()Lnet/minecraft/client/world/ClientWorld; @1.12.2-forge,1.8.9-forge public static final fun getWorld ()Lnet/minecraft/client/multiplayer/WorldClient; @@ -795,7 +796,7 @@ public abstract class gg/essential/universal/UScreen : net/minecraft/client/gui/ public fun updateGuiScale ()V } -@1.16.2-fabric,1.16.2-forge,1.17.1-fabric,1.18.1-fabric,1.19-fabric,1.19.1-fabric,1.19.2-fabric,1.19.3-fabric,1.19.4-fabric,1.20-fabric,1.20.1-fabric,1.20.2-fabric,1.20.4-fabric,1.20.6-fabric +@1.16.2-fabric,1.16.2-forge,1.17.1-fabric,1.18.1-fabric,1.19-fabric,1.19.1-fabric,1.19.2-fabric,1.19.3-fabric,1.19.4-fabric,1.20-fabric,1.20.1-fabric,1.20.2-fabric,1.20.4-fabric,1.20.6-fabric,1.21-fabric public abstract class gg/essential/universal/UScreen : net/minecraft/client/gui/screen/Screen { public static final field Companion Lgg/essential/universal/UScreen$Companion; public fun ()V @@ -812,7 +813,7 @@ public abstract class gg/essential/universal/UScreen : net/minecraft/client/gui/ public final fun getRestoreCurrentGuiOnClose ()Z @1.16.2-forge public fun getTitle ()Lnet/minecraft/util/text/ITextComponent; - @1.16.2-fabric,1.17.1-fabric,1.18.1-fabric,1.19-fabric,1.19.1-fabric,1.19.2-fabric,1.19.3-fabric,1.19.4-fabric,1.20-fabric,1.20.1-fabric,1.20.2-fabric,1.20.4-fabric,1.20.6-fabric + @1.16.2-fabric,1.17.1-fabric,1.18.1-fabric,1.19-fabric,1.19.1-fabric,1.19.2-fabric,1.19.3-fabric,1.19.4-fabric,1.20-fabric,1.20.1-fabric,1.20.2-fabric,1.20.4-fabric,1.20.6-fabric,1.21-fabric public fun getTitle ()Lnet/minecraft/text/Text; public fun getUnlocalizedName ()Ljava/lang/String; protected final fun init ()V @@ -822,7 +823,7 @@ public abstract class gg/essential/universal/UScreen : net/minecraft/client/gui/ public final fun mouseClicked (DDI)Z public final fun mouseDragged (DDIDD)Z public final fun mouseReleased (DDI)Z - @1.20.2-fabric,1.20.4-fabric,1.20.6-fabric + @1.20.2-fabric,1.20.4-fabric,1.20.6-fabric,1.21-fabric public fun mouseScrolled (DDDD)Z @1.16.2-fabric,1.16.2-forge,1.17.1-fabric,1.18.1-fabric,1.19-fabric,1.19.1-fabric,1.19.2-fabric,1.19.3-fabric,1.19.4-fabric,1.20-fabric,1.20.1-fabric public final fun mouseScrolled (DDD)Z @@ -845,11 +846,11 @@ public abstract class gg/essential/universal/UScreen : net/minecraft/client/gui/ public final fun render (Lcom/mojang/blaze3d/matrix/MatrixStack;IIF)V @1.16.2-forge public final fun renderBackground (Lcom/mojang/blaze3d/matrix/MatrixStack;I)V - @1.16.2-fabric,1.17.1-fabric,1.18.1-fabric,1.19-fabric,1.19.1-fabric,1.19.2-fabric,1.19.3-fabric,1.19.4-fabric,1.20-fabric,1.20.1-fabric,1.20.2-fabric,1.20.4-fabric,1.20.6-fabric + @1.16.2-fabric,1.17.1-fabric,1.18.1-fabric,1.19-fabric,1.19.1-fabric,1.19.2-fabric,1.19.3-fabric,1.19.4-fabric,1.20-fabric,1.20.1-fabric,1.20.2-fabric,1.20.4-fabric,1.20.6-fabric,1.21-fabric public final fun removed ()V - @1.20-fabric,1.20.1-fabric,1.20.2-fabric,1.20.4-fabric,1.20.6-fabric + @1.20-fabric,1.20.1-fabric,1.20.2-fabric,1.20.4-fabric,1.20.6-fabric,1.21-fabric public final fun render (Lnet/minecraft/client/gui/DrawContext;IIF)V - @1.20.2-fabric,1.20.4-fabric,1.20.6-fabric + @1.20.2-fabric,1.20.4-fabric,1.20.6-fabric,1.21-fabric public final fun renderBackground (Lnet/minecraft/client/gui/DrawContext;IIF)V @1.20-fabric,1.20.1-fabric public final fun renderBackground (Lnet/minecraft/client/gui/DrawContext;)V @@ -916,9 +917,9 @@ public final class gg/essential/universal/UScreen$Companion { public final fun displayScreen (Lnet/minecraft/client/gui/screens/Screen;)V @1.17.1-forge,1.18.1-forge,1.19.2-forge,1.19.3-forge,1.19.4-forge,1.20.1-forge,1.20.2-forge,1.20.4-forge public final fun getCurrentScreen ()Lnet/minecraft/client/gui/screens/Screen; - @1.16.2-fabric,1.16.2-forge,1.17.1-fabric,1.18.1-fabric,1.19-fabric,1.19.1-fabric,1.19.2-fabric,1.19.3-fabric,1.19.4-fabric,1.20-fabric,1.20.1-fabric,1.20.2-fabric,1.20.4-fabric,1.20.6-fabric + @1.16.2-fabric,1.16.2-forge,1.17.1-fabric,1.18.1-fabric,1.19-fabric,1.19.1-fabric,1.19.2-fabric,1.19.3-fabric,1.19.4-fabric,1.20-fabric,1.20.1-fabric,1.20.2-fabric,1.20.4-fabric,1.20.6-fabric,1.21-fabric public final fun displayScreen (Lnet/minecraft/client/gui/screen/Screen;)V - @1.16.2-fabric,1.16.2-forge,1.17.1-fabric,1.18.1-fabric,1.19-fabric,1.19.1-fabric,1.19.2-fabric,1.19.3-fabric,1.19.4-fabric,1.20-fabric,1.20.1-fabric,1.20.2-fabric,1.20.4-fabric,1.20.6-fabric + @1.16.2-fabric,1.16.2-forge,1.17.1-fabric,1.18.1-fabric,1.19-fabric,1.19.1-fabric,1.19.2-fabric,1.19.3-fabric,1.19.4-fabric,1.20-fabric,1.20.1-fabric,1.20.2-fabric,1.20.4-fabric,1.20.6-fabric,1.21-fabric public final fun getCurrentScreen ()Lnet/minecraft/client/gui/screen/Screen; @1.12.2-forge,1.8.9-forge public final fun displayScreen (Lnet/minecraft/client/gui/GuiScreen;)V @@ -938,11 +939,11 @@ public final class gg/essential/universal/USound { public final fun playSoundStatic (Lnet/minecraft/util/ResourceLocation;FF)V @1.19.3-forge,1.19.4-forge,1.20.1-forge,1.20.2-forge,1.20.4-forge public final fun playSoundStatic (Lnet/minecraft/core/Holder;FF)V - @1.19.3-fabric,1.19.4-fabric,1.20-fabric,1.20.1-fabric,1.20.2-fabric,1.20.4-fabric,1.20.6-fabric + @1.19.3-fabric,1.19.4-fabric,1.20-fabric,1.20.1-fabric,1.20.2-fabric,1.20.4-fabric,1.20.6-fabric,1.21-fabric public final fun playSoundStatic (Lnet/minecraft/registry/entry/RegistryEntry;FF)V @1.17.1-forge,1.18.1-forge,1.19.2-forge,1.19.3-forge,1.19.4-forge,1.20.1-forge,1.20.2-forge,1.20.4-forge public final fun playSoundStatic (Lnet/minecraft/sounds/SoundEvent;FF)V - @1.16.2-fabric,1.17.1-fabric,1.18.1-fabric,1.19-fabric,1.19.1-fabric,1.19.2-fabric,1.19.3-fabric,1.19.4-fabric,1.20-fabric,1.20.1-fabric,1.20.2-fabric,1.20.4-fabric,1.20.6-fabric + @1.16.2-fabric,1.17.1-fabric,1.18.1-fabric,1.19-fabric,1.19.1-fabric,1.19.2-fabric,1.19.3-fabric,1.19.4-fabric,1.20-fabric,1.20.1-fabric,1.20.2-fabric,1.20.4-fabric,1.20.6-fabric,1.21-fabric public final fun playSoundStatic (Lnet/minecraft/sound/SoundEvent;FF)V @1.12.2-forge,1.16.2-forge public final fun playSoundStatic (Lnet/minecraft/util/SoundEvent;FF)V @@ -971,7 +972,7 @@ public final class gg/essential/universal/shader/BlendState { public final fun getEquation ()Lgg/essential/universal/shader/BlendState$Equation; @1.17.1-forge,1.18.1-forge,1.19.2-forge,1.19.3-forge,1.19.4-forge,1.20.1-forge,1.20.2-forge,1.20.4-forge public final fun getMc ()Lcom/mojang/blaze3d/shaders/BlendMode; - @1.17.1-fabric,1.18.1-fabric,1.19-fabric,1.19.1-fabric,1.19.2-fabric,1.19.3-fabric,1.19.4-fabric,1.20-fabric,1.20.1-fabric,1.20.2-fabric,1.20.4-fabric,1.20.6-fabric + @1.17.1-fabric,1.18.1-fabric,1.19-fabric,1.19.1-fabric,1.19.2-fabric,1.19.3-fabric,1.19.4-fabric,1.20-fabric,1.20.1-fabric,1.20.2-fabric,1.20.4-fabric,1.20.6-fabric,1.21-fabric public final fun getMc ()Lnet/minecraft/client/gl/GlBlendState; public final fun getSeparate ()Z public final fun getSrcAlpha ()Lgg/essential/universal/shader/BlendState$Param; @@ -1077,7 +1078,7 @@ public abstract interface class gg/essential/universal/shader/UShader { public final class gg/essential/universal/shader/UShader$Companion { public final fun fromLegacyShader (Ljava/lang/String;Ljava/lang/String;Lgg/essential/universal/shader/BlendState;)Lgg/essential/universal/shader/UShader; public final fun fromLegacyShader (Ljava/lang/String;Ljava/lang/String;Lgg/essential/universal/shader/BlendState;Lgg/essential/universal/UGraphics$CommonVertexFormats;)Lgg/essential/universal/shader/UShader; - @1.19.3-fabric,1.19.4-fabric,1.20-fabric,1.20.1-fabric,1.20.2-fabric,1.20.4-fabric,1.20.6-fabric + @1.19.3-fabric,1.19.4-fabric,1.20-fabric,1.20.1-fabric,1.20.2-fabric,1.20.4-fabric,1.20.6-fabric,1.21-fabric public final fun fromMcShader (Lnet/minecraft/client/gl/ShaderProgram;Lgg/essential/universal/shader/BlendState;)Lgg/essential/universal/shader/UShader; @1.17.1-forge,1.18.1-forge,1.19.2-forge,1.19.3-forge,1.19.4-forge,1.20.1-forge,1.20.2-forge,1.20.4-forge public final fun fromMcShader (Lnet/minecraft/client/renderer/ShaderInstance;Lgg/essential/universal/shader/BlendState;)Lgg/essential/universal/shader/UShader; @@ -1102,7 +1103,7 @@ public final class gg/essential/universal/utils/ReleasedDynamicTexture : net/min public final fun uploadTexture ()V } -@1.16.2-fabric,1.17.1-fabric,1.18.1-fabric,1.19-fabric,1.19.1-fabric,1.19.2-fabric,1.19.3-fabric,1.19.4-fabric,1.20-fabric,1.20.1-fabric,1.20.2-fabric,1.20.4-fabric,1.20.6-fabric +@1.16.2-fabric,1.17.1-fabric,1.18.1-fabric,1.19-fabric,1.19.1-fabric,1.19.2-fabric,1.19.3-fabric,1.19.4-fabric,1.20-fabric,1.20.1-fabric,1.20.2-fabric,1.20.4-fabric,1.20.6-fabric,1.21-fabric public final class gg/essential/universal/utils/ReleasedDynamicTexture : net/minecraft/client/texture/AbstractTexture { public fun (II)V public fun (Lnet/minecraft/client/texture/NativeImage;)V @@ -1178,7 +1179,7 @@ public abstract interface class gg/essential/universal/vertex/UVertexConsumer { public static fun of (Lcom/mojang/blaze3d/vertex/VertexConsumer;)Lgg/essential/universal/vertex/UVertexConsumer; @1.16.2-forge public static fun of (Lcom/mojang/blaze3d/vertex/IVertexBuilder;)Lgg/essential/universal/vertex/UVertexConsumer; - @1.16.2-fabric,1.17.1-fabric,1.18.1-fabric,1.19-fabric,1.19.1-fabric,1.19.2-fabric,1.19.3-fabric,1.19.4-fabric,1.20-fabric,1.20.1-fabric,1.20.2-fabric,1.20.4-fabric,1.20.6-fabric + @1.16.2-fabric,1.17.1-fabric,1.18.1-fabric,1.19-fabric,1.19.1-fabric,1.19.2-fabric,1.19.3-fabric,1.19.4-fabric,1.20-fabric,1.20.1-fabric,1.20.2-fabric,1.20.4-fabric,1.20.6-fabric,1.21-fabric public static fun of (Lnet/minecraft/client/render/VertexConsumer;)Lgg/essential/universal/vertex/UVertexConsumer; @1.12.2-forge public static fun of (Lnet/minecraft/client/renderer/BufferBuilder;)Lgg/essential/universal/vertex/UVertexConsumer; @@ -1194,7 +1195,7 @@ public final class gg/essential/universal/vertex/UVertexConsumer$Companion { public final fun of (Lcom/mojang/blaze3d/vertex/VertexConsumer;)Lgg/essential/universal/vertex/UVertexConsumer; @1.16.2-forge public final fun of (Lcom/mojang/blaze3d/vertex/IVertexBuilder;)Lgg/essential/universal/vertex/UVertexConsumer; - @1.16.2-fabric,1.17.1-fabric,1.18.1-fabric,1.19-fabric,1.19.1-fabric,1.19.2-fabric,1.19.3-fabric,1.19.4-fabric,1.20-fabric,1.20.1-fabric,1.20.2-fabric,1.20.4-fabric,1.20.6-fabric + @1.16.2-fabric,1.17.1-fabric,1.18.1-fabric,1.19-fabric,1.19.1-fabric,1.19.2-fabric,1.19.3-fabric,1.19.4-fabric,1.20-fabric,1.20.1-fabric,1.20.2-fabric,1.20.4-fabric,1.20.6-fabric,1.21-fabric public final fun of (Lnet/minecraft/client/render/VertexConsumer;)Lgg/essential/universal/vertex/UVertexConsumer; @1.12.2-forge public final fun of (Lnet/minecraft/client/renderer/BufferBuilder;)Lgg/essential/universal/vertex/UVertexConsumer; @@ -1212,7 +1213,7 @@ public final class gg/essential/universal/wrappers/UPlayer { public static final fun getPlayer ()Lnet/minecraft/client/player/LocalPlayer; @1.16.2-forge public static final fun getPlayer ()Lnet/minecraft/client/entity/player/ClientPlayerEntity; - @1.16.2-fabric,1.17.1-fabric,1.18.1-fabric,1.19-fabric,1.19.1-fabric,1.19.2-fabric,1.19.3-fabric,1.19.4-fabric,1.20-fabric,1.20.1-fabric,1.20.2-fabric,1.20.4-fabric,1.20.6-fabric + @1.16.2-fabric,1.17.1-fabric,1.18.1-fabric,1.19-fabric,1.19.1-fabric,1.19.2-fabric,1.19.3-fabric,1.19.4-fabric,1.20-fabric,1.20.1-fabric,1.20.2-fabric,1.20.4-fabric,1.20.6-fabric,1.21-fabric public static final fun getPlayer ()Lnet/minecraft/client/network/ClientPlayerEntity; @1.12.2-forge,1.8.9-forge public static final fun getPlayer ()Lnet/minecraft/client/entity/EntityPlayerSP; @@ -1321,7 +1322,7 @@ public final class gg/essential/universal/wrappers/message/UTextComponent : net/ public fun visit (Lnet/minecraft/network/chat/FormattedText$StyledContentConsumer;Lnet/minecraft/network/chat/Style;)Ljava/util/Optional; } -@1.19-fabric,1.19.1-fabric,1.19.2-fabric,1.19.3-fabric,1.19.4-fabric,1.20-fabric,1.20.1-fabric,1.20.2-fabric,1.20.4-fabric,1.20.6-fabric +@1.19-fabric,1.19.1-fabric,1.19.2-fabric,1.19.3-fabric,1.19.4-fabric,1.20-fabric,1.20.1-fabric,1.20.2-fabric,1.20.4-fabric,1.20.6-fabric,1.21-fabric public final class gg/essential/universal/wrappers/message/UTextComponent : net/minecraft/text/Text { public static final field Companion Lgg/essential/universal/wrappers/message/UTextComponent$Companion; public fun (Ljava/lang/String;)V diff --git a/root.gradle.kts b/root.gradle.kts index dcb42bb..97efeb9 100644 --- a/root.gradle.kts +++ b/root.gradle.kts @@ -9,6 +9,7 @@ plugins { version = versionFromBuildIdAndBranch() preprocess { + val fabric12100 = createNode("1.21-fabric", 12100, "srg") val fabric12006 = createNode("1.20.6-fabric", 12006, "srg") val forge12004 = createNode("1.20.4-forge", 12004, "srg") val fabric12004 = createNode("1.20.4-fabric", 12004, "yarn") @@ -34,6 +35,7 @@ preprocess { val forge11202 = createNode("1.12.2-forge", 11202, "srg") val forge10809 = createNode("1.8.9-forge", 10809, "srg") + fabric12100.link(fabric12006) fabric12006.link(fabric12004) forge12004.link(fabric12004) fabric12004.link(fabric12002, file("versions/1.20.4-1.20.2.txt")) diff --git a/settings.gradle.kts b/settings.gradle.kts index 8a438b9..eb9df96 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -42,6 +42,7 @@ listOf( "1.20.4-fabric", "1.20.4-forge", "1.20.6-fabric", + "1.21-fabric", ).forEach { version -> include(":$version") project(":$version").apply { diff --git a/src/main/java/gg/essential/universal/UGraphics.java b/src/main/java/gg/essential/universal/UGraphics.java index 08663a9..14caf26 100644 --- a/src/main/java/gg/essential/universal/UGraphics.java +++ b/src/main/java/gg/essential/universal/UGraphics.java @@ -25,6 +25,12 @@ import static org.lwjgl.opengl.GL13.GL_ACTIVE_TEXTURE; import static org.lwjgl.opengl.GL13.GL_TEXTURE0; +//#if MC>=12100 +//$$ import net.minecraft.client.render.BufferRenderer; +//$$ import net.minecraft.client.render.BuiltBuffer; +//$$ import net.minecraft.client.util.BufferAllocator; +//#endif + //#if MC>=12005 //$$ import org.joml.Vector3f; //#endif @@ -83,7 +89,9 @@ public class UGraphics { private static final Pattern formattingCodePattern = Pattern.compile("(?i)\u00a7[0-9A-FK-OR]"); - //#if MC>=11602 + //#if MC>=12100 + //$$ public static Style EMPTY_WITH_FONT_ID = Style.EMPTY.withFont(Identifier.of("minecraft", "alt")); + //#elseif MC>=11602 //$$ public static Style EMPTY_WITH_FONT_ID = Style.EMPTY.setFontId(new ResourceLocation("minecraft", "alt")); //#endif private static UMatrixStack UNIT_STACK = UMatrixStack.UNIT; @@ -97,6 +105,14 @@ public class UGraphics { //$$ private static final boolean TEXT_LAYER_TYPE = false; //#endif + //#if MC>=12100 + //$$ /** + //$$ * A buffer to use for storing sorted quad vertex indices. The buffer will automatically grow as needed, + //$$ * the specified size is not a hard cap. + //$$ */ + //$$ private static final BufferAllocator SORTED_QUADS_ALLOCATOR = new BufferAllocator(65536); + //#endif + public UGraphics(WorldRenderer instance) { this.instance = instance; } @@ -106,7 +122,11 @@ public UVertexConsumer asUVertexConsumer() { } public static UGraphics getFromTessellator() { + //#if MC>=12100 + //$$ return new UGraphics(null); + //#else return new UGraphics(getTessellator().getWorldRenderer()); + //#endif } //#if MC<11700 @@ -150,10 +170,14 @@ public static Tessellator getTessellator() { return Tessellator.getInstance(); } + //#if MC>=12100 + //$$ // No possible alternative on 1.21. A compile time error here is better than a run time one. + //#else @Deprecated // Use the non-static methods for 1.17+ compatibility or call UGraphics.getTessellator().draw() directly public static void draw() { getTessellator().draw(); } + //#endif public static void cullFace(int mode) { //#if MC>=11502 @@ -394,7 +418,11 @@ public static void drawString(String text, float x, float y, int color, boolean public static void drawString(UMatrixStack stack, String text, float x, float y, int color, boolean shadow) { if ((color >> 24 & 255) <= 10) return; //#if MC>=11602 + //#if MC>=12100 + //$$ VertexConsumerProvider.Immediate irendertypebuffer$impl = UMinecraft.getMinecraft().getBufferBuilders().getEntityVertexConsumers(); + //#else //$$ IRenderTypeBuffer.Impl irendertypebuffer$impl = IRenderTypeBuffer.getImpl(Tessellator.getInstance().getBuffer()); + //#endif //$$ UMinecraft.getFontRenderer().renderString(text, x, y, color, shadow, stack.peek().getModel(), irendertypebuffer$impl, TEXT_LAYER_TYPE, 0, 15728880); //$$ irendertypebuffer$impl.finish(); //#else @@ -422,7 +450,11 @@ public static void drawString(UMatrixStack stack, String text, float x, float y, if ((color >> 24 & 255) <= 10) return; String shadowText = ChatColor.Companion.stripColorCodes(text); //#if MC>=11602 + //#if MC>=12100 + //$$ VertexConsumerProvider.Immediate irendertypebuffer$impl = UMinecraft.getMinecraft().getBufferBuilders().getEntityVertexConsumers(); + //#else //$$ IRenderTypeBuffer.Impl irendertypebuffer$impl = IRenderTypeBuffer.getImpl(Tessellator.getInstance().getBuffer()); + //#endif //$$ UMinecraft.getFontRenderer().renderString(shadowText, x + 1f, y + 1f, shadowColor, false, stack.peek().getModel(), irendertypebuffer$impl, TEXT_LAYER_TYPE, 0, 15728880); //$$ UMinecraft.getFontRenderer().renderString(text, x, y, color, false, stack.peek().getModel(), irendertypebuffer$impl, TEXT_LAYER_TYPE, 0, 15728880); //$$ irendertypebuffer$impl.finish(); @@ -776,7 +808,11 @@ public UGraphics beginWithActiveShader(DrawMode mode, CommonVertexFormats format public UGraphics beginWithActiveShader(DrawMode mode, VertexFormat format) { vertexFormat = format; + //#if MC>=12100 + //$$ instance = getTessellator().begin(mode.mcMode, format); + //#else instance.begin(mode.mcMode, format); + //#endif return this; } @@ -791,7 +827,11 @@ public UGraphics beginWithActiveShader(DrawMode mode, VertexFormat format) { //$$ DEFAULT_SHADERS.put(VertexFormats.POSITION_COLOR, GameRenderer::getPositionColorShader); //$$ DEFAULT_SHADERS.put(VertexFormats.POSITION_COLOR_LIGHT, GameRenderer::getPositionColorLightmapShader); //$$ DEFAULT_SHADERS.put(VertexFormats.POSITION_TEXTURE, GameRenderer::getPositionTexShader); + //#if MC>=12100 + //$$ // Shader for this format is no longer provided. + //#else //$$ DEFAULT_SHADERS.put(VertexFormats.POSITION_COLOR_TEXTURE, GameRenderer::getPositionColorTexShader); + //#endif //$$ DEFAULT_SHADERS.put(VertexFormats.POSITION_TEXTURE_COLOR, GameRenderer::getPositionTexColorShader); //$$ DEFAULT_SHADERS.put(VertexFormats.POSITION_COLOR_TEXTURE_LIGHT, GameRenderer::getPositionColorTexLightmapShader); //#if MC>=12005 @@ -843,9 +883,14 @@ public UGraphics begin(int glMode, VertexFormat format) { } public void drawDirect() { + //#if MC>=12100 + //$$ BuiltBuffer builtBuffer = instance.end(); + //#endif //#if MC>=11600 //$$ if (renderLayer != null) { - //#if MC>=12000 + //#if MC>=12100 + //$$ renderLayer.draw(builtBuffer); + //#elseif MC>=12000 //$$ renderLayer.draw(instance, RenderSystem.getVertexSorting()); //#else //$$ renderLayer.finish(instance, 0, 0, 0); @@ -853,13 +898,23 @@ public void drawDirect() { //$$ return; //$$ } //#endif - doDraw(); + doDraw( + //#if MC>=12100 + //$$ builtBuffer + //#endif + ); } public void drawSorted(int cameraX, int cameraY, int cameraZ) { + //#if MC>=12100 + //$$ BuiltBuffer builtBuffer = instance.end(); + //$$ builtBuffer.sortQuads(SORTED_QUADS_ALLOCATOR, RenderSystem.getVertexSorting()); + //#endif //#if MC>=11600 //$$ if (renderLayer != null) { - //#if MC>=12000 + //#if MC>=12100 + //$$ renderLayer.draw(builtBuffer); + //#elseif MC>=12000 //$$ renderLayer.draw(instance, RenderSystem.getVertexSorting()); //#else //$$ renderLayer.finish(instance, cameraX, cameraY, cameraZ); @@ -867,16 +922,23 @@ public void drawSorted(int cameraX, int cameraY, int cameraZ) { //$$ return; //$$ } //#endif - //#if MC>=12000 + //#if MC>=12100 + //$$ // Sorting handled above. + //#elseif MC>=12000 //$$ instance.setSorter(RenderSystem.getVertexSorting()); //#elseif MC>=11700 //$$ instance.setCameraPosition(cameraX, cameraY, cameraZ); //#else instance.sortVertexData(cameraX, cameraY, cameraZ); //#endif - doDraw(); + doDraw( + //#if MC>=12100 + //$$ builtBuffer + //#endif + ); } + //#if MC<11700 private static boolean[] getDesiredTextureUnitState(VertexFormat vertexFormat) { // Vanilla only ever has two UV elements, so we can assume the remainder to be disabled by default and don't // need to check them unless we want them enabled. @@ -892,11 +954,20 @@ private static boolean[] getDesiredTextureUnitState(VertexFormat vertexFormat) { } return wantEnabled; } + //#endif - private void doDraw() { + private void doDraw( + //#if MC>=12100 + //$$ BuiltBuffer builtBuffer + //#endif + ) { VertexFormat vertexFormat = this.vertexFormat; if (vertexFormat == null) { + //#if MC>=12100 + //$$ BufferRenderer.drawWithGlobalProgram(builtBuffer); + //#else getTessellator().draw(); + //#endif return; } @@ -919,7 +990,11 @@ private void doDraw() { } //#endif + //#if MC>=12100 + //$$ BufferRenderer.drawWithGlobalProgram(builtBuffer); + //#else getTessellator().draw(); + //#endif //#if MC<11700 for (int i = 0; i < wasEnabledStates.length; i++) { @@ -942,7 +1017,11 @@ public UGraphics pos(double x, double y, double z) { public UGraphics pos(UMatrixStack stack, double x, double y, double z) { if (stack == UNIT_STACK) { + //#if MC>=12100 + //$$ instance.vertex((float) x, (float) y, (float) z); + //#else instance.pos(x, y, z); + //#endif } else { //#if MC>=11602 //$$ instance.pos(stack.peek().getModel(), (float) x, (float) y, (float) z); @@ -1000,7 +1079,9 @@ public UGraphics color(Color color) { } public UGraphics endVertex() { + //#if MC<12100 instance.endVertex(); + //#endif return this; } diff --git a/src/main/kotlin/gg/essential/universal/UMatrixStack.kt b/src/main/kotlin/gg/essential/universal/UMatrixStack.kt index da33124..83d280f 100644 --- a/src/main/kotlin/gg/essential/universal/UMatrixStack.kt +++ b/src/main/kotlin/gg/essential/universal/UMatrixStack.kt @@ -1,6 +1,5 @@ package gg.essential.universal -import net.minecraft.client.renderer.GLAllocation import org.lwjgl.opengl.GL11 import org.lwjgl.util.vector.Matrix3f import org.lwjgl.util.vector.Matrix4f @@ -14,6 +13,8 @@ import kotlin.math.sin //#if MC>=11700 //$$ import com.mojang.blaze3d.systems.RenderSystem +//#else +import net.minecraft.client.renderer.GLAllocation //#endif //#if MC>=11600 diff --git a/src/main/kotlin/gg/essential/universal/vertex/VanillaVertexConsumer.kt b/src/main/kotlin/gg/essential/universal/vertex/VanillaVertexConsumer.kt index 5ffa3cc..d288604 100644 --- a/src/main/kotlin/gg/essential/universal/vertex/VanillaVertexConsumer.kt +++ b/src/main/kotlin/gg/essential/universal/vertex/VanillaVertexConsumer.kt @@ -26,7 +26,11 @@ internal class VanillaVertexConsumer( override fun pos(stack: UMatrixStack, x: Double, y: Double, z: Double): UVertexConsumer = apply { if (stack === UMatrixStack.UNIT) { + //#if MC>=12100 + //$$ inner.vertex(x.toFloat(), y.toFloat(), z.toFloat()) + //#else inner.pos(x, y, z) + //#endif return@apply } //#if MC>=11602 @@ -88,6 +92,8 @@ internal class VanillaVertexConsumer( } override fun endVertex(): UVertexConsumer = apply { + //#if MC<12100 inner.endVertex() + //#endif } } diff --git a/versions/1.17.1-fabric/src/main/kotlin/gg/essential/universal/shader/MCShader.kt b/versions/1.17.1-fabric/src/main/kotlin/gg/essential/universal/shader/MCShader.kt index a0db0d1..d7f4b8e 100644 --- a/versions/1.17.1-fabric/src/main/kotlin/gg/essential/universal/shader/MCShader.kt +++ b/versions/1.17.1-fabric/src/main/kotlin/gg/essential/universal/shader/MCShader.kt @@ -7,6 +7,7 @@ import gg.essential.universal.UGraphics.CommonVertexFormats import net.minecraft.client.gl.GlUniform import net.minecraft.client.render.Shader import net.minecraft.client.render.VertexFormat +import net.minecraft.client.render.VertexFormatElement import net.minecraft.client.render.VertexFormats import net.minecraft.util.Identifier import org.apache.commons.codec.digest.DigestUtils @@ -108,15 +109,30 @@ internal class MCShader( //#endif } + fun buildVertexFormat(elements: Map): VertexFormat { + //#if MC>=12100 + //$$ val builder = VertexFormat.builder() + //$$ elements.forEach { (name, element) -> builder.add(name, element) } + //$$ return builder.build() + //#else + return VertexFormat(ImmutableMap.copyOf(elements)) + //#endif + } + val shaderVertexFormat = if (vertexFormat != null) { // Shader calls glBindAttribLocation using the names in the VertexFormat, not the shader json... // Easiest way to work around this is to construct a custom VertexFormat with our prefixed names. - VertexFormat(ImmutableMap.copyOf( - transformer.attributes.withIndex() - .associate { it.value to vertexFormat.mc.elements[it.index] })) + buildVertexFormat(transformer.attributes.withIndex() + .associate { it.value to vertexFormat.mc.elements[it.index] }) } else { // Legacy fallback: The actual element doesn't matter here, Shader only cares about the names - VertexFormat(ImmutableMap.copyOf(transformer.attributes.associateWith { VertexFormats.POSITION_ELEMENT })) + buildVertexFormat(transformer.attributes.associateWith { + //#if MC>=12100 + //$$ VertexFormatElement.POSITION + //#else + VertexFormats.POSITION_ELEMENT + //#endif + }) } diff --git a/versions/1.21-fabric/gradle.properties b/versions/1.21-fabric/gradle.properties new file mode 100644 index 0000000..55f7854 --- /dev/null +++ b/versions/1.21-fabric/gradle.properties @@ -0,0 +1,2 @@ +essential.defaults.loom.minecraft=com.mojang:minecraft:1.21-rc1 +essential.defaults.loom.mappings=net.fabricmc:yarn:1.21-rc1+build.1:v2