From bead31acd1c1a518b6f1a4afac9dc675344793b5 Mon Sep 17 00:00:00 2001 From: Apehum Date: Fri, 27 Oct 2023 04:05:20 +0800 Subject: [PATCH] Build: 1.20.2 forge --- .github/workflows/main.yml | 9 +- api/UniversalCraft.api | 113 +++++++++++++----------- build.gradle.kts | 30 ++++++- root.gradle.kts | 2 + settings.gradle.kts | 3 +- versions/1.20.2-forge/gradle.properties | 1 + 6 files changed, 94 insertions(+), 64 deletions(-) create mode 100644 versions/1.20.2-forge/gradle.properties diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 4999662..79a4373 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -39,7 +39,7 @@ jobs: - name: Setup environment run: | - echo "ORG_GRADLE_PROJECT_BUILD_ID=$(expr ${{ github.run_number }} + 290)" >> "$GITHUB_ENV" + echo "ORG_GRADLE_PROJECT_BUILD_ID=${{ github.run_number }}" >> "$GITHUB_ENV" # GitHub runners are limited to 7GB of RAM, so we'll limit our Gradle Daemon process to about half of that # which is enough so long as parallel task execution is limited. # We also need to limit the Kotlin Compiler Daemon to its default value (which it seems to be perfectly @@ -50,12 +50,5 @@ jobs: echo "org.gradle.jvmargs=-Xmx2G -Dkotlin.daemon.jvm.options=-Xmx512M" >> "$GRADLE_USER_HOME/gradle.properties" echo "org.gradle.workers.max=2" >> "$GRADLE_USER_HOME/gradle.properties" - - name: Build - run: ./gradlew build --stacktrace - - name: Publish run: ./gradlew publish --stacktrace - if: env.ORG_GRADLE_PROJECT_nexus_user != null - env: - ORG_GRADLE_PROJECT_nexus_user: ${{ secrets.NEXUS_USER }} - ORG_GRADLE_PROJECT_nexus_password: ${{ secrets.NEXUS_PASSWORD }} diff --git a/api/UniversalCraft.api b/api/UniversalCraft.api index 0603d96..fd0f28a 100644 --- a/api/UniversalCraft.api +++ b/api/UniversalCraft.api @@ -86,7 +86,7 @@ public final class gg/essential/universal/UDesktop { } 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.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 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; @@ -95,7 +95,7 @@ public class gg/essential/universal/UGraphics { 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.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 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 public fun (Lnet/minecraft/client/render/BufferBuilder;)V @@ -104,7 +104,7 @@ public class gg/essential/universal/UGraphics { public static fun activeTexture (I)V public static fun areShadersSupported ()Z public fun asUVertexConsumer ()Lgg/essential/universal/vertex/UVertexConsumer; - @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.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 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 @@ -113,12 +113,12 @@ public class gg/essential/universal/UGraphics { 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; - @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.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 public fun beginRenderLayer (Lnet/minecraft/client/renderer/RenderType;)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.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 public fun beginWithActiveShader (Lgg/essential/universal/UGraphics$DrawMode;Lcom/mojang/blaze3d/vertex/VertexFormat;)Lgg/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.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 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 public fun beginWithActiveShader (Lgg/essential/universal/UGraphics$DrawMode;Lnet/minecraft/client/render/VertexFormat;)Lgg/essential/universal/UGraphics; @@ -131,9 +131,9 @@ public class gg/essential/universal/UGraphics { public fun beginWithDefaultShader (Lgg/essential/universal/UGraphics$DrawMode;Lnet/minecraft/client/renderer/vertex/VertexFormat;)Lgg/essential/universal/UGraphics; public static fun bindTexture (I)V public static fun bindTexture (II)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.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 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.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 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 public static fun bindTexture (ILnet/minecraft/util/Identifier;)V @@ -181,7 +181,7 @@ public class gg/essential/universal/UGraphics { public static fun getFontHeight ()I public static fun getFromTessellator ()Lgg/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.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 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 public static fun getTessellator ()Lnet/minecraft/client/render/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.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 public static fun setShader (Ljava/util/function/Supplier;)V public static fun shadeModel (I)V public fun tex (DD)Lgg/essential/universal/UGraphics; @@ -241,7 +241,7 @@ public final class gg/essential/universal/UGraphics$CommonVertexFormats : java/l public static final field POSITION_TEXTURE_COLOR_LIGHT Lgg/essential/universal/UGraphics$CommonVertexFormats; public static final field POSITION_TEXTURE_COLOR_NORMAL Lgg/essential/universal/UGraphics$CommonVertexFormats; 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.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 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 public final field mc Lnet/minecraft/client/render/VertexFormat; @@ -259,7 +259,7 @@ public final class gg/essential/universal/UGraphics$DrawMode : java/lang/Enum { public static final field TRIANGLE_FAN Lgg/essential/universal/UGraphics$DrawMode; public static final field TRIANGLE_STRIP Lgg/essential/universal/UGraphics$DrawMode; 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.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 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 public static fun fromRenderLayer (Lnet/minecraft/client/render/RenderLayer;)Lgg/essential/universal/UGraphics$DrawMode; @@ -281,9 +281,9 @@ public class gg/essential/universal/UGraphics$GL { public final class gg/essential/universal/UGuiButton { public static final field INSTANCE Lgg/essential/universal/UGuiButton; - @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.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 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.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 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 public static final fun getX (Lnet/minecraft/client/gui/widget/ClickableWidget;)I @@ -305,7 +305,7 @@ public final class gg/essential/universal/UGuiButton { public final class gg/essential/universal/UImage { public static final field Companion Lgg/essential/universal/UImage$Companion; - @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.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 public fun (Lcom/mojang/blaze3d/platform/NativeImage;)V @1.16.2-forge public fun (Lnet/minecraft/client/renderer/texture/NativeImage;)V @@ -316,7 +316,7 @@ public final class gg/essential/universal/UImage { public final fun copy ()Lgg/essential/universal/UImage; public final fun copyFrom (Lgg/essential/universal/UImage;)V public final fun getHeight ()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.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 public final fun getNativeImage ()Lcom/mojang/blaze3d/platform/NativeImage; @1.16.2-forge public final fun getNativeImage ()Lnet/minecraft/client/renderer/texture/NativeImage; @@ -448,7 +448,7 @@ public final class gg/essential/universal/UKeyboard { public static final fun allowRepeatEvents (Z)V public static final fun getKeyName (I)Ljava/lang/String; 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.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 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 public static final fun getKeyName (Lnet/minecraft/client/option/KeyBinding;)Ljava/lang/String; @@ -497,9 +497,9 @@ public final class gg/essential/universal/UMatrixStack { public static final field Companion Lgg/essential/universal/UMatrixStack$Companion; public static final field UNIT Lgg/essential/universal/UMatrixStack; public fun ()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.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 public fun (Lcom/mojang/blaze3d/vertex/PoseStack$Pose;)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.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 public fun (Lcom/mojang/blaze3d/vertex/PoseStack;)V @1.16.2-forge public fun (Lcom/mojang/blaze3d/matrix/MatrixStack$Entry;)V @@ -512,7 +512,7 @@ public final class gg/essential/universal/UMatrixStack { 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.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 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 @@ -535,7 +535,7 @@ public final class gg/essential/universal/UMatrixStack { public final fun runWithGlobalState (Lkotlin/jvm/functions/Function0;)Ljava/lang/Object; public final fun scale (DDD)V public final fun scale (FFF)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.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 public final fun toMC ()Lcom/mojang/blaze3d/vertex/PoseStack; @1.16.2-forge public final fun toMC ()Lcom/mojang/blaze3d/matrix/MatrixStack; @@ -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.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 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.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 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.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 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.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 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.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 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.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 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.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 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; @@ -630,7 +630,7 @@ public final class gg/essential/universal/UMatrixStack$Entry { @1.12.2-forge,1.8.9-forge public final fun getNormal ()Lorg/lwjgl/util/vector/Matrix3f; public fun hashCode ()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.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 public final fun toMCStack ()Lcom/mojang/blaze3d/vertex/PoseStack; @1.16.2-forge public final fun toMCStack ()Lcom/mojang/blaze3d/matrix/MatrixStack; @@ -642,9 +642,9 @@ public final class gg/essential/universal/UMatrixStack$Entry { public final class gg/essential/universal/UMinecraft { public static final field INSTANCE Lgg/essential/universal/UMinecraft; public static final field isRunningOnMac Z - @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.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 public static final fun getChatGUI ()Lnet/minecraft/client/gui/components/ChatComponent; - @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.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 public static final fun getFontRenderer ()Lnet/minecraft/client/gui/Font; @1.16.2-forge public static final fun getChatGUI ()Lnet/minecraft/client/gui/NewChatGui; @@ -667,13 +667,13 @@ public final class gg/essential/universal/UMinecraft { public static final fun getSettings ()Lnet/minecraft/client/option/GameOptions; @1.16.2-fabric public static final fun getSettings ()Lnet/minecraft/client/options/GameOptions; - @1.12.2-forge,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.8.9-forge + @1.12.2-forge,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.8.9-forge public static final fun getMinecraft ()Lnet/minecraft/client/Minecraft; - @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.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 public static final fun getNetHandler ()Lnet/minecraft/client/multiplayer/ClientPacketListener; - @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.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 public static final fun getPlayer ()Lnet/minecraft/client/player/LocalPlayer; - @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.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 public static final fun getSettings ()Lnet/minecraft/client/Options; @1.16.2-forge public static final fun getNetHandler ()Lnet/minecraft/client/network/play/ClientPlayNetHandler; @@ -688,7 +688,7 @@ public final class gg/essential/universal/UMinecraft { @1.12.2-forge,1.8.9-forge public static final fun getSettings ()Lnet/minecraft/client/settings/GameSettings; 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.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 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 public static final fun getWorld ()Lnet/minecraft/client/world/ClientWorld; @@ -734,7 +734,7 @@ public final class gg/essential/universal/UResolution { public static final fun getWindowWidth ()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.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 public abstract class gg/essential/universal/UScreen : net/minecraft/client/gui/screens/Screen { public static final field Companion Lgg/essential/universal/UScreen$Companion; public fun ()V @@ -758,6 +758,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-forge + public fun mouseScrolled (DDDD)Z + @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 mouseScrolled (DDD)Z public fun onDrawBackground (I)V public fun onDrawBackground (Lgg/essential/universal/UMatrixStack;I)V @@ -773,8 +776,10 @@ public abstract class gg/essential/universal/UScreen : net/minecraft/client/gui/ public fun onScreenClose ()V public fun onTick ()V public final fun removed ()V - @1.20.1-forge + @1.20.1-forge,1.20.2-forge public final fun render (Lnet/minecraft/client/gui/GuiGraphics;IIF)V + @1.20.2-forge + public final fun renderBackground (Lnet/minecraft/client/gui/GuiGraphics;IIF)V @1.20.1-forge public final fun renderBackground (Lnet/minecraft/client/gui/GuiGraphics;)V @1.17.1-forge,1.18.1-forge,1.19.2-forge,1.19.3-forge,1.19.4-forge @@ -907,9 +912,9 @@ public abstract class gg/essential/universal/UScreen : net/minecraft/client/gui/ } public final class gg/essential/universal/UScreen$Companion { - @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.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 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.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 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 public final fun displayScreen (Lnet/minecraft/client/gui/screen/Screen;)V @@ -931,11 +936,11 @@ public final class gg/essential/universal/USound { public final fun playPlingSound ()V @1.8.9-forge public final fun playSoundStatic (Lnet/minecraft/util/ResourceLocation;FF)V - @1.19.3-forge,1.19.4-forge,1.20.1-forge + @1.19.3-forge,1.19.4-forge,1.20.1-forge,1.20.2-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 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.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 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 public final fun playSoundStatic (Lnet/minecraft/sound/SoundEvent;FF)V @@ -964,7 +969,7 @@ public final class gg/essential/universal/shader/BlendState { public final fun getDstRgb ()Lgg/essential/universal/shader/BlendState$Param; public final fun getEnabled ()Z 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.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 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 public final fun getMc ()Lnet/minecraft/client/gl/GlBlendState; @@ -1074,7 +1079,7 @@ 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/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 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.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 public final fun fromMcShader (Lnet/minecraft/client/renderer/ShaderInstance;Lgg/essential/universal/shader/BlendState;)Lgg/essential/universal/shader/UShader; @1.17.1-fabric,1.18.1-fabric,1.19-fabric,1.19.1-fabric,1.19.2-fabric public final fun fromMcShader (Lnet/minecraft/client/render/Shader;Lgg/essential/universal/shader/BlendState;)Lgg/essential/universal/shader/UShader; @@ -1125,12 +1130,12 @@ public final class gg/essential/universal/shader/UShader$DefaultImpls { public static fun getSamplerUniform (Lgg/essential/universal/shader/UShader;Ljava/lang/String;)Lgg/essential/universal/shader/SamplerUniform; } -@1.12.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.8.9-forge +@1.12.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.8.9-forge public final class gg/essential/universal/utils/ReleasedDynamicTexture : net/minecraft/client/renderer/texture/AbstractTexture { public fun (II)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.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 public fun (Lcom/mojang/blaze3d/platform/NativeImage;)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.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 public fun close ()V @1.12.2-forge,1.8.9-forge public fun (Ljava/awt/image/BufferedImage;)V @@ -1140,15 +1145,15 @@ public final class gg/essential/universal/utils/ReleasedDynamicTexture : net/min @1.12.2-forge,1.8.9-forge public fun getGlTextureId ()I public final fun getHeight ()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.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 public fun getId ()I @1.12.2-forge,1.8.9-forge public final fun getTextureData ()[I public final fun getUploaded ()Z public final fun getWidth ()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.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 public fun load (Lnet/minecraft/server/packs/resources/ResourceManager;)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.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 public fun releaseId ()V @1.12.2-forge,1.8.9-forge public fun loadTexture (Lnet/minecraft/client/resources/IResourceManager;)V @@ -1169,7 +1174,7 @@ public abstract interface class gg/essential/universal/vertex/UVertexConsumer { public abstract fun norm (Lgg/essential/universal/UMatrixStack;FFF)Lgg/essential/universal/vertex/UVertexConsumer; @1.8.9-forge public static fun of (Lnet/minecraft/client/renderer/WorldRenderer;)Lgg/essential/universal/vertex/UVertexConsumer; - @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.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 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; @@ -1185,7 +1190,7 @@ public abstract interface class gg/essential/universal/vertex/UVertexConsumer { public final class gg/essential/universal/vertex/UVertexConsumer$Companion { @1.8.9-forge public final fun of (Lnet/minecraft/client/renderer/WorldRenderer;)Lgg/essential/universal/vertex/UVertexConsumer; - @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.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 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; @@ -1203,7 +1208,7 @@ public final class gg/essential/universal/vertex/UVertexConsumer$DefaultImpls { public final class gg/essential/universal/wrappers/UPlayer { public static final field INSTANCE Lgg/essential/universal/wrappers/UPlayer; - @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.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 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; @@ -1278,7 +1283,7 @@ public final class gg/essential/universal/wrappers/message/UTextComponent : net/ public final fun setText (Ljava/lang/String;)V } -@1.19.2-forge,1.19.3-forge,1.19.4-forge,1.20.1-forge +@1.19.2-forge,1.19.3-forge,1.19.4-forge,1.20.1-forge,1.20.2-forge public final class gg/essential/universal/wrappers/message/UTextComponent : net/minecraft/network/chat/Component { 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..db8e582 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -2,9 +2,11 @@ import gg.essential.gradle.util.* plugins { kotlin("jvm") + `java-library` + `maven-publish` id("gg.essential.multi-version") id("gg.essential.defaults") - id("gg.essential.defaults.maven-publish") +// id("gg.essential.defaults.maven-publish") } group = "gg.essential" @@ -22,3 +24,29 @@ tasks.jar { attributes(mapOf("FMLModType" to "LIBRARY")) } } + +publishing { + publications { + register("maven") { + from(components["java"]) + + pluginManager.withPlugin("gg.essential.multi-version") { + val baseArtifactId = (if (parent == rootProject) rootProject.name.toLowerCase() else null) + ?: project.findProperty("baseArtifactId")?.toString() + ?: throw GradleException("No default base maven artifact id found. Set `baseArtifactId` in the `gradle.properties` file of the multi-version-root project.") + artifactId = "$baseArtifactId-$platform" + } + } + } + + repositories { + maven("https://repo.plasmoverse.com/snapshots") { + name = "PlasmoVerseSnapshots" + + credentials { + username = System.getenv("MAVEN_USERNAME") + password = System.getenv("MAVEN_PASSWORD") + } + } + } +} diff --git a/root.gradle.kts b/root.gradle.kts index 26ec859..cf57660 100644 --- a/root.gradle.kts +++ b/root.gradle.kts @@ -9,6 +9,7 @@ plugins { version = versionFromBuildIdAndBranch() preprocess { + val forge12002 = createNode("1.20.2-forge", 12002, "yarn") 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") @@ -30,6 +31,7 @@ preprocess { val forge11202 = createNode("1.12.2-forge", 11202, "srg") val forge10809 = createNode("1.8.9-forge", 10809, "srg") + forge12002.link(fabric12002) fabric12002.link(fabric12001) forge12001.link(fabric12001) fabric12001.link(fabric12000) diff --git a/settings.gradle.kts b/settings.gradle.kts index 1251f91..f1e4c5f 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -38,10 +38,11 @@ listOf( "1.20.1-fabric", "1.20.1-forge", "1.20.2-fabric", + "1.20.2-forge", ).forEach { version -> include(":$version") project(":$version").apply { projectDir = file("versions/$version") buildFileName = "../../build.gradle.kts" } -} \ No newline at end of file +} diff --git a/versions/1.20.2-forge/gradle.properties b/versions/1.20.2-forge/gradle.properties new file mode 100644 index 0000000..79bb6de --- /dev/null +++ b/versions/1.20.2-forge/gradle.properties @@ -0,0 +1 @@ +essential.defaults.loom.forge=net.minecraftforge:forge:1.20.2-48.0.33