From 65324746fe5649d70fbe67f58664b641ed5c0d31 Mon Sep 17 00:00:00 2001 From: Jonas Herzig Date: Mon, 18 Sep 2023 16:48:27 +0200 Subject: [PATCH 1/3] Build: Port to 1.20.2-rc2 Fabric --- api/UniversalCraft.api | 107 +++++++++--------- root.gradle.kts | 2 + settings.gradle.kts | 1 + .../kotlin/gg/essential/universal/UScreen.kt | 26 ++++- .../essential/universal/wrappers/UPlayer.kt | 4 + versions/1.20.2-fabric/gradle.properties | 3 + 6 files changed, 90 insertions(+), 53 deletions(-) create mode 100644 versions/1.20.2-fabric/gradle.properties diff --git a/api/UniversalCraft.api b/api/UniversalCraft.api index f4f5c4c..0603d96 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.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 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 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.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 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 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.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 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.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 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 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.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 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.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 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 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.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 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.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 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 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.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 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.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 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 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.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 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 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.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 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 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.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 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.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 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.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 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.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 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 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.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 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.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 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.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 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.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 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.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 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.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 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.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 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.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 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.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 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.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 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.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 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.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 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.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 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.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 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.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 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.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 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.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 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.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 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.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 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 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.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 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; @@ -790,7 +790,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.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 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 @@ -807,7 +807,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.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 public fun getTitle ()Lnet/minecraft/text/Text; public fun getUnlocalizedName ()Ljava/lang/String; protected final fun init ()V @@ -817,6 +817,9 @@ 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 + 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 @1.16.2-forge public final fun onClose ()V @@ -837,10 +840,12 @@ 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.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 public final fun removed ()V - @1.20-fabric,1.20.1-fabric + @1.20-fabric,1.20.1-fabric,1.20.2-fabric public final fun render (Lnet/minecraft/client/gui/DrawContext;IIF)V + @1.20.2-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 @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 @@ -906,9 +911,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 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.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 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.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 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 @@ -928,11 +933,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 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.19.3-fabric,1.19.4-fabric,1.20-fabric,1.20.1-fabric,1.20.2-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 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.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 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 @@ -961,7 +966,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 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.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 public final fun getMc ()Lnet/minecraft/client/gl/GlBlendState; public final fun getSeparate ()Z public final fun getSrcAlpha ()Lgg/essential/universal/shader/BlendState$Param; @@ -1067,7 +1072,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.19.3-fabric,1.19.4-fabric,1.20-fabric,1.20.1-fabric,1.20.2-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 public final fun fromMcShader (Lnet/minecraft/client/renderer/ShaderInstance;Lgg/essential/universal/shader/BlendState;)Lgg/essential/universal/shader/UShader; @@ -1092,7 +1097,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.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 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 @@ -1168,7 +1173,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.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 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; @@ -1184,7 +1189,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.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 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; @@ -1202,7 +1207,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.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 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; @@ -1311,7 +1316,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.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 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 ae46b96..26ec859 100644 --- a/root.gradle.kts +++ b/root.gradle.kts @@ -9,6 +9,7 @@ plugins { version = versionFromBuildIdAndBranch() preprocess { + val fabric12002 = createNode("1.20.2-fabric", 12002, "yarn") val forge12001 = createNode("1.20.1-forge", 12001, "srg") val fabric12001 = createNode("1.20.1-fabric", 12001, "yarn") val fabric12000 = createNode("1.20-fabric", 12000, "yarn") @@ -29,6 +30,7 @@ preprocess { val forge11202 = createNode("1.12.2-forge", 11202, "srg") val forge10809 = createNode("1.8.9-forge", 10809, "srg") + fabric12002.link(fabric12001) forge12001.link(fabric12001) fabric12001.link(fabric12000) fabric12000.link(fabric11904) diff --git a/settings.gradle.kts b/settings.gradle.kts index f1e8044..b23fa63 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -37,6 +37,7 @@ listOf( "1.20-fabric", "1.20.1-fabric", "1.20.1-forge", + "1.20.2-fabric", ).forEach { version -> include(":$version") project(":$version").apply { diff --git a/src/main/kotlin/gg/essential/universal/UScreen.kt b/src/main/kotlin/gg/essential/universal/UScreen.kt index e1537f1..e43a429 100644 --- a/src/main/kotlin/gg/essential/universal/UScreen.kt +++ b/src/main/kotlin/gg/essential/universal/UScreen.kt @@ -64,6 +64,7 @@ abstract class UScreen( //$$ private var lastDraggedDy = -1.0 //$$ private var lastScrolledX = -1.0 //$$ private var lastScrolledY = -1.0 + //$$ private var lastScrolledDX = 0.0 //$$ //$$ final override fun init() { //$$ updateGuiScale() @@ -124,7 +125,12 @@ abstract class UScreen( //$$ return false //$$ } //$$ + //#if MC>=12002 + //$$ override fun mouseScrolled(mouseX: Double, mouseY: Double, horizontalAmount: Double, delta: Double): Boolean { + //$$ lastScrolledDX = horizontalAmount + //#else //$$ final override fun mouseScrolled(mouseX: Double, mouseY: Double, delta: Double): Boolean { + //#endif //$$ lastScrolledX = mouseX //$$ lastScrolledY = mouseY //$$ onMouseScrolled(delta) @@ -140,7 +146,17 @@ abstract class UScreen( //$$ } //$$ //#if MC>=12000 + //#if MC>=12002 + //$$ private var lastBackgroundMouseX = 0 + //$$ private var lastBackgroundMouseY = 0 + //$$ private var lastBackgroundDelta = 0f + //$$ final override fun renderBackground(context: DrawContext, mouseX: Int, mouseY: Int, delta: Float) { + //$$ lastBackgroundMouseX = mouseX + //$$ lastBackgroundMouseY = mouseY + //$$ lastBackgroundDelta = delta + //#else //$$ final override fun renderBackground(context: DrawContext) { + //#endif //$$ drawContexts.add(context) //$$ onDrawBackgroundCompat(UMatrixStack(context.matrices), 0) //$$ drawContexts.removeLast() @@ -321,7 +337,9 @@ abstract class UScreen( } open fun onMouseScrolled(delta: Double) { - //#if MC>=11502 + //#if MC>=12002 + //$$ super.mouseScrolled(lastScrolledX, lastScrolledY, lastScrolledDX, delta) + //#elseif MC>=11502 //$$ super.mouseScrolled(lastScrolledX, lastScrolledY, delta) //#endif } @@ -345,7 +363,11 @@ abstract class UScreen( open fun onDrawBackground(matrixStack: UMatrixStack, tint: Int) { //#if MC>=12000 //$$ withDrawContext(matrixStack) { drawContext -> - //$$ super.renderBackground(drawContext) + //#if MC>=12002 + //$$ super.renderBackground(drawContext, lastBackgroundMouseX, lastBackgroundMouseY, lastBackgroundDelta) + //#else + //$$ super.renderBackground(drawContext) + //#endif //$$ } //#elseif MC>=11904 //$$ super.renderBackground(matrixStack.toMC()) diff --git a/src/main/kotlin/gg/essential/universal/wrappers/UPlayer.kt b/src/main/kotlin/gg/essential/universal/wrappers/UPlayer.kt index d70f8f1..89c3c25 100644 --- a/src/main/kotlin/gg/essential/universal/wrappers/UPlayer.kt +++ b/src/main/kotlin/gg/essential/universal/wrappers/UPlayer.kt @@ -29,7 +29,11 @@ object UPlayer { @JvmStatic fun getUUID(): UUID { + //#if MC>=12002 + //$$ return UMinecraft.getMinecraft().session.uuidOrNull!! + //#else return UMinecraft.getMinecraft().session.profile.id + //#endif } @JvmStatic diff --git a/versions/1.20.2-fabric/gradle.properties b/versions/1.20.2-fabric/gradle.properties new file mode 100644 index 0000000..9c22df9 --- /dev/null +++ b/versions/1.20.2-fabric/gradle.properties @@ -0,0 +1,3 @@ +essential.defaults.loom.minecraft=com.mojang:minecraft:1.20.2-rc2 +essential.defaults.loom.mappings=net.fabricmc:yarn:1.20.2-rc2+build.1:v2 +essential.defaults.loom.fabric-loader=net.fabricmc:fabric-loader:0.14.22 From 8f30ee681231db2d424ac0b431ba7c1412e9c19e Mon Sep 17 00:00:00 2001 From: Jonas Herzig Date: Mon, 18 Sep 2023 18:25:50 +0200 Subject: [PATCH 2/3] Build: Further reduce peak memory consumption in GH Action --- .github/workflows/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 19229b6..02993cd 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -57,6 +57,7 @@ jobs: ./gradlew clean --stacktrace ./gradlew jar --stacktrace ./gradlew :{1.{8.9,12.2}-forge,1.{19,19.1}-fabric,1.{16.2,17.1,18.1}-{forge,fabric}}:build --stacktrace + ./gradlew :{1.20-fabric,1.{19.2,19.3,19.4,20.1}-{forge,fabric}}:build --stacktrace ./gradlew build --stacktrace - name: Publish From 73bb58165c7aa8b5dd61125406ba4ca79a24c4a9 Mon Sep 17 00:00:00 2001 From: Jonas Herzig Date: Mon, 18 Sep 2023 19:04:51 +0200 Subject: [PATCH 3/3] Build: Further reduce peak memory consumption in GH Action --- .github/workflows/main.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 02993cd..a92a45f 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -55,6 +55,8 @@ jobs: # BuildSharedServiceManager) will not release any memory until all scheduled remapJar tasks have complete. run: | ./gradlew clean --stacktrace + ./gradlew :{1.{8.9,12.2}-forge,1.{19,19.1}-fabric,1.{16.2,17.1,18.1}-{forge,fabric}}:jar --stacktrace + ./gradlew :{1.20-fabric,1.{19.2,19.3,19.4,20.1}-{forge,fabric}}:jar --stacktrace ./gradlew jar --stacktrace ./gradlew :{1.{8.9,12.2}-forge,1.{19,19.1}-fabric,1.{16.2,17.1,18.1}-{forge,fabric}}:build --stacktrace ./gradlew :{1.20-fabric,1.{19.2,19.3,19.4,20.1}-{forge,fabric}}:build --stacktrace