From 9467318f0873a7b8db654bccb35321fb4e3a0293 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20N=C3=BCcke?= Date: Sun, 20 Aug 2023 13:26:27 +0200 Subject: [PATCH] Porting to MC 1.20.1. --- .github/workflows/build.yml | 9 +- .github/workflows/publish-curseforge.yml | 41 ----- .github/workflows/publish-modrinth.yml | 41 ----- .github/workflows/publish.yml | 78 +++++----- build.gradle | 82 ---------- build.gradle.kts | 145 ++++++++++++++++++ common/build.gradle | 19 --- common/build.gradle.kts | 28 ++++ .../src/main/java/li/cil/manual/api/Tab.java | 6 +- .../cil/manual/api/content/package-info.java | 2 +- .../java/li/cil/manual/api/package-info.java | 2 +- .../java/li/cil/manual/api/prefab/Manual.java | 2 +- .../manual/api/prefab/item/package-info.java | 2 +- .../cil/manual/api/prefab/package-info.java | 2 +- .../api/prefab/provider/package-info.java | 2 +- .../prefab/renderer/BitmapFontRenderer.java | 9 +- .../renderer/MinecraftFontRenderer.java | 12 +- .../api/prefab/renderer/package-info.java | 2 +- .../manual/api/prefab/tab/ItemStackTab.java | 25 +-- .../cil/manual/api/prefab/tab/TextureTab.java | 11 +- .../manual/api/prefab/tab/package-info.java | 2 +- .../cil/manual/api/provider/package-info.java | 2 +- .../manual/api/render/ContentRenderer.java | 14 +- .../cil/manual/api/render/FontRenderer.java | 23 +-- .../cil/manual/api/render/package-info.java | 2 +- .../li/cil/manual/api/util/package-info.java | 2 +- .../client/document/DocumentRenderer.java | 50 +++--- .../manual/client/document/package-info.java | 2 +- .../document/segment/RenderSegment.java | 17 +- .../client/document/segment/Segment.java | 6 +- .../client/document/segment/TextSegment.java | 17 +- .../client/document/segment/package-info.java | 2 +- .../render/ItemStackContentRenderer.java | 28 +--- .../render/TextureContentRenderer.java | 6 +- .../document/segment/render/package-info.java | 2 +- .../cil/manual/client/gui/ManualScreen.java | 84 +++++----- .../cil/manual/client/gui/package-info.java | 2 +- .../li/cil/manual/client/package-info.java | 2 +- .../manual/client/provider/package-info.java | 2 +- .../cil/manual/client/util/package-info.java | 2 +- fabric/build.gradle | 132 ---------------- fabric/build.gradle.kts | 33 ++++ fabric/src/main/resources/fabric.mod.json | 57 ++++--- forge/build.gradle | 126 --------------- forge/build.gradle.kts | 34 ++++ forge/src/main/resources/META-INF/mods.toml | 16 +- gradle.properties | 21 +-- gradle/libs.versions.toml | 27 ++++ gradle/wrapper/gradle-wrapper.jar | Bin 59203 -> 59821 bytes gradle/wrapper/gradle-wrapper.properties | 2 +- settings.gradle | 14 -- settings.gradle.kts | 33 ++++ 52 files changed, 541 insertions(+), 741 deletions(-) delete mode 100644 .github/workflows/publish-curseforge.yml delete mode 100644 .github/workflows/publish-modrinth.yml delete mode 100644 build.gradle create mode 100644 build.gradle.kts delete mode 100644 common/build.gradle create mode 100644 common/build.gradle.kts delete mode 100644 fabric/build.gradle create mode 100644 fabric/build.gradle.kts delete mode 100644 forge/build.gradle create mode 100644 forge/build.gradle.kts create mode 100644 gradle/libs.versions.toml delete mode 100644 settings.gradle create mode 100644 settings.gradle.kts diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 33a58b6..35f2bb6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -14,21 +14,22 @@ jobs: runs-on: ${{ matrix.os }} steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Set up JDK ${{ matrix.java }} - uses: actions/setup-java@v1 + uses: actions/setup-java@v3 with: + distribution: temurin java-version: ${{ matrix.java }} - name: Grant execute permission for gradlew run: chmod +x gradlew - name: Validate Gradle wrapper uses: gradle/wrapper-validation-action@v1 - - uses: actions/cache@v2 + - uses: actions/cache@v3 with: path: | ~/.gradle/caches ~/.gradle/wrapper - key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }} + key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }} restore-keys: ${{ runner.os }}-gradle- - name: Build with Gradle run: ./gradlew build diff --git a/.github/workflows/publish-curseforge.yml b/.github/workflows/publish-curseforge.yml deleted file mode 100644 index 8134cdb..0000000 --- a/.github/workflows/publish-curseforge.yml +++ /dev/null @@ -1,41 +0,0 @@ -name: publish-curseforge - -on: - workflow_dispatch: - inputs: - version: - description: 'Mod Version' - required: true - default: '0.0.0' - -jobs: - publish: - runs-on: ubuntu-latest - steps: - - name: Set up JDK - uses: actions/setup-java@v1 - with: - java-version: 17 - - name: Grant execute permission for gradlew - run: chmod +x gradlew - - name: Validate Gradle wrapper - uses: gradle/wrapper-validation-action@v1 - - uses: actions/cache@v2 - with: - path: | - ~/.gradle/caches - ~/.gradle/wrapper - key: ubuntu-latest-gradle-${{ hashFiles('**/*.gradle*') }} - restore-keys: ubuntu-latest-gradle- - - - name: Publish to Curseforge (Forge) - run: ./gradlew -Psemver='${{ github.event.inputs.version }}' forge:curseforge - env: - CURSEFORGE_API_KEY: ${{ secrets.CURSEFORGE_API_KEY }} - CHANGELOG: ${{ github.event.release.body }} - - - name: Publish to Curseforge (Fabric) - run: ./gradlew -Psemver='${{ github.event.inputs.version }}' fabric:curseforge - env: - CURSEFORGE_API_KEY: ${{ secrets.CURSEFORGE_API_KEY }} - CHANGELOG: ${{ github.event.release.body }} diff --git a/.github/workflows/publish-modrinth.yml b/.github/workflows/publish-modrinth.yml deleted file mode 100644 index 8728068..0000000 --- a/.github/workflows/publish-modrinth.yml +++ /dev/null @@ -1,41 +0,0 @@ -name: publish-modrinth - -on: - workflow_dispatch: - inputs: - version: - description: 'Mod Version' - required: true - default: '0.0.0' - -jobs: - publish: - runs-on: ubuntu-latest - steps: - - name: Set up JDK - uses: actions/setup-java@v1 - with: - java-version: 17 - - name: Grant execute permission for gradlew - run: chmod +x gradlew - - name: Validate Gradle wrapper - uses: gradle/wrapper-validation-action@v1 - - uses: actions/cache@v2 - with: - path: | - ~/.gradle/caches - ~/.gradle/wrapper - key: ubuntu-latest-gradle-${{ hashFiles('**/*.gradle*') }} - restore-keys: ubuntu-latest-gradle- - - - name: Publish to modrinth (Forge) - run: ./gradlew -Psemver='${{ github.event.inputs.version }}' forge:modrinth - env: - MODRINTH_API_KEY: ${{ secrets.MODRINTH_API_KEY }} - CHANGELOG: ${{ github.event.release.body }} - - - name: Publish to modrinth (Fabric) - run: ./gradlew -Psemver='${{ github.event.inputs.version }}' fabric:modrinth - env: - MODRINTH_API_KEY: ${{ secrets.MODRINTH_API_KEY }} - CHANGELOG: ${{ github.event.release.body }} diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 50e2f94..c43a295 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -9,79 +9,71 @@ jobs: name: publish runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Extract Version from Tag - uses: rishabhgupta/split-by@v1 id: split_tag - with: - string: ${{ github.event.release.tag_name }} - split-by: '/' + run: | + tag=${{ github.event.release.tag_name }} + parts=(${tag//\// }) + echo "mc_version=${parts[0]}" >> $GITHUB_OUTPUT + echo "mod_version=${parts[1]}" >> $GITHUB_OUTPUT - name: Set up JDK - uses: actions/setup-java@v1 + uses: actions/setup-java@v3 with: + distribution: temurin java-version: 17 - name: Grant execute permission for gradlew run: chmod +x gradlew - name: Validate Gradle wrapper uses: gradle/wrapper-validation-action@v1 - - uses: actions/cache@v2 + - uses: actions/cache@v3 with: path: | ~/.gradle/caches ~/.gradle/wrapper - key: ubuntu-latest-gradle-${{ hashFiles('**/*.gradle*') }} + key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }} restore-keys: ubuntu-latest-gradle- - name: Build with Gradle - run: ./gradlew -Psemver='${{ steps.split_tag.outputs._1 }}' build + run: ./gradlew -PmodVersion='${{ steps.split_tag.outputs.mod_version }}' build - name: Remove extra JARs run: | rm fabric/build/libs/*-dev-shadow.jar - rm fabric/build/libs/*-sources.jar rm forge/build/libs/*-dev-shadow.jar - rm forge/build/libs/*-sources.jar - name: Add Artifacts to Github Release - uses: alexellis/upload-assets@0.3.0 + uses: alexellis/upload-assets@0.4.0 env: GITHUB_TOKEN: ${{ github.token }} with: - asset_paths: '["./forge/build/libs/*.jar","./fabric/build/libs/*.jar"]' + asset_paths: '["./forge/build/libs/*.jar","./fabric/build/libs/*.jar","./common/build/libs/*-api.jar"]' - - name: Publish to Github Packages (Forge) - run: gradle -Psemver='${{ steps.split_tag.outputs._1 }}' forge:publish - env: - GITHUB_MAVEN_URL: 'https://maven.pkg.github.com/${{ github.repository }}' - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + - name: Publish to Curseforge and Minotaur (Forge) + uses: Kir-Antipov/mc-publish@v3.3 + with: + name: Scannable MC${{ steps.split_tag.outputs.mc_version }}-${{ steps.split_tag.outputs.mod_version }} + version: ${{ steps.split_tag.outputs.mod_version }} + java: Java 17 - - name: Publish to Github Packages (Fabric) - run: gradle -Psemver='${{ steps.split_tag.outputs._1 }}' fabric:publish - env: - GITHUB_MAVEN_URL: 'https://maven.pkg.github.com/${{ github.repository }}' - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + files: | + forge/build/libs/*.jar + common/build/libs/*-api.jar - - name: Publish to Curseforge (Forge) - run: ./gradlew -Psemver='${{ steps.split_tag.outputs._1 }}' forge:curseforge - env: - CURSEFORGE_API_KEY: ${{ secrets.CURSEFORGE_API_KEY }} - CHANGELOG: ${{ github.event.release.body }} + modrinth-token: ${{ secrets.MODRINTH_API_KEY }} + curseforge-token: ${{ secrets.CURSEFORGE_API_KEY }} - - name: Publish to Curseforge (Fabric) - run: ./gradlew -Psemver='${{ steps.split_tag.outputs._1 }}' fabric:curseforge - env: - CURSEFORGE_API_KEY: ${{ secrets.CURSEFORGE_API_KEY }} - CHANGELOG: ${{ github.event.release.body }} + - name: Publish to Curseforge and Minotaur (Fabric) + uses: Kir-Antipov/mc-publish@v3.3 + with: + name: Scannable MC${{ steps.split_tag.outputs.mc_version }}-${{ steps.split_tag.outputs.mod_version }} + version: ${{ steps.split_tag.outputs.mod_version }} + java: Java 17 - - name: Publish to modrinth (Forge) - run: ./gradlew -Psemver='${{ steps.split_tag.outputs._1 }}' forge:modrinth - env: - MODRINTH_API_KEY: ${{ secrets.MODRINTH_API_KEY }} - CHANGELOG: ${{ github.event.release.body }} + files: | + fabric/build/libs/*.jar + common/build/libs/*-api.jar - - name: Publish to modrinth (Fabric) - run: ./gradlew -Psemver='${{ steps.split_tag.outputs._1 }}' fabric:modrinth - env: - MODRINTH_API_KEY: ${{ secrets.MODRINTH_API_KEY }} - CHANGELOG: ${{ github.event.release.body }} + modrinth-token: ${{ secrets.MODRINTH_API_KEY }} + curseforge-token: ${{ secrets.CURSEFORGE_API_KEY }} diff --git a/build.gradle b/build.gradle deleted file mode 100644 index c1db393..0000000 --- a/build.gradle +++ /dev/null @@ -1,82 +0,0 @@ -plugins { - id "architectury-plugin" version "3.4-SNAPSHOT" - id "dev.architectury.loom" version "1.0-SNAPSHOT" apply false - id "com.matthewprenger.cursegradle" version "1.4.0" apply false - id "com.modrinth.minotaur" version "2.5.0" apply false -} - -architectury { - minecraft = rootProject.minecraft_version -} - -subprojects { - apply plugin: "dev.architectury.loom" - - loom { - silentMojangMappingsLicense() - } - - dependencies { - minecraft "com.mojang:minecraft:${rootProject.minecraft_version}" - mappings loom.officialMojangMappings() - } -} - -def getGitRef() { - try { - final def stdout = new ByteArrayOutputStream() - exec { - commandLine "git", "rev-parse", "--short", "HEAD" - standardOutput = stdout - } - return stdout.toString().trim() - } catch (final Throwable ignored) { - return "unknown" - } -} - -allprojects { - apply plugin: "java" - apply plugin: "architectury-plugin" - apply plugin: "com.matthewprenger.cursegradle" - apply plugin: "com.modrinth.minotaur" - apply plugin: "maven-publish" - - archivesBaseName = "${rootProject.archives_base_name}-MC${rootProject.minecraft_version}-${project.name}" - version = "${rootProject.semver}+${getGitRef()}" - group = rootProject.maven_group - - repositories { - maven { - url "https://cursemaven.com" - content { includeGroup "curse.maven" } - } - } - - dependencies { - compileOnly "com.google.code.findbugs:jsr305:3.0.2" - } - - tasks.withType(JavaCompile) { - options.encoding = "UTF-8" - options.release = 17 - } - - java { - withSourcesJar() - } - - jar { - from("LICENSE") { - rename { "${it}_${rootProject.archivesBaseName}" } - } - } - - idea { - module { - for (final String exclude in ["out", "logs"]) { - excludeDirs += file(exclude) - } - } - } -} diff --git a/build.gradle.kts b/build.gradle.kts new file mode 100644 index 0000000..5a6b7eb --- /dev/null +++ b/build.gradle.kts @@ -0,0 +1,145 @@ +import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar +import net.fabricmc.loom.api.LoomGradleExtensionAPI +import net.fabricmc.loom.task.RemapJarTask +import org.gradle.configurationcache.extensions.capitalized + +plugins { + java + alias(libs.plugins.architectury) + alias(libs.plugins.loom) apply false + alias(libs.plugins.shadow) apply false + alias(libs.plugins.spotless) +} + +val modId: String by project +val modVersion: String by project +val mavenGroup: String by project +val enabledPlatforms: String by project +val minecraftVersion: String = libs.versions.minecraft.get() + +fun getGitRef(): String { + return providers.exec { + commandLine("git", "rev-parse", "--short", "HEAD") + isIgnoreExitValue = true + }.standardOutput.asText.get().trim() +} + +subprojects { + apply(plugin = "java") + apply(plugin = rootProject.libs.plugins.architectury.get().pluginId) + apply(plugin = rootProject.libs.plugins.loom.get().pluginId) + + version = "${modVersion}+${getGitRef()}" + group = mavenGroup + base.archivesName.set("${modId}-MC${minecraftVersion}-${project.name}") + + architectury { + minecraft = minecraftVersion + } + + configure { + silentMojangMappingsLicense() + } + + repositories { + exclusiveContent { + forRepository { maven("https://maven.parchmentmc.org") } + filter { includeGroupByRegex("org\\.parchmentmc.*") } + } + exclusiveContent { + forRepository { maven("https://cursemaven.com") } + filter { includeGroup("curse.maven") } + } + } + + dependencies { + "minecraft"(rootProject.libs.minecraft) + val loom = project.extensions.getByName("loom") + "mappings"(loom.layered { + officialMojangMappings() + parchment("org.parchmentmc.data:parchment-$minecraftVersion:${rootProject.libs.versions.parchment.get()}@zip") + }) + "compileOnly"("com.google.code.findbugs:jsr305:3.0.2") + } + + tasks { + jar { + from("LICENSE") { + rename { "${it}_${modId}" } + } + } + + withType().configureEach { + options.encoding = "utf-8" + options.release.set(17) + } + } + + idea { + module { + for (exclude in arrayOf("out", "logs")) { + excludeDirs.add(file(exclude)) + } + } + } +} + +for (platform in enabledPlatforms.split(',')) { + project(":$platform") { + apply(plugin = rootProject.libs.plugins.shadow.get().pluginId) + + architectury { + platformSetupLoomIde() + loader(platform) + } + + val common: Configuration by configurations.creating + val shadowCommon: Configuration by configurations.creating + + configurations { + compileClasspath.get().extendsFrom(common) + runtimeClasspath.get().extendsFrom(common) + getByName("development${platform.capitalized()}").extendsFrom(common) + } + + dependencies { + common(project(path = ":common", configuration = "namedElements")) { isTransitive = false } + shadowCommon(project(path = ":common", configuration = "transformProduction${platform.capitalized()}")) { isTransitive = false } + } + + tasks { + withType { + exclude("architectury.common.json") + configurations = listOf(shadowCommon) + archiveClassifier.set("dev-shadow") + } + + withType { + val shadowJarTask = getByName("shadowJar") + inputFile.set(shadowJarTask.archiveFile) + dependsOn(shadowJarTask) + archiveClassifier.set(null as String?) + } + + jar { + archiveClassifier.set("dev") + } + } + + (components["java"] as AdhocComponentWithVariants) + .withVariantsFromConfiguration(configurations["shadowRuntimeElements"]) { + skip() + } + } +} + +spotless { + java { + target("*/src/*/java/li/cil/**/*.java") + + endWithNewline() + trimTrailingWhitespace() + removeUnusedImports() + indentWithSpaces() + } +} diff --git a/common/build.gradle b/common/build.gradle deleted file mode 100644 index 35b2319..0000000 --- a/common/build.gradle +++ /dev/null @@ -1,19 +0,0 @@ -architectury { - common(rootProject.enabled_platforms.split(",")) -} - -loom { - accessWidenerPath = file("src/main/resources/markdown_manual.accesswidener") -} - -dependencies { - modImplementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}" - modApi "dev.architectury:architectury:${rootProject.architectury_version}" -} - -task apiJar(type: Jar) { - from sourceSets.main.allSource - from sourceSets.main.output - archiveClassifier.set("api") - include "li/cil/manual/api/**" -} diff --git a/common/build.gradle.kts b/common/build.gradle.kts new file mode 100644 index 0000000..b815dbf --- /dev/null +++ b/common/build.gradle.kts @@ -0,0 +1,28 @@ +val enabledPlatforms: String by project +val modId: String by project + +architectury { + common(enabledPlatforms.split(",")) +} + +loom { + accessWidenerPath.set(file("src/main/resources/${modId}.accesswidener")) +} + +dependencies { + modImplementation(libs.fabric.loader) + modApi(libs.architectury.api) +} + +tasks { + register("apiJar") { + from(sourceSets.main.get().allSource) + from(sourceSets.main.get().output) + archiveClassifier.set("api") + include("li/cil/manual/api/**") + } + + jar { + dependsOn("apiJar") + } +} diff --git a/common/src/main/java/li/cil/manual/api/Tab.java b/common/src/main/java/li/cil/manual/api/Tab.java index a08ebe0..6d516c0 100644 --- a/common/src/main/java/li/cil/manual/api/Tab.java +++ b/common/src/main/java/li/cil/manual/api/Tab.java @@ -1,7 +1,7 @@ package li.cil.manual.api; -import com.mojang.blaze3d.vertex.PoseStack; import li.cil.manual.api.util.MarkdownManualRegistryEntry; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.network.chat.Component; import java.util.List; @@ -21,9 +21,9 @@ public interface Tab extends MarkdownManualRegistryEntry { * This should render something in a 16x16 area. The OpenGL state has been * adjusted so that drawing starts at (0,0,0), and should go to (16,16,0). * - * @param matrixStack the current matrix stack. + * @param graphics the current graphics context. */ - void renderIcon(PoseStack matrixStack); + void renderIcon(GuiGraphics graphics); /** * The (ideally localized) tooltip for the tab. diff --git a/common/src/main/java/li/cil/manual/api/content/package-info.java b/common/src/main/java/li/cil/manual/api/content/package-info.java index b956a2d..bf70fe2 100644 --- a/common/src/main/java/li/cil/manual/api/content/package-info.java +++ b/common/src/main/java/li/cil/manual/api/content/package-info.java @@ -4,4 +4,4 @@ import net.minecraft.MethodsReturnNonnullByDefault; -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/common/src/main/java/li/cil/manual/api/package-info.java b/common/src/main/java/li/cil/manual/api/package-info.java index 1007d6e..651acd1 100644 --- a/common/src/main/java/li/cil/manual/api/package-info.java +++ b/common/src/main/java/li/cil/manual/api/package-info.java @@ -4,4 +4,4 @@ import net.minecraft.MethodsReturnNonnullByDefault; -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/common/src/main/java/li/cil/manual/api/prefab/Manual.java b/common/src/main/java/li/cil/manual/api/prefab/Manual.java index cc2cb05..9d9ad28 100644 --- a/common/src/main/java/li/cil/manual/api/prefab/Manual.java +++ b/common/src/main/java/li/cil/manual/api/prefab/Manual.java @@ -80,7 +80,7 @@ public Optional pathFor(final Level world, final BlockPos pos, final Dir */ @Override public Optional documentFor(final String path) { - final String language = Minecraft.getInstance().getLanguageManager().getSelected().getCode(); + final String language = Minecraft.getInstance().getLanguageManager().getSelected(); final Optional document = documentFor(path.replace(LANGUAGE_KEY, language), language, new LinkedHashSet<>()); return document.isPresent() ? document : documentFor(path.replace(LANGUAGE_KEY, FALLBACK_LANGUAGE), FALLBACK_LANGUAGE, new LinkedHashSet<>()); } diff --git a/common/src/main/java/li/cil/manual/api/prefab/item/package-info.java b/common/src/main/java/li/cil/manual/api/prefab/item/package-info.java index c3587f6..7257610 100644 --- a/common/src/main/java/li/cil/manual/api/prefab/item/package-info.java +++ b/common/src/main/java/li/cil/manual/api/prefab/item/package-info.java @@ -4,4 +4,4 @@ import net.minecraft.MethodsReturnNonnullByDefault; -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/common/src/main/java/li/cil/manual/api/prefab/package-info.java b/common/src/main/java/li/cil/manual/api/prefab/package-info.java index 1919bb9..1a26a89 100644 --- a/common/src/main/java/li/cil/manual/api/prefab/package-info.java +++ b/common/src/main/java/li/cil/manual/api/prefab/package-info.java @@ -4,4 +4,4 @@ import net.minecraft.MethodsReturnNonnullByDefault; -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/common/src/main/java/li/cil/manual/api/prefab/provider/package-info.java b/common/src/main/java/li/cil/manual/api/prefab/provider/package-info.java index d8d90f9..fdf5d02 100644 --- a/common/src/main/java/li/cil/manual/api/prefab/provider/package-info.java +++ b/common/src/main/java/li/cil/manual/api/prefab/provider/package-info.java @@ -4,4 +4,4 @@ import net.minecraft.MethodsReturnNonnullByDefault; -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/common/src/main/java/li/cil/manual/api/prefab/renderer/BitmapFontRenderer.java b/common/src/main/java/li/cil/manual/api/prefab/renderer/BitmapFontRenderer.java index bff2525..ef4c207 100644 --- a/common/src/main/java/li/cil/manual/api/prefab/renderer/BitmapFontRenderer.java +++ b/common/src/main/java/li/cil/manual/api/prefab/renderer/BitmapFontRenderer.java @@ -1,7 +1,6 @@ package li.cil.manual.api.prefab.renderer; import com.mojang.blaze3d.vertex.DefaultVertexFormat; -import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; import com.mojang.blaze3d.vertex.VertexFormat; import it.unimi.dsi.fastutil.chars.Char2IntMap; @@ -12,6 +11,7 @@ import net.minecraft.client.renderer.RenderType; import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; +import org.joml.Matrix4f; import java.util.Optional; @@ -42,13 +42,13 @@ protected BitmapFontRenderer() { /** * {@inheritDoc} */ - public void drawBatch(final PoseStack matrixStack, final MultiBufferSource bufferFactory, final CharSequence value, final int argb) { + public void drawInBatch(final CharSequence value, final int argb, final Matrix4f matrix, final MultiBufferSource bufferFactory) { final VertexConsumer buffer = getDefaultBuffer(bufferFactory); float tx = 0f; for (int i = 0; i < value.length(); i++) { final char ch = value.charAt(i); - drawChar(matrixStack, buffer, argb, tx, ch); + drawChar(matrix, buffer, argb, tx, ch); tx += width(" ") + getGapU(); } } @@ -136,7 +136,7 @@ private VertexConsumer getDefaultBuffer(final MultiBufferSource bufferFactory) { return bufferFactory.getBuffer(renderLayer); } - private void drawChar(final PoseStack matrixStack, final VertexConsumer buffer, final int argb, final float x, final char ch) { + private void drawChar(final Matrix4f matrix, final VertexConsumer buffer, final int argb, final float x, final char ch) { if (Character.isWhitespace(ch) || Character.isISOControl(ch)) { return; } @@ -153,7 +153,6 @@ private void drawChar(final PoseStack matrixStack, final VertexConsumer buffer, final float u = column * U_STEP; final float v = row * V_STEP; - final var matrix = matrixStack.last().pose(); buffer.vertex(matrix, x, lineHeight(), 0) .color(r, g, b, a) .uv(u, v + V_SIZE) diff --git a/common/src/main/java/li/cil/manual/api/prefab/renderer/MinecraftFontRenderer.java b/common/src/main/java/li/cil/manual/api/prefab/renderer/MinecraftFontRenderer.java index a456bf3..d3897b6 100644 --- a/common/src/main/java/li/cil/manual/api/prefab/renderer/MinecraftFontRenderer.java +++ b/common/src/main/java/li/cil/manual/api/prefab/renderer/MinecraftFontRenderer.java @@ -1,10 +1,12 @@ package li.cil.manual.api.prefab.renderer; -import com.mojang.blaze3d.vertex.PoseStack; import li.cil.manual.api.render.FontRenderer; +import net.minecraft.client.gui.Font; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.LightTexture; import net.minecraft.network.chat.Component; +import org.joml.Matrix4f; /** * Implementation of the {@link FontRenderer} interface using the default Minecraft font renderer. @@ -17,13 +19,13 @@ public MinecraftFontRenderer(final net.minecraft.client.gui.Font font) { } @Override - public void draw(final PoseStack matrixStack, final CharSequence value, final int argb) { - font.draw(matrixStack, value.toString(), 0, 0, argb); + public void draw(final GuiGraphics graphics, final CharSequence value, final int argb) { + graphics.drawString(font, value.toString(), 0, 0, argb); } @Override - public void drawBatch(final PoseStack matrixStack, final MultiBufferSource buffer, final CharSequence value, final int argb) { - font.drawInBatch(value.toString(), 0, 0, argb, false, matrixStack.last().pose(), buffer, false, 0, LightTexture.pack(0xF, 0xF)); + public void drawInBatch(final CharSequence value, final int argb, final Matrix4f matrix, final MultiBufferSource buffer) { + font.drawInBatch(value.toString(), 0, 0, argb, false, matrix, buffer, Font.DisplayMode.NORMAL, 0, LightTexture.pack(0xF, 0xF)); } @Override diff --git a/common/src/main/java/li/cil/manual/api/prefab/renderer/package-info.java b/common/src/main/java/li/cil/manual/api/prefab/renderer/package-info.java index 2dcd4e6..37bad2c 100644 --- a/common/src/main/java/li/cil/manual/api/prefab/renderer/package-info.java +++ b/common/src/main/java/li/cil/manual/api/prefab/renderer/package-info.java @@ -4,4 +4,4 @@ import net.minecraft.MethodsReturnNonnullByDefault; -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/common/src/main/java/li/cil/manual/api/prefab/tab/ItemStackTab.java b/common/src/main/java/li/cil/manual/api/prefab/tab/ItemStackTab.java index 8b33538..74aa8a5 100644 --- a/common/src/main/java/li/cil/manual/api/prefab/tab/ItemStackTab.java +++ b/common/src/main/java/li/cil/manual/api/prefab/tab/ItemStackTab.java @@ -1,11 +1,8 @@ package li.cil.manual.api.prefab.tab; -import com.mojang.blaze3d.systems.RenderSystem; -import com.mojang.blaze3d.vertex.PoseStack; -import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.network.chat.Component; import net.minecraft.world.item.ItemStack; -import org.joml.Vector4f; import javax.annotation.Nullable; @@ -21,23 +18,7 @@ public ItemStackTab(final String path, @Nullable final Component tooltip, final } @Override - public void renderIcon(final PoseStack matrixStack) { - // This is *nasty*, but sadly there's no renderItemAndEffectIntoGUI() variant that - // takes a MatrixStack. Yet. - - final var position = new Vector4f(); - position.mul(matrixStack.last().pose()); - - final PoseStack renderSystemPoseStack = RenderSystem.getModelViewStack(); - renderSystemPoseStack.pushPose(); - renderSystemPoseStack.translate(position.x(), position.y(), 0); - - Minecraft.getInstance().getItemRenderer().renderGuiItem(stack, 0, 0); - - renderSystemPoseStack.popPose(); - RenderSystem.applyModelViewMatrix(); - - // Unfuck GL state. - RenderSystem.enableBlend(); + public void renderIcon(final GuiGraphics graphics) { + graphics.renderFakeItem(stack, 0, 0); } } diff --git a/common/src/main/java/li/cil/manual/api/prefab/tab/TextureTab.java b/common/src/main/java/li/cil/manual/api/prefab/tab/TextureTab.java index 7203006..70db5c5 100644 --- a/common/src/main/java/li/cil/manual/api/prefab/tab/TextureTab.java +++ b/common/src/main/java/li/cil/manual/api/prefab/tab/TextureTab.java @@ -1,9 +1,6 @@ package li.cil.manual.api.prefab.tab; -import com.mojang.blaze3d.systems.RenderSystem; -import com.mojang.blaze3d.vertex.PoseStack; -import net.minecraft.client.gui.screens.Screen; -import net.minecraft.client.renderer.GameRenderer; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; @@ -21,9 +18,7 @@ public TextureTab(final String path, @Nullable final Component tooltip, final Re } @Override - public void renderIcon(final PoseStack matrixStack) { - RenderSystem.setShader(GameRenderer::getPositionTexShader); - RenderSystem.setShaderTexture(0, location); - Screen.blit(matrixStack, 0, 0, 16, 16, 0, 0, 1, 1, 1, 1); + public void renderIcon(final GuiGraphics graphics) { + graphics.blit(location, 0, 0, 0, 0, 16, 16, 16, 16); } } diff --git a/common/src/main/java/li/cil/manual/api/prefab/tab/package-info.java b/common/src/main/java/li/cil/manual/api/prefab/tab/package-info.java index c5ac41b..8a32c4a 100644 --- a/common/src/main/java/li/cil/manual/api/prefab/tab/package-info.java +++ b/common/src/main/java/li/cil/manual/api/prefab/tab/package-info.java @@ -4,4 +4,4 @@ import net.minecraft.MethodsReturnNonnullByDefault; -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/common/src/main/java/li/cil/manual/api/provider/package-info.java b/common/src/main/java/li/cil/manual/api/provider/package-info.java index b23624c..381dee8 100644 --- a/common/src/main/java/li/cil/manual/api/provider/package-info.java +++ b/common/src/main/java/li/cil/manual/api/provider/package-info.java @@ -4,4 +4,4 @@ import net.minecraft.MethodsReturnNonnullByDefault; -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/common/src/main/java/li/cil/manual/api/render/ContentRenderer.java b/common/src/main/java/li/cil/manual/api/render/ContentRenderer.java index e9a3110..e12816f 100644 --- a/common/src/main/java/li/cil/manual/api/render/ContentRenderer.java +++ b/common/src/main/java/li/cil/manual/api/render/ContentRenderer.java @@ -1,6 +1,6 @@ package li.cil.manual.api.render; -import com.mojang.blaze3d.vertex.PoseStack; +import net.minecraft.client.gui.GuiGraphics; /** * This allows implementing custom image renderers. @@ -17,7 +17,7 @@ public interface ContentRenderer { * The width of the area this renderer uses. *

* This is used to offset the OpenGL state properly before calling - * {@link #render(PoseStack, int, int)}, to correctly align the image horizontally. + * {@link #render(GuiGraphics, int, int)}, to correctly align the image horizontally. * * @return the width of the rendered image. */ @@ -27,7 +27,7 @@ public interface ContentRenderer { * The height of the area this renderer uses. *

* This is used to offset the OpenGL state properly before calling - * {@link #render(PoseStack, int, int)}, as well as to know where to resume rendering + * {@link #render(GuiGraphics, int, int)}, as well as to know where to resume rendering * other content below the image. * * @return the height of the rendered image. @@ -42,9 +42,9 @@ public interface ContentRenderer { * (getWidth,getHeight,*), i.e. translation and scaling are taken care * of for you. * - * @param matrixStack the current matrix stack. - * @param mouseX the X position of the mouse relative to the element. - * @param mouseY the Y position of the mouse relative to the element. + * @param graphics the current graphics context. + * @param mouseX the X position of the mouse relative to the element. + * @param mouseY the Y position of the mouse relative to the element. */ - void render(final PoseStack matrixStack, final int mouseX, final int mouseY); + void render(final GuiGraphics graphics, final int mouseX, final int mouseY); } diff --git a/common/src/main/java/li/cil/manual/api/render/FontRenderer.java b/common/src/main/java/li/cil/manual/api/render/FontRenderer.java index e89f135..6a04870 100644 --- a/common/src/main/java/li/cil/manual/api/render/FontRenderer.java +++ b/common/src/main/java/li/cil/manual/api/render/FontRenderer.java @@ -1,10 +1,11 @@ package li.cil.manual.api.render; import com.mojang.blaze3d.vertex.BufferBuilder; -import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.Tesselator; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.network.chat.Component; +import org.joml.Matrix4f; /** * Base interface for font renderers. @@ -13,24 +14,24 @@ public interface FontRenderer { /** * Render up to the specified amount of characters of the specified string. * - * @param matrixStack the current matrix stack. - * @param buffer the buffer to render the string into. - * @param value the string to render. - * @param argb the color to render the string with. + * @param value the string to render. + * @param argb the color to render the string with. + * @param matrix the current transform matrix. + * @param buffer the buffer to render the string into. */ - void drawBatch(final PoseStack matrixStack, final MultiBufferSource buffer, final CharSequence value, final int argb); + void drawInBatch(final CharSequence value, final int argb, final Matrix4f matrix, final MultiBufferSource buffer); /** * Draws a string in immediate mode. * - * @param matrixStack the current matrix stack. - * @param value the string to render. - * @param argb the color to render the string with. + * @param graphics the current graphics context. + * @param value the string to render. + * @param argb the color to render the string with. */ - default void draw(final PoseStack matrixStack, final CharSequence value, final int argb) { + default void draw(final GuiGraphics graphics, final CharSequence value, final int argb) { final BufferBuilder builder = Tesselator.getInstance().getBuilder(); final MultiBufferSource.BufferSource buffer = MultiBufferSource.immediate(builder); - drawBatch(matrixStack, buffer, value, argb); + drawInBatch(value, argb, graphics.pose().last().pose(), buffer); buffer.endBatch(); } diff --git a/common/src/main/java/li/cil/manual/api/render/package-info.java b/common/src/main/java/li/cil/manual/api/render/package-info.java index 5d29f44..f41b15c 100644 --- a/common/src/main/java/li/cil/manual/api/render/package-info.java +++ b/common/src/main/java/li/cil/manual/api/render/package-info.java @@ -4,4 +4,4 @@ import net.minecraft.MethodsReturnNonnullByDefault; -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/common/src/main/java/li/cil/manual/api/util/package-info.java b/common/src/main/java/li/cil/manual/api/util/package-info.java index a50abc0..7df2ec8 100644 --- a/common/src/main/java/li/cil/manual/api/util/package-info.java +++ b/common/src/main/java/li/cil/manual/api/util/package-info.java @@ -4,4 +4,4 @@ import net.minecraft.MethodsReturnNonnullByDefault; -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/common/src/main/java/li/cil/manual/client/document/DocumentRenderer.java b/common/src/main/java/li/cil/manual/client/document/DocumentRenderer.java index b6a9cc6..aa1705c 100644 --- a/common/src/main/java/li/cil/manual/client/document/DocumentRenderer.java +++ b/common/src/main/java/li/cil/manual/client/document/DocumentRenderer.java @@ -1,12 +1,11 @@ package li.cil.manual.client.document; import com.mojang.blaze3d.systems.RenderSystem; -import com.mojang.blaze3d.vertex.PoseStack; import li.cil.manual.api.ManualModel; import li.cil.manual.api.ManualStyle; import li.cil.manual.api.content.Document; import li.cil.manual.client.document.segment.*; -import net.minecraft.client.gui.screens.Screen; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.resources.ResourceLocation; import org.apache.commons.lang3.StringUtils; import org.lwjgl.opengl.GL11; @@ -37,13 +36,17 @@ public final class DocumentRenderer { private final ManualModel model; private final ManualStyle style; - @Nullable private ResourceLocation location; - @Nullable private Segment root; - @Nullable private InteractiveSegment lastHovered; + @Nullable + private ResourceLocation location; + @Nullable + private Segment root; + @Nullable + private InteractiveSegment lastHovered; private int lastScrollY; private int lastGlobalY; - @Nullable private NextSegmentInfo lastFirstVisible; + @Nullable + private NextSegmentInfo lastFirstVisible; /** * Creates a new document instance with the specified configuration. @@ -103,7 +106,7 @@ public void parse(final Document document) { segments.get(i).setNext(segments.get(i + 1)); } - root = segments.size() > 0 ? segments.get(0) : new TextSegment(this, null, ""); + root = !segments.isEmpty() ? segments.get(0) : new TextSegment(this, null, ""); if (lastHovered != null) { lastHovered.setMouseHovered(false); @@ -164,15 +167,15 @@ public int height(final int width) { * Renders a list of segments and tooltips if a segment with a tooltip is hovered. * Returns the hovered interactive segment, if any. * - * @param matrixStack the current matrix stack. - * @param scrollY the vertical scroll offset of the document. - * @param width the width of the area to render the document in. - * @param height the height of the area to render the document in. - * @param mouseX the x position of the mouse relative to the document. - * @param mouseY the y position of the mouse relative to the document. + * @param graphics the current graphics context. + * @param scrollY the vertical scroll offset of the document. + * @param width the width of the area to render the document in. + * @param height the height of the area to render the document in. + * @param mouseX the x position of the mouse relative to the document. + * @param mouseY the y position of the mouse relative to the document. * @return the interactive segment being hovered, if any. */ - public Optional render(final PoseStack matrixStack, final int scrollY, final int width, final int height, final int mouseX, final int mouseY) { + public Optional render(final GuiGraphics graphics, final int scrollY, final int width, final int height, final int mouseX, final int mouseY) { if (root == null) { return Optional.empty(); } @@ -182,11 +185,12 @@ public Optional render(final PoseStack matrixStack, final in RenderSystem.colorMask(false, false, false, false); - matrixStack.pushPose(); - matrixStack.translate(0, 0, 500); - Screen.fill(matrixStack, -10, -1000, width + 20, 0, 0xFFFFFFFF); - Screen.fill(matrixStack, -10, height, width + 20, height + 1000, 0xFFFFFFFF); - matrixStack.popPose(); + final var pose = graphics.pose(); + pose.pushPose(); + pose.translate(0, 0, 500); + graphics.fill(-10, -1000, width + 20, 0, 0xFFFFFFFF); + graphics.fill(-10, height, width + 20, height + 1000, 0xFFFFFFFF); + pose.popPose(); RenderSystem.colorMask(true, true, true, true); @@ -234,12 +238,12 @@ public Optional render(final PoseStack matrixStack, final in lastFirstVisible = info; } - matrixStack.pushPose(); - matrixStack.translate(0, globalY, 0); + pose.pushPose(); + pose.translate(0, globalY, 0); - final Optional result = segment.render(matrixStack, localX, lineHeight, width, mouseX, mouseY - globalY); + final Optional result = segment.render(graphics, localX, lineHeight, width, mouseX, mouseY - globalY); - matrixStack.popPose(); + pose.popPose(); if (isMouseOverDocument && hovered.isEmpty()) { hovered = result; diff --git a/common/src/main/java/li/cil/manual/client/document/package-info.java b/common/src/main/java/li/cil/manual/client/document/package-info.java index c7f8fb6..20be69c 100644 --- a/common/src/main/java/li/cil/manual/client/document/package-info.java +++ b/common/src/main/java/li/cil/manual/client/document/package-info.java @@ -4,4 +4,4 @@ import net.minecraft.MethodsReturnNonnullByDefault; -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/common/src/main/java/li/cil/manual/client/document/segment/RenderSegment.java b/common/src/main/java/li/cil/manual/client/document/segment/RenderSegment.java index b59729e..b34c9bf 100644 --- a/common/src/main/java/li/cil/manual/client/document/segment/RenderSegment.java +++ b/common/src/main/java/li/cil/manual/client/document/segment/RenderSegment.java @@ -1,6 +1,5 @@ package li.cil.manual.client.document.segment; -import com.mojang.blaze3d.vertex.PoseStack; import li.cil.manual.api.render.ContentRenderer; import li.cil.manual.api.render.InteractiveContentRenderer; import li.cil.manual.api.util.PathUtils; @@ -8,6 +7,7 @@ import li.cil.manual.client.document.DocumentRenderer; import li.cil.manual.client.document.Strings; import li.cil.manual.client.document.segment.render.MissingContentRenderer; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.network.chat.Component; import net.minecraft.util.Mth; @@ -61,7 +61,7 @@ public int getLineHeight(final int segmentX, final int documentWidth) { } @Override - public Optional render(final PoseStack matrixStack, final int segmentX, final int lineHeight, final int documentWidth, final int mouseX, final int mouseY) { + public Optional render(final GuiGraphics graphics, final int segmentX, final int lineHeight, final int documentWidth, final int mouseX, final int mouseY) { final int width = imageWidth(segmentX, documentWidth); final int height = imageHeight(segmentX, documentWidth); @@ -73,15 +73,16 @@ public Optional render(final PoseStack matrixStack, final in final float scale = scale(segmentX, documentWidth); - matrixStack.pushPose(); - matrixStack.translate(x, y, 0); - matrixStack.scale(scale, scale, scale); + final var pose = graphics.pose(); + pose.pushPose(); + pose.translate(x, y, 0); + pose.scale(scale, scale, scale); final boolean isHovered = mouseX >= x && mouseX <= x + width && mouseY >= y && mouseY <= y + height; if (isHovered) { DocumentRenderTypes.draw(DocumentRenderTypes.highlight(), (buffer) -> { - final var matrix = matrixStack.last().pose(); + final var matrix = pose.last().pose(); final float r = 0.2f, g = 0.4f, b = 0.6f, a = 0.25f; @@ -92,9 +93,9 @@ public Optional render(final PoseStack matrixStack, final in }); } - renderer.render(matrixStack, mouseX, mouseY); + renderer.render(graphics, mouseX, mouseY); - matrixStack.popPose(); + pose.popPose(); return isHovered ? Optional.of(this) : Optional.empty(); } diff --git a/common/src/main/java/li/cil/manual/client/document/segment/Segment.java b/common/src/main/java/li/cil/manual/client/document/segment/Segment.java index 1455cc9..ee40d00 100644 --- a/common/src/main/java/li/cil/manual/client/document/segment/Segment.java +++ b/common/src/main/java/li/cil/manual/client/document/segment/Segment.java @@ -1,6 +1,6 @@ package li.cil.manual.client.document.segment; -import com.mojang.blaze3d.vertex.PoseStack; +import net.minecraft.client.gui.GuiGraphics; import java.util.Optional; import java.util.regex.Pattern; @@ -53,7 +53,7 @@ public interface Segment { * Render the segment at the specified coordinates with the specified * properties. * - * @param matrixStack the current matrix stack. + * @param graphics the current graphics context. * @param segmentX the current indentation. * @param lineHeight the maximum height of the current line. * @param documentWidth the maximum width of the document. @@ -61,7 +61,7 @@ public interface Segment { * @param mouseY the y mouse position. * @return the hovered interactive segment, if any. */ - Optional render(final PoseStack matrixStack, final int segmentX, final int lineHeight, final int documentWidth, final int mouseX, final int mouseY); + Optional render(final GuiGraphics graphics, final int segmentX, final int lineHeight, final int documentWidth, final int mouseX, final int mouseY); // ----------------------------------------------------------------------- // diff --git a/common/src/main/java/li/cil/manual/client/document/segment/TextSegment.java b/common/src/main/java/li/cil/manual/client/document/segment/TextSegment.java index 6f1ffd2..a0fc32a 100644 --- a/common/src/main/java/li/cil/manual/client/document/segment/TextSegment.java +++ b/common/src/main/java/li/cil/manual/client/document/segment/TextSegment.java @@ -1,10 +1,10 @@ package li.cil.manual.client.document.segment; import com.mojang.blaze3d.vertex.BufferBuilder; -import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.Tesselator; import li.cil.manual.api.render.FontRenderer; import li.cil.manual.client.document.DocumentRenderer; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.renderer.MultiBufferSource; import org.apache.commons.lang3.ArrayUtils; @@ -72,7 +72,7 @@ public NextSegmentInfo getNext(final int segmentX, final int lineHeight, final i } @Override - public Optional render(final PoseStack matrixStack, final int segmentX, final int lineHeight, final int documentWidth, final int mouseX, final int mouseY) { + public Optional render(final GuiGraphics graphics, final int segmentX, final int lineHeight, final int documentWidth, final int mouseX, final int mouseY) { final String format = getFormat(); final float scale = getFontScale() * getScale(); final int color = getColor(); @@ -92,13 +92,14 @@ public Optional render(final PoseStack matrixStack, final in hovered.value = interactive; } - matrixStack.pushPose(); - matrixStack.translate(block.x, block.y, 0); - matrixStack.scale(scale, scale, scale); + final var pose = graphics.pose(); + pose.pushPose(); + pose.translate(block.x, block.y, 0); + pose.scale(scale, scale, scale); - getFont().drawBatch(matrixStack, bufferSource, format + block.chars, color); + getFont().drawInBatch(format + block.chars, color, graphics.pose().last().pose(), bufferSource); - matrixStack.popPose(); + pose.popPose(); }); bufferSource.endBatch(); @@ -189,7 +190,7 @@ private void forEachBlock(final int segmentX, final int lineHeight, final int do int currentY = 0; int charCount = computeCharsFittingOnLine(chars, documentWidth - currentX, documentWidth - wrappedIndent); - while (chars.length() > 0) { + while (!chars.isEmpty()) { final String blockChars = chars.substring(0, charCount); blockCache.add(new TextBlock( currentX, diff --git a/common/src/main/java/li/cil/manual/client/document/segment/package-info.java b/common/src/main/java/li/cil/manual/client/document/segment/package-info.java index 534eac5..0cf53e1 100644 --- a/common/src/main/java/li/cil/manual/client/document/segment/package-info.java +++ b/common/src/main/java/li/cil/manual/client/document/segment/package-info.java @@ -4,4 +4,4 @@ import net.minecraft.MethodsReturnNonnullByDefault; -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/common/src/main/java/li/cil/manual/client/document/segment/render/ItemStackContentRenderer.java b/common/src/main/java/li/cil/manual/client/document/segment/render/ItemStackContentRenderer.java index 73ff837..162f26f 100644 --- a/common/src/main/java/li/cil/manual/client/document/segment/render/ItemStackContentRenderer.java +++ b/common/src/main/java/li/cil/manual/client/document/segment/render/ItemStackContentRenderer.java @@ -1,11 +1,8 @@ package li.cil.manual.client.document.segment.render; -import com.mojang.blaze3d.systems.RenderSystem; -import com.mojang.blaze3d.vertex.PoseStack; import li.cil.manual.api.render.ContentRenderer; -import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.world.item.ItemStack; -import org.joml.Vector4f; public final class ItemStackContentRenderer implements ContentRenderer { /** @@ -36,31 +33,20 @@ public int getHeight() { } @Override - public void render(final PoseStack matrixStack, final int mouseX, final int mouseY) { - final Minecraft mc = Minecraft.getInstance(); + public void render(final GuiGraphics graphics, final int mouseX, final int mouseY) { final int index = (int) (System.currentTimeMillis() % (CYCLE_SPEED * stacks.length)) / CYCLE_SPEED; final ItemStack stack = stacks[index]; final float scaleX = getWidth() / 16f; final float scaleY = getHeight() / 16f; - // This is *nasty*, but sadly there's no renderItemAndEffectIntoGUI() variant that - // takes a MatrixStack. Yet. + final var pose = graphics.pose(); - final var position = new Vector4f(); - position.mul(matrixStack.last().pose()); + pose.pushPose(); + pose.scale(scaleX, scaleY, 1); - final PoseStack renderSystemPoseStack = RenderSystem.getModelViewStack(); - renderSystemPoseStack.pushPose(); - renderSystemPoseStack.translate(position.x(), position.y(), 0); - renderSystemPoseStack.scale(scaleX, scaleY, 1); + graphics.renderFakeItem(stack, 0, 0); - mc.getItemRenderer().renderGuiItem(stack, 0, 0); - - renderSystemPoseStack.popPose(); - RenderSystem.applyModelViewMatrix(); - - // Unfuck GL state. - RenderSystem.enableBlend(); + pose.popPose(); } } diff --git a/common/src/main/java/li/cil/manual/client/document/segment/render/TextureContentRenderer.java b/common/src/main/java/li/cil/manual/client/document/segment/render/TextureContentRenderer.java index 1f967e1..92cebc5 100644 --- a/common/src/main/java/li/cil/manual/client/document/segment/render/TextureContentRenderer.java +++ b/common/src/main/java/li/cil/manual/client/document/segment/render/TextureContentRenderer.java @@ -1,10 +1,10 @@ package li.cil.manual.client.document.segment.render; import com.mojang.blaze3d.platform.NativeImage; -import com.mojang.blaze3d.vertex.PoseStack; import li.cil.manual.api.render.ContentRenderer; import li.cil.manual.client.document.DocumentRenderTypes; import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.renderer.texture.AbstractTexture; import net.minecraft.client.renderer.texture.SimpleTexture; import net.minecraft.client.renderer.texture.TextureManager; @@ -48,9 +48,9 @@ public int getHeight() { } @Override - public void render(final PoseStack matrixStack, final int mouseX, final int mouseY) { + public void render(final GuiGraphics graphics, final int mouseX, final int mouseY) { DocumentRenderTypes.draw(DocumentRenderTypes.texture(location), (buffer) -> { - final var matrix = matrixStack.last().pose(); + final var matrix = graphics.pose().last().pose(); buffer.vertex(matrix, 0, texture.height, 0).uv(0, 1).endVertex(); buffer.vertex(matrix, texture.width, texture.height, 0).uv(1, 1).endVertex(); buffer.vertex(matrix, texture.width, 0, 0).uv(1, 0).endVertex(); diff --git a/common/src/main/java/li/cil/manual/client/document/segment/render/package-info.java b/common/src/main/java/li/cil/manual/client/document/segment/render/package-info.java index a4cea10..db9daff 100644 --- a/common/src/main/java/li/cil/manual/client/document/segment/render/package-info.java +++ b/common/src/main/java/li/cil/manual/client/document/segment/render/package-info.java @@ -4,4 +4,4 @@ import net.minecraft.MethodsReturnNonnullByDefault; -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/common/src/main/java/li/cil/manual/client/gui/ManualScreen.java b/common/src/main/java/li/cil/manual/client/gui/ManualScreen.java index 0c915ce..26f714a 100644 --- a/common/src/main/java/li/cil/manual/client/gui/ManualScreen.java +++ b/common/src/main/java/li/cil/manual/client/gui/ManualScreen.java @@ -1,7 +1,6 @@ package li.cil.manual.client.gui; import com.mojang.blaze3d.systems.RenderSystem; -import com.mojang.blaze3d.vertex.*; import li.cil.manual.api.ManualModel; import li.cil.manual.api.ManualScreenStyle; import li.cil.manual.api.ManualStyle; @@ -11,11 +10,11 @@ import li.cil.manual.client.document.segment.InteractiveSegment; import li.cil.manual.client.util.IterableUtils; import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.components.Button; import net.minecraft.client.gui.screens.Screen; import net.minecraft.client.gui.screens.inventory.tooltip.ClientTooltipPositioner; import net.minecraft.client.player.LocalPlayer; -import net.minecraft.client.renderer.GameRenderer; import net.minecraft.client.renderer.Rect2i; import net.minecraft.client.resources.sounds.SimpleSoundInstance; import net.minecraft.client.sounds.SoundManager; @@ -74,8 +73,8 @@ public void init() { } @Override - public void render(final PoseStack matrixStack, final int mouseX, final int mouseY, final float partialTicks) { - renderBackground(matrixStack); + public void render(final GuiGraphics graphics, final int mouseX, final int mouseY, final float partialTicks) { + renderBackground(graphics); if (!Objects.equals(currentPath, model.peek())) { refreshPage(); @@ -93,36 +92,35 @@ public void render(final PoseStack matrixStack, final int mouseX, final int mous scrollButton.active = false; // Render tabs behind manual. - super.render(matrixStack, mouseX, mouseY, partialTicks); + super.render(graphics, mouseX, mouseY, partialTicks); // Render manual background. - RenderSystem.setShader(GameRenderer::getPositionTexShader); - RenderSystem.setShaderTexture(0, screenStyle.getWindowBackground()); final Rect2i windowRect = screenStyle.getWindowRect(); - blit(matrixStack, leftPos, topPos, 0, 0, windowRect.getWidth(), windowRect.getHeight(), windowRect.getWidth(), windowRect.getHeight()); + graphics.blit(screenStyle.getWindowBackground(), leftPos, topPos, 0, 0, windowRect.getWidth(), windowRect.getHeight(), windowRect.getWidth(), windowRect.getHeight()); // Render scroll bar tooltip (button will override this tooltip if currently dragging). renderScrollbarTooltip(mouseX, mouseY); // Render scroll button in front of manual. scrollButton.active = canScroll(); - scrollButton.render(matrixStack, mouseX, mouseY, partialTicks); + scrollButton.render(graphics, mouseX, mouseY, partialTicks); final Rect2i documentRect = screenStyle.getDocumentRect(); final int documentX = leftPos + documentRect.getX(); final int documentY = topPos + documentRect.getY(); - matrixStack.pushPose(); - matrixStack.translate(documentX, documentY, 0); + final var pose = graphics.pose(); + pose.pushPose(); + pose.translate(documentX, documentY, 0); - currentSegment = documentRenderer.render(matrixStack, getSmoothScrollPosition(), + currentSegment = documentRenderer.render(graphics, getSmoothScrollPosition(), documentRect.getWidth(), documentRect.getHeight(), mouseX - documentX, mouseY - documentY); - matrixStack.popPose(); + pose.popPose(); currentSegment.flatMap(InteractiveSegment::getTooltip).ifPresent(t -> - renderComponentTooltip(matrixStack, Collections.singletonList(t), mouseX, mouseY)); + graphics.renderComponentTooltip(font, Collections.singletonList(t), mouseX, mouseY)); } @Override @@ -309,8 +307,8 @@ private class TabButton extends Button { } @Override - public void renderButton(final PoseStack matrixStack, final int mouseX, final int mouseY, final float partialTicks) { - if (isHoveredOrFocused()) { + public void renderWidget(final GuiGraphics graphics, final int mouseX, final int mouseY, final float partialTicks) { + if (isHoveredOrFocusedUsingKeyboard()) { targetX = baseX; } else { targetX = baseX + screenStyle.getTabHoverShift(); @@ -326,28 +324,27 @@ public void renderButton(final PoseStack matrixStack, final int mouseX, final in width = screenStyle.getTabAreaRect().getWidth() - (getX() - baseX); - final int v0 = isHoveredOrFocused() ? screenStyle.getTabRect().getHeight() : 0; + final int v0 = isHoveredOrFocusedUsingKeyboard() ? screenStyle.getTabRect().getHeight() : 0; final int visualWidth = screenStyle.getTabRect().getWidth(); final int visualHeight = screenStyle.getTabRect().getHeight(); final int textureWidth = screenStyle.getTabRect().getWidth(); final int textureHeight = screenStyle.getTabRect().getHeight() * 2; - RenderSystem.setShader(GameRenderer::getPositionTexShader); - RenderSystem.setShaderTexture(0, screenStyle.getTabButtonTexture()); - blit(matrixStack, getX(), getY(), 0, v0, visualWidth, visualHeight, textureWidth, textureHeight); + graphics.blit(screenStyle.getTabButtonTexture(), getX(), getY(), 0, v0, visualWidth, visualHeight, textureWidth, textureHeight); - matrixStack.pushPose(); - matrixStack.translate(getX() + 12, (float) (getY() + (screenStyle.getTabRect().getHeight() - 18) / 2), 0); + final var pose = graphics.pose(); + pose.pushPose(); + pose.translate(getX() + 12, (float) (getY() + (screenStyle.getTabRect().getHeight() - 18) / 2), 0); - tab.renderIcon(matrixStack); + tab.renderIcon(graphics); - matrixStack.popPose(); + pose.popPose(); updateTooltip(); } private void updateTooltip() { - if (!isHoveredOrFocused() || isDraggingScrollButton) { + if (!isHoveredOrFocusedUsingKeyboard() || isDraggingScrollButton) { return; } @@ -366,6 +363,10 @@ private void updateTooltip() { @Override public void playDownSound(final SoundManager soundHandler) { } + + private boolean isHoveredOrFocusedUsingKeyboard() { + return isHovered() || isFocused() && Minecraft.getInstance().getLastInputType().isKeyboard(); + } } private class ScrollButton extends Button { @@ -388,30 +389,11 @@ protected boolean clicked(final double mouseX, final double mouseY) { } @Override - public void renderButton(final PoseStack matrixStack, final int mouseX, final int mouseY, final float partialTicks) { + public void renderWidget(final GuiGraphics graphics, final int mouseX, final int mouseY, final float partialTicks) { setY(baseY + getScrollButtonY()); - final int x0 = getX(); - final int x1 = x0 + width; - final int y0 = getY(); - final int y1 = y0 + height; - - final float u0 = 0; - final float u1 = u0 + 1; - final float v0 = (isDraggingScrollButton || isHoveredOrFocused()) ? 0.5f : 0; - final float v1 = v0 + 0.5f; - - RenderSystem.setShader(GameRenderer::getPositionTexShader); - RenderSystem.setShaderTexture(0, screenStyle.getScrollButtonTexture()); - - final Tesselator t = Tesselator.getInstance(); - final BufferBuilder builder = t.getBuilder(); - builder.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_TEX); - builder.vertex(x0, y1, getBlitOffset()).uv(u0, v1).endVertex(); - builder.vertex(x1, y1, getBlitOffset()).uv(u1, v1).endVertex(); - builder.vertex(x1, y0, getBlitOffset()).uv(u1, v0).endVertex(); - builder.vertex(x0, y0, getBlitOffset()).uv(u0, v0).endVertex(); - t.end(); + final int vOffset = (isDraggingScrollButton || isHoveredOrFocusedUsingKeyboard()) ? height : 0; + graphics.blit(screenStyle.getScrollButtonTexture(), getX(), getY(), 0, vOffset, width, height, width, height * 2); updateTooltip(); } @@ -424,7 +406,7 @@ public void applyTooltip(final boolean fixedY) { } private void updateTooltip() { - if (!isHoveredOrFocused() && !isDraggingScrollButton) { + if (!isHoveredOrFocusedUsingKeyboard() && !isDraggingScrollButton) { return; } @@ -436,9 +418,13 @@ private List getTooltipContent() { } private ClientTooltipPositioner getClientTooltipPositioner(final boolean fixedY) { - return (screen, mouseX, mouseY, tooltipWidth, tooltipHeight) -> new Vector2i( + return (screenWidth, screenHeight, mouseX, mouseY, tooltipWidth, tooltipHeight) -> new Vector2i( leftPos + screenStyle.getScrollBarRect().getX() + screenStyle.getScrollBarRect().getWidth(), fixedY ? getY() + (getHeight() + TOOLTIP_HEIGHT) / 2 : mouseY); } + + private boolean isHoveredOrFocusedUsingKeyboard() { + return isHovered() || isFocused() && Minecraft.getInstance().getLastInputType().isKeyboard(); + } } } diff --git a/common/src/main/java/li/cil/manual/client/gui/package-info.java b/common/src/main/java/li/cil/manual/client/gui/package-info.java index f8aefa5..17614b9 100644 --- a/common/src/main/java/li/cil/manual/client/gui/package-info.java +++ b/common/src/main/java/li/cil/manual/client/gui/package-info.java @@ -4,4 +4,4 @@ import net.minecraft.MethodsReturnNonnullByDefault; -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/common/src/main/java/li/cil/manual/client/package-info.java b/common/src/main/java/li/cil/manual/client/package-info.java index f88631d..9063117 100644 --- a/common/src/main/java/li/cil/manual/client/package-info.java +++ b/common/src/main/java/li/cil/manual/client/package-info.java @@ -4,4 +4,4 @@ import net.minecraft.MethodsReturnNonnullByDefault; -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/common/src/main/java/li/cil/manual/client/provider/package-info.java b/common/src/main/java/li/cil/manual/client/provider/package-info.java index 9b0fb99..c78520c 100644 --- a/common/src/main/java/li/cil/manual/client/provider/package-info.java +++ b/common/src/main/java/li/cil/manual/client/provider/package-info.java @@ -4,4 +4,4 @@ import net.minecraft.MethodsReturnNonnullByDefault; -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/common/src/main/java/li/cil/manual/client/util/package-info.java b/common/src/main/java/li/cil/manual/client/util/package-info.java index fd65b04..d56482c 100644 --- a/common/src/main/java/li/cil/manual/client/util/package-info.java +++ b/common/src/main/java/li/cil/manual/client/util/package-info.java @@ -4,4 +4,4 @@ import net.minecraft.MethodsReturnNonnullByDefault; -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/fabric/build.gradle b/fabric/build.gradle deleted file mode 100644 index c1d253f..0000000 --- a/fabric/build.gradle +++ /dev/null @@ -1,132 +0,0 @@ -plugins { - id "com.github.johnrengelman.shadow" version "7.1.2" -} - -architectury { - platformSetupLoomIde() - fabric() -} - -loom { - accessWidenerPath = project(":common").loom.accessWidenerPath -} - -configurations { - common - shadowCommon // Don't use shadow from the shadow plugin because we don't want IDEA to index this. - compileClasspath.extendsFrom common - runtimeClasspath.extendsFrom common - developmentFabric.extendsFrom common -} - -dependencies { - modImplementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}" - modApi "net.fabricmc.fabric-api:fabric-api:${rootProject.fabric_api_version}" - modApi "dev.architectury:architectury-fabric:${rootProject.architectury_version}" - - common(project(path: ":common", configuration: "namedElements")) { transitive false } - shadowCommon(project(path: ":common", configuration: "transformProductionFabric")) { transitive false } -} - -processResources { - inputs.property "version", project.version - - filesMatching("fabric.mod.json") { - expand "version": project.version - } -} - -shadowJar { - exclude "architectury.common.json" - - configurations = [project.configurations.shadowCommon] - classifier "dev-shadow" -} - -remapJar { - injectAccessWidener = true - inputFile.set shadowJar.archiveFile - dependsOn shadowJar - classifier null -} - -jar { - classifier "dev" -} - -def commonApiJar = project(":common").apiJar - -sourcesJar { - def commonSources = project(":common").sourcesJar - dependsOn commonSources - from commonSources.archiveFile.map { zipTree(it) } -} - -components.java { - withVariantsFromConfiguration(project.configurations.shadowRuntimeElements) { - skip() - } -} - -publishing { - publications { - mavenFabric(MavenPublication) { - artifactId = "${rootProject.archives_base_name}-${rootProject.minecraft_version}-${project.name}" - from components.java - } - } - - repositories { - maven { - name = "GitHubPackages" - url = System.getenv("GITHUB_MAVEN_URL") ?: "" - credentials { - username = System.getenv("GITHUB_ACTOR") - password = System.getenv("GITHUB_TOKEN") - } - } - } -} - -curseforge { - apiKey = System.getenv("CURSEFORGE_API_KEY") ?: "" - project { - id = rootProject.curse_project_id - releaseType = "release" - changelogType = "markdown" - changelog = System.getenv("CHANGELOG") ?: "Changelog not available." - addGameVersion "Fabric" - addGameVersion rootProject.minecraft_version - addGameVersion "Java 17" - relations { - requiredDependency "fabric-api" - requiredDependency "architectury-api" - requiredDependency "forge-config-api-port-fabric" - } - mainArtifact(remapJar) - addArtifact(commonApiJar) - afterEvaluate { - uploadTask.dependsOn(remapJar) - uploadTask.dependsOn(commonApiJar) - } - } - options { - forgeGradleIntegration = false - } -} - -modrinth { - token = System.getenv("MODRINTH_API_KEY") ?: "" - projectId = rootProject.modrinth_project_id - changelog = System.getenv("CHANGELOG") ?: "Changelog not available." - versionNumber = "MC${rootProject.minecraft_version}-${project.name}-${rootProject.semver}" - versionName = "${rootProject.archives_base_name}-${project.version}" - versionType = "release" - uploadFile = remapJar - gameVersions = [rootProject.minecraft_version] - loaders = ["fabric"] - dependencies { - required.project "fabric-api" - required.project "architectury-api" - } -} diff --git a/fabric/build.gradle.kts b/fabric/build.gradle.kts new file mode 100644 index 0000000..4b02e15 --- /dev/null +++ b/fabric/build.gradle.kts @@ -0,0 +1,33 @@ +val modId: String by project +val minecraftVersion: String = libs.versions.minecraft.get() +val fabricApiVersion: String = libs.versions.fabric.api.get() +val architecturyVersion: String = libs.versions.architectury.get() + +loom { + accessWidenerPath.set(project(":common").loom.accessWidenerPath) +} + +dependencies { + modImplementation(libs.fabric.loader) + modApi(libs.fabric.api) + modApi(libs.fabric.architectury) +} + +tasks { + processResources { + val properties = mapOf( + "version" to project.version, + "minecraftVersion" to minecraftVersion, + "fabricApiVersion" to fabricApiVersion, + "architecturyVersion" to architecturyVersion + ) + inputs.properties(properties) + filesMatching("fabric.mod.json") { + expand(properties) + } + } + + remapJar { + injectAccessWidener.set(true) + } +} diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json index 81c6028..676e145 100644 --- a/fabric/src/main/resources/fabric.mod.json +++ b/fabric/src/main/resources/fabric.mod.json @@ -1,25 +1,36 @@ { - "schemaVersion": 1, - "id": "markdown_manual", - "version": "${version}", - "name": "Markdown Manual", - "description": "Library mod providing a convenient way of defining in-game manuals.", - "authors": [ - "Sangar" - ], - "contact": { - "sources": "https://github.com/MightyPirates/MarkdownManual" - }, - "license": "MIT", - "environment": "*", - "entrypoints": { - "client": [ - "li.cil.manual.client.fabric.MarkdownManualFabric" - ] - }, - "depends": { - "fabric": "*", - "minecraft": ">=1.19.3", - "architectury": ">=7" - } + "schemaVersion": 1, + "id": "markdown_manual", + "version": "${version}", + "name": "Markdown Manual", + "description": "Library mod providing a convenient way of defining in-game manuals.", + "authors": [ + "Sangar" + ], + "contact": { + "sources": "https://github.com/MightyPirates/MarkdownManual" + }, + "license": "MIT", + "environment": "*", + "entrypoints": { + "client": [ + "li.cil.manual.client.fabric.MarkdownManualFabric" + ] + }, + "depends": { + "fabric-api": ">=${fabricApiVersion}", + "architectury": ">=${architecturyVersion}", + "minecraft": ">=${minecraftVersion}", + "java": ">=17" + }, + "custom": { + "mc-publish": { + "modrinth": "nPQ9xkPg", + "curseforge": 502485, + "dependencies": [ + "fabric-api@>=${fabricApiVersion}(required){modrinth:P7dR8mSH}{curseforge:306612}", + "architectury@>=${architecturyVersion}(required){modrinth:lhGA9TYQ}{curseforge:419699}" + ] + } + } } diff --git a/forge/build.gradle b/forge/build.gradle deleted file mode 100644 index 7917577..0000000 --- a/forge/build.gradle +++ /dev/null @@ -1,126 +0,0 @@ -plugins { - id "com.github.johnrengelman.shadow" version "7.1.2" -} - -architectury { - platformSetupLoomIde() - forge() -} - -loom { - accessWidenerPath = project(":common").loom.accessWidenerPath - - forge { - convertAccessWideners = true - extraAccessWideners.add loom.accessWidenerPath.get().asFile.name - } -} - -configurations { - common - shadowCommon // Don't use shadow from the shadow plugin because we don't want IDEA to index this. - compileClasspath.extendsFrom common - runtimeClasspath.extendsFrom common - developmentForge.extendsFrom common -} - -dependencies { - forge "net.minecraftforge:forge:${rootProject.forge_version}" - modApi "dev.architectury:architectury-forge:${rootProject.architectury_version}" - - common(project(path: ":common", configuration: "namedElements")) { transitive false } - shadowCommon(project(path: ":common", configuration: "transformProductionForge")) { transitive = false } -} - -processResources { - inputs.property "version", project.version - - filesMatching("META-INF/mods.toml") { - expand "version": project.version - } -} - -shadowJar { - exclude "fabric.mod.json" - exclude "architectury.common.json" - - configurations = [project.configurations.shadowCommon] - classifier "dev-shadow" -} - -remapJar { - inputFile.set shadowJar.archiveFile - dependsOn shadowJar - classifier null -} - -jar { - classifier "dev" -} - -sourcesJar { - def commonSources = project(":common").sourcesJar - dependsOn commonSources - from commonSources.archiveFile.map { zipTree(it) } -} - -components.java { - withVariantsFromConfiguration(project.configurations.shadowRuntimeElements) { - skip() - } -} - -publishing { - publications { - mavenForge(MavenPublication) { - artifactId = "${rootProject.archives_base_name}-${rootProject.minecraft_version}-${project.name}" - from components.java - } - } - - repositories { - maven { - name = "GitHubPackages" - url = System.getenv("GITHUB_MAVEN_URL") ?: "" - credentials { - username = System.getenv("GITHUB_ACTOR") - password = System.getenv("GITHUB_TOKEN") - } - } - } -} - -curseforge { - apiKey = System.getenv("CURSEFORGE_API_KEY") ?: "" - project { - id = rootProject.curse_project_id - releaseType = "release" - changelogType = "markdown" - changelog = System.getenv("CHANGELOG") ?: "Changelog not available." - addGameVersion "Forge" - addGameVersion rootProject.minecraft_version - addGameVersion "Java 17" - relations { - requiredDependency "architectury-api" - } - mainArtifact(remapJar) - afterEvaluate { - uploadTask.dependsOn(remapJar) - } - } -} - -modrinth { - token = System.getenv("MODRINTH_API_KEY") ?: "" - projectId = rootProject.modrinth_project_id - changelog = System.getenv("CHANGELOG") ?: "Changelog not available." - versionNumber = "MC${rootProject.minecraft_version}-${project.name}-${rootProject.semver}" - versionName = "${rootProject.archives_base_name}-${project.version}" - versionType = "release" - uploadFile = remapJar - gameVersions = [rootProject.minecraft_version] - loaders = ["forge"] - dependencies { - required.project "architectury-api" - } -} diff --git a/forge/build.gradle.kts b/forge/build.gradle.kts new file mode 100644 index 0000000..1c5a3a3 --- /dev/null +++ b/forge/build.gradle.kts @@ -0,0 +1,34 @@ +val modId: String by project +val minecraftVersion: String = libs.versions.minecraft.get() +val forgeVersion: String = libs.versions.forge.platform.get().split("-")[1] +val architecturyVersion: String = libs.versions.architectury.get() + +loom { + accessWidenerPath.set(project(":common").loom.accessWidenerPath) + + forge { + convertAccessWideners.set(true) + extraAccessWideners.add(loom.accessWidenerPath.get().asFile.name) + } +} + +dependencies { + forge(libs.forge.platform) + modApi(libs.forge.architectury) +} + +tasks { + processResources { + val properties = mapOf( + "version" to project.version, + "minecraftVersion" to minecraftVersion, + "loaderVersion" to forgeVersion.split(".").first(), + "forgeVersion" to forgeVersion, + "architecturyVersion" to architecturyVersion + ) + inputs.properties(properties) + filesMatching("META-INF/mods.toml") { + expand(properties) + } + } +} diff --git a/forge/src/main/resources/META-INF/mods.toml b/forge/src/main/resources/META-INF/mods.toml index cfa85fd..6898ede 100644 --- a/forge/src/main/resources/META-INF/mods.toml +++ b/forge/src/main/resources/META-INF/mods.toml @@ -1,5 +1,5 @@ modLoader = "javafml" -loaderVersion = "[44,)" +loaderVersion = "[${loaderVersion},)" issueTrackerURL = "https://github.com/MightyPirates/MarkdownManual/issues" license = "MIT" @@ -15,20 +15,26 @@ Library mod providing a convenient way of defining in-game manuals. [[dependencies.markdown_manual]] modId = "forge" mandatory = true -versionRange = "[44.1,)" +versionRange = "[${forgeVersion},)" ordering = "NONE" side = "BOTH" - [[dependencies.markdown_manual]] modId = "minecraft" mandatory = true -versionRange = "[1.19.3,)" +versionRange = "[${minecraftVersion},)" ordering = "NONE" side = "BOTH" [[dependencies.markdown_manual]] modId = "architectury" mandatory = true -versionRange = "[7,)" +versionRange = "[${architecturyVersion},)" ordering = "AFTER" side = "BOTH" + +[mc-publish] +modrinth = "nPQ9xkPg" +curseforge = 502485 +dependencies = [ + "architectury@>=${architecturyVersion}(required){modrinth:lhGA9TYQ}{curseforge:419699}" +] diff --git a/gradle.properties b/gradle.properties index ed0e71c..16af04f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,21 +1,10 @@ -org.gradle.jvmargs=-Xmx3G +org.gradle.jvmargs=-Xmx4G org.gradle.daemon=false -minecraft_version=1.19.3 -enabled_platforms=fabric,forge +enabledPlatforms=fabric,forge -archives_base_name=markdown_manual -maven_group=li.cil.markdown_manual - -architectury_version=7.0.66 - -fabric_loader_version=0.14.12 -fabric_api_version=0.70.0+1.19.3 - -forge_version=1.19.3-44.1.0 - -curse_project_id=502485 -modrinth_project_id=markdownmanual +modId=markdown_manual +mavenGroup=li.cil.markdown_manual # Set by build pipeline. -semver=0.0.0 +modVersion=0.0.0 diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml new file mode 100644 index 0000000..72a862b --- /dev/null +++ b/gradle/libs.versions.toml @@ -0,0 +1,27 @@ +[versions] +minecraft = "1.20.1" +parchment = "2023.08.13" + +architectury = "9.1.12" + +fabric-loader = "0.14.22" +fabric-api = "0.87.0+1.20.1" + +forge-platform = "1.20.1-47.1.0" + +[plugins] +loom = { id = "dev.architectury.loom", version = "1.3-SNAPSHOT" } +architectury = { id = "architectury-plugin", version = "3.4-SNAPSHOT" } +shadow = { id = "com.github.johnrengelman.shadow", version = "8.1.1" } +spotless = { id = "com.diffplug.spotless", version = "6.20.0" } + +[libraries] +minecraft = { group = "com.mojang", name = "minecraft", version.ref = "minecraft" } +architectury-api = { group = "dev.architectury", name = "architectury", version.ref = "architectury" } + +fabric-loader = { group = "net.fabricmc", name = "fabric-loader", version.ref = "fabric-loader" } +fabric-api = { group = "net.fabricmc.fabric-api", name = "fabric-api", version.ref = "fabric-api" } +fabric-architectury = { group = "dev.architectury", name = "architectury-fabric", version.ref = "architectury" } + +forge-platform = { group = "net.minecraftforge", name = "forge", version.ref = "forge-platform" } +forge-architectury = { group = "dev.architectury", name = "architectury-forge", version.ref = "architectury" } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index e708b1c023ec8b20f512888fe07c5bd3ff77bb8f..41d9927a4d4fb3f96a785543079b8df6723c946b 100644 GIT binary patch delta 20926 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 i_W%EDg1>@4`_NK(#)z|gdCiK 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 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 41dfb87..fae0804 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/settings.gradle b/settings.gradle deleted file mode 100644 index 533a2cd..0000000 --- a/settings.gradle +++ /dev/null @@ -1,14 +0,0 @@ -pluginManagement { - repositories { - maven { url "https://maven.fabricmc.net/" } - maven { url "https://maven.architectury.dev/" } - maven { url "https://maven.minecraftforge.net/" } - gradlePluginPortal() - } -} - -include("common") -include("fabric") -include("forge") - -rootProject.name = archives_base_name diff --git a/settings.gradle.kts b/settings.gradle.kts new file mode 100644 index 0000000..75306c2 --- /dev/null +++ b/settings.gradle.kts @@ -0,0 +1,33 @@ +pluginManagement { + repositories { + exclusiveContent { + forRepository { maven("https://maven.architectury.dev") } + filter { + includeGroup("architectury-plugin") + includeGroupByRegex("dev\\.architectury.*") + } + } + exclusiveContent { + forRepository { maven("https://maven.fabricmc.net") } + filter { + includeGroup("net.fabricmc") + includeGroup("fabric-loom") + } + } + exclusiveContent { + forRepository { maven("https://maven.minecraftforge.net") } + filter { + includeGroupByRegex("net\\.minecraftforge.*") + includeGroup("de.oceanlabs.mcp") + } + } + gradlePluginPortal() + } +} + +include("common") +include("fabric") +include("forge") + +val modId: String by settings +rootProject.name = modId