From d0ab6220383c843c3e294d94671d96ed38f11ce2 Mon Sep 17 00:00:00 2001 From: DJtheRedstoner <52044242+DJtheRedstoner@users.noreply.github.com> Date: Thu, 2 May 2024 01:47:06 -0400 Subject: [PATCH] Build: Port to 1.20.6 Fabric * Build: Port to 1.20.6 Fabric Sets kotlin language and api version to maintain compatibility with consumers still using older Kotlin compilers / stdlib. * UScreen: Fix gui scale handling As of 1.20.5, the change callback of the guiScale option calls MinecraftClient#onResolutionChanged, which in turn causes the current screen to be reinitialized. However, UScreen calls updateGuiScale when the screen is initialized, causing the gui scale to be set back to the overridden gui scale. This doesn't recurse forever, since Minecraft only calls option change callbacks when the value changes. We fix this by ignoring this call when we are the ones that trigger it. We also restore the guiScaleToRestore field to -1 when the screen is closed. This fixes gui scale restoration with screen instances that are reused, previously the gui scale that was recorded when the gui was opened for the first time would always be restored. * Build: remove old code from gradlew This was from when we used TeamCity, the IS_CI variable not set on GitHub Actions. Java versions are now managed by the GitHub Actions workflow. GitHub: #68 --- .github/workflows/main.yml | 1 + api/UniversalCraft.api | 106 +++++++++--------- build.gradle.kts | 8 ++ gradlew | 5 - root.gradle.kts | 4 +- settings.gradle.kts | 5 +- .../gg/essential/universal/UGraphics.java | 23 +++- .../gg/essential/universal/UMatrixStack.kt | 16 ++- .../gg/essential/universal/UMinecraft.kt | 2 +- .../kotlin/gg/essential/universal/UScreen.kt | 22 +++- .../universal/vertex/VanillaVertexConsumer.kt | 9 +- .../gg/essential/universal/DummyPack.kt | 6 + 12 files changed, 136 insertions(+), 71 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 4999662..dad0c73 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -21,6 +21,7 @@ jobs: 8 16 17 + 21 # Can't use setup-java for this because https://github.com/actions/setup-java/issues/366 - uses: actions/cache@v3 diff --git a/api/UniversalCraft.api b/api/UniversalCraft.api index 1333f30..eae3df4 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.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 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.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 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.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 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.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 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.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 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.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 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.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 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.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 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 @@ -183,7 +183,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.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 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 +221,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.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 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 +243,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.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 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 +261,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.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 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 +285,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.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 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.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 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 +309,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.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 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 +320,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.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 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 +450,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.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 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 +505,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.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 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.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 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.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 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 +539,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.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 public final fun toMC ()Lnet/minecraft/client/util/math/MatrixStack; public final fun translate (DDD)V public final fun translate (FFF)V @@ -556,15 +556,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.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 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.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 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.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 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.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 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.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 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 +608,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.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 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 +619,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.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 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 +634,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.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 public final fun toMCStack ()Lnet/minecraft/client/util/math/MatrixStack; public fun toString ()Ljava/lang/String; } @@ -648,22 +648,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.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 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.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 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.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 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.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 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.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 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.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 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 +690,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.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 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 +795,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.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 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 +812,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.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 public fun getTitle ()Lnet/minecraft/text/Text; public fun getUnlocalizedName ()Ljava/lang/String; protected final fun init ()V @@ -822,7 +822,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.2-fabric,1.20.4-fabric,1.20.6-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 +845,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.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 public final fun removed ()V - @1.20-fabric,1.20.1-fabric,1.20.2-fabric,1.20.4-fabric + @1.20-fabric,1.20.1-fabric,1.20.2-fabric,1.20.4-fabric,1.20.6-fabric public final fun render (Lnet/minecraft/client/gui/DrawContext;IIF)V - @1.20.2-fabric,1.20.4-fabric + @1.20.2-fabric,1.20.4-fabric,1.20.6-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 +916,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.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 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.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 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 +938,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.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 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.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 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 +971,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.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 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 +1077,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.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 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 +1102,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.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 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 +1178,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.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 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 +1194,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.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 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 +1212,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.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 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 +1321,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.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 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/build.gradle.kts b/build.gradle.kts index 26ca749..0889d8b 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,4 +1,5 @@ import gg.essential.gradle.util.* +import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { kotlin("jvm") @@ -17,6 +18,13 @@ dependencies { implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.21") } +tasks.withType { + kotlinOptions { + languageVersion = "1.6" + apiVersion = "1.6" + } +} + tasks.jar { manifest { attributes(mapOf("FMLModType" to "LIBRARY")) diff --git a/gradlew b/gradlew index 7ae49e9..4f906e0 100755 --- a/gradlew +++ b/gradlew @@ -1,10 +1,5 @@ #!/usr/bin/env sh -# Need Java 17, and this seems to be the easiest way to do that per-branch for TeamCity -if [ -n "$IS_CI" ]; then - JAVA_HOME=/usr/lib/jvm/jdk-17.0.2 -fi - # # Copyright 2015 the original author or authors. # diff --git a/root.gradle.kts b/root.gradle.kts index 4816aef..dcb42bb 100644 --- a/root.gradle.kts +++ b/root.gradle.kts @@ -1,7 +1,7 @@ import gg.essential.gradle.util.* plugins { - kotlin("jvm") version "1.6.10" apply false + kotlin("jvm") version "1.9.23" apply false id("gg.essential.multi-version.root") id("gg.essential.multi-version.api-validation") } @@ -9,6 +9,7 @@ plugins { version = versionFromBuildIdAndBranch() preprocess { + 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") val forge12002 = createNode("1.20.2-forge", 12002, "srg") @@ -33,6 +34,7 @@ preprocess { val forge11202 = createNode("1.12.2-forge", 11202, "srg") val forge10809 = createNode("1.8.9-forge", 10809, "srg") + fabric12006.link(fabric12004) forge12004.link(fabric12004) fabric12004.link(fabric12002, file("versions/1.20.4-1.20.2.txt")) forge12002.link(fabric12002) diff --git a/settings.gradle.kts b/settings.gradle.kts index 3e99178..8a438b9 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -8,7 +8,7 @@ pluginManagement { maven("https://repo.essential.gg/repository/maven-public") } plugins { - val egtVersion = "0.4.0" + val egtVersion = "0.5.0" id("gg.essential.multi-version.root") version egtVersion id("gg.essential.multi-version.api-validation") version egtVersion } @@ -40,7 +40,8 @@ listOf( "1.20.2-fabric", "1.20.2-forge", "1.20.4-fabric", - "1.20.4-forge" + "1.20.4-forge", + "1.20.6-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 6d3c34a..08663a9 100644 --- a/src/main/java/gg/essential/universal/UGraphics.java +++ b/src/main/java/gg/essential/universal/UGraphics.java @@ -25,6 +25,10 @@ import static org.lwjgl.opengl.GL13.GL_ACTIVE_TEXTURE; import static org.lwjgl.opengl.GL13.GL_TEXTURE0; +//#if MC>=12005 +//$$ import org.joml.Vector3f; +//#endif + //#if MC>=11904 //$$ import net.minecraft.client.font.TextRenderer; //#endif @@ -744,8 +748,18 @@ public enum CommonVertexFormats { POSITION_TEXTURE(DefaultVertexFormats.POSITION_TEX), POSITION_TEXTURE_COLOR(DefaultVertexFormats.POSITION_TEX_COLOR), POSITION_COLOR_TEXTURE_LIGHT(DefaultVertexFormats.BLOCK), + /** + * @deprecated Minecraft removed the built-in shader for this vertex format in 1.20.5, so it is no + * longer universal across all versions. + */ + @Deprecated POSITION_TEXTURE_LIGHT_COLOR(DefaultVertexFormats.POSITION_TEX_LMAP_COLOR), POSITION_TEXTURE_COLOR_LIGHT(DefaultVertexFormats.PARTICLE_POSITION_TEX_COLOR_LMAP), + /** + * @deprecated Minecraft removed the built-in shader for this vertex format in 1.20.5, so it is no + * longer universal across all versions. + */ + @Deprecated POSITION_TEXTURE_COLOR_NORMAL(DefaultVertexFormats.POSITION_TEX_COLOR_NORMAL), ; @@ -780,8 +794,12 @@ public UGraphics beginWithActiveShader(DrawMode mode, VertexFormat format) { //$$ DEFAULT_SHADERS.put(VertexFormats.POSITION_COLOR_TEXTURE, GameRenderer::getPositionColorTexShader); //$$ DEFAULT_SHADERS.put(VertexFormats.POSITION_TEXTURE_COLOR, GameRenderer::getPositionTexColorShader); //$$ DEFAULT_SHADERS.put(VertexFormats.POSITION_COLOR_TEXTURE_LIGHT, GameRenderer::getPositionColorTexLightmapShader); + //#if MC>=12005 + //$$ // Shaders for these formats are no longer provided. + //#else //$$ DEFAULT_SHADERS.put(VertexFormats.POSITION_TEXTURE_LIGHT_COLOR, GameRenderer::getPositionTexLightmapColorShader); //$$ DEFAULT_SHADERS.put(VertexFormats.POSITION_TEXTURE_COLOR_NORMAL, GameRenderer::getPositionTexColorNormalShader); + //#endif //$$ } //#endif @@ -950,7 +968,10 @@ public UGraphics norm(UMatrixStack stack, float x, float y, float z) { if (stack == UNIT_STACK) { instance.normal(x, y, z); } else { - //#if MC>=11602 + //#if MC>=12005 + //$$ Vector3f normal = stack.peek().getNormal().transform(x, y, z, new Vector3f()); + //$$ instance.normal(normal.x(), normal.y(), normal.z()); + //#elseif MC>=11602 //$$ instance.normal(stack.peek().getNormal(), x, y, z); //#else Vector3f vec = new Vector3f(x, y, z); diff --git a/src/main/kotlin/gg/essential/universal/UMatrixStack.kt b/src/main/kotlin/gg/essential/universal/UMatrixStack.kt index 1d20eeb..da33124 100644 --- a/src/main/kotlin/gg/essential/universal/UMatrixStack.kt +++ b/src/main/kotlin/gg/essential/universal/UMatrixStack.kt @@ -184,7 +184,9 @@ class UMatrixStack private constructor( fun applyToGlobalState() { //#if MC>=11700 - //#if MC>=11800 + //#if MC>=12005 + //$$ RenderSystem.getModelViewStack().mul(stack.last.model) + //#elseif MC>=11800 //$$ // FIXME preprocessor bug: should remap the intermediary name to yarn no problem //$$ RenderSystem.getModelViewStack().multiplyPositionMatrix(stack.last.model) //#else @@ -204,7 +206,9 @@ class UMatrixStack private constructor( } fun replaceGlobalState() { - //#if MC>=11700 + //#if MC>=12005 + //$$ RenderSystem.getModelViewStack().identity() + //#elseif MC>=11700 //$$ RenderSystem.getModelViewStack().loadIdentity() //#else GL11.glLoadIdentity() @@ -229,13 +233,21 @@ class UMatrixStack private constructor( private inline fun withGlobalStackPushed(block: () -> R) : R { //#if MC>=11700 //$$ val stack = RenderSystem.getModelViewStack() + //#if MC>=12005 + //$$ stack.pushMatrix() + //#else //$$ stack.push() + //#endif //#else UGraphics.GL.pushMatrix() //#endif return block().also { //#if MC>=11700 + //#if MC>=12005 + //$$ stack.popMatrix() + //#else //$$ stack.pop() + //#endif //$$ RenderSystem.applyModelViewMatrix() //#else UGraphics.GL.popMatrix() diff --git a/src/main/kotlin/gg/essential/universal/UMinecraft.kt b/src/main/kotlin/gg/essential/universal/UMinecraft.kt index 6a5db05..159b8ee 100644 --- a/src/main/kotlin/gg/essential/universal/UMinecraft.kt +++ b/src/main/kotlin/gg/essential/universal/UMinecraft.kt @@ -28,7 +28,7 @@ object UMinecraft { get() = guiScaleValue set(value) { guiScaleValue = value - //#if MC>=11502 + //#if MC>=11502 && MC<12005 //$$ val mc = getMinecraft() //$$ val window = mc.mainWindow //$$ val scaleFactor = window.calcGuiScale(value, mc.forceUnicodeFont) diff --git a/src/main/kotlin/gg/essential/universal/UScreen.kt b/src/main/kotlin/gg/essential/universal/UScreen.kt index e43a429..ba7dae7 100644 --- a/src/main/kotlin/gg/essential/universal/UScreen.kt +++ b/src/main/kotlin/gg/essential/universal/UScreen.kt @@ -40,6 +40,7 @@ abstract class UScreen( ) : this(restoreCurrentGuiOnClose, newGuiScale, null) private var guiScaleToRestore = -1 + private var restoringGuiScale = false private val screenToRestore: GuiScreen? = if (restoreCurrentGuiOnClose) currentScreen else null //#if MC>=12000 @@ -141,8 +142,7 @@ abstract class UScreen( //$$ //$$ final override fun onClose() { //$$ onScreenClose() - //$$ if (guiScaleToRestore != -1) - //$$ UMinecraft.guiScale = guiScaleToRestore + //$$ restoreGuiScale() //$$ } //$$ //#if MC>=12000 @@ -213,8 +213,7 @@ abstract class UScreen( final override fun onGuiClosed() { onScreenClose() - if (guiScaleToRestore != -1) - UMinecraft.guiScale = guiScaleToRestore + restoreGuiScale() } final override fun drawWorldBackground(tint: Int) { @@ -232,7 +231,7 @@ abstract class UScreen( } open fun updateGuiScale() { - if (newGuiScale != -1) { + if (newGuiScale != -1 && !restoringGuiScale) { if (guiScaleToRestore == -1) guiScaleToRestore = UMinecraft.guiScale UMinecraft.guiScale = newGuiScale @@ -241,6 +240,19 @@ abstract class UScreen( } } + private fun restoreGuiScale() { + if (guiScaleToRestore != -1) { + // This flag is necessary since on 1.20.5 setting the gui scale causes the screen's resize + // method to be called due to an option change callback. This resize causes the screen to reinitialize, + // which calls updateGuiScale. To prevent that method for changing the gui scale back, + // we suppress its behavior with a flag. + restoringGuiScale = true + UMinecraft.guiScale = guiScaleToRestore + restoringGuiScale = false + guiScaleToRestore = -1 + } + } + open fun initScreen(width: Int, height: Int) { //#if MC>=11502 //$$ super.init() diff --git a/src/main/kotlin/gg/essential/universal/vertex/VanillaVertexConsumer.kt b/src/main/kotlin/gg/essential/universal/vertex/VanillaVertexConsumer.kt index dd8447c..5ffa3cc 100644 --- a/src/main/kotlin/gg/essential/universal/vertex/VanillaVertexConsumer.kt +++ b/src/main/kotlin/gg/essential/universal/vertex/VanillaVertexConsumer.kt @@ -3,6 +3,10 @@ package gg.essential.universal.vertex import gg.essential.universal.UMatrixStack import net.minecraft.client.renderer.WorldRenderer +//#if MC>=12005 +//$$ import org.joml.Vector3f +//#endif + //#if MC>=11602 //$$ import com.mojang.blaze3d.vertex.IVertexBuilder //#else @@ -67,7 +71,10 @@ internal class VanillaVertexConsumer( inner.normal(x, y, z) return@apply } - //#if MC>=11602 + //#if MC>=12005 + //$$ val normal = stack.peek().normal.transform(x, y, z, Vector3f()) + //$$ inner.normal(normal.x, normal.y, normal.z) + //#elseif MC>=11602 //$$ inner.normal(stack.peek().normal, x, y, z); //#else val vec = Vector3f(x, y, z) diff --git a/versions/1.19.3-fabric/src/main/kotlin/gg/essential/universal/DummyPack.kt b/versions/1.19.3-fabric/src/main/kotlin/gg/essential/universal/DummyPack.kt index f31665c..7e346f0 100644 --- a/versions/1.19.3-fabric/src/main/kotlin/gg/essential/universal/DummyPack.kt +++ b/versions/1.19.3-fabric/src/main/kotlin/gg/essential/universal/DummyPack.kt @@ -39,4 +39,10 @@ internal object DummyPack : ResourcePack { override fun parseMetadata(metaReader: ResourceMetadataReader?): T? { throw UnsupportedOperationException() } + + //#if MC>=12005 + //$$ override fun getInfo(): net.minecraft.resource.ResourcePackInfo { + //$$ throw UnsupportedOperationException() + //$$ } + //#endif }