From 76ed10521d52c32357d6dad250099cc403772aff Mon Sep 17 00:00:00 2001 From: Kevinthegreat <92656833+kevinthegreat1@users.noreply.github.com> Date: Mon, 29 Apr 2024 11:19:41 -0400 Subject: [PATCH] Update to 1.20.5 --- .github/workflows/build.yml | 25 ++++++------------- CHANGELOG.md | 3 +++ build.gradle | 17 ++++++------- gradle.properties | 14 +++++------ .../option/OrganizablePlayScreensOptions.java | 8 +++--- 5 files changed, 30 insertions(+), 37 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1fc365f..3bc2a1f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -8,32 +8,23 @@ on: [pull_request, push] jobs: build: - strategy: - matrix: - # Use these Java versions - java: [ - 17, # Current Java LTS & minimum supported by Minecraft - ] - # and run on both Linux and Windows - os: [ubuntu-20.04, windows-2022] - runs-on: ${{ matrix.os }} + runs-on: ubuntu-22.04 steps: - name: checkout repository - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: validate gradle wrapper - uses: gradle/wrapper-validation-action@v1 - - name: setup jdk ${{ matrix.java }} - uses: actions/setup-java@v1 + uses: gradle/actions/wrapper-validation@v3 + - name: setup jdk 21 + uses: actions/setup-java@v4 with: - java-version: ${{ matrix.java }} + java-version: 21 + distribution: 'microsoft' - name: make gradle wrapper executable - if: ${{ runner.os != 'Windows' }} run: chmod +x ./gradlew - name: build run: ./gradlew build - name: capture build artifacts - if: ${{ runner.os == 'Linux' && matrix.java == '17' }} # Only upload artifacts built from latest java on one OS - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: Artifacts path: build/libs/ diff --git a/CHANGELOG.md b/CHANGELOG.md index ac7de76..fead5fd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +## Folders! 1.2.2 for 1.20.5 +Update to 1.20.5 + ## Folders! 1.2.1 for 1.20.4 Refactor code Add interface injection diff --git a/build.gradle b/build.gradle index 5a0cf2e..8b0e7b3 100644 --- a/build.gradle +++ b/build.gradle @@ -28,7 +28,9 @@ dependencies { testImplementation "net.fabricmc:fabric-loader-junit:${project.loader_version}" modImplementation "com.terraformersmc:modmenu:${project.modmenu_version}" - modImplementation "gg.essential:essential-${project.essential_minecraft_version}-fabric:${project.essential_version}" + modCompileOnly "gg.essential:essential-${project.essential_minecraft_version}-fabric:${project.essential_version}" + + modLocalRuntime "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" } processResources { @@ -40,8 +42,7 @@ processResources { } tasks.withType(JavaCompile).configureEach { - // Minecraft 1.18 (1.18-pre2) upwards uses Java 17. - it.options.release = 17 + it.options.release = 21 } java { @@ -50,8 +51,8 @@ java { // If you remove this line, sources will not be generated. withSourcesJar() - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 + sourceCompatibility = JavaVersion.VERSION_21 + targetCompatibility = JavaVersion.VERSION_21 } jar { @@ -92,15 +93,13 @@ publishMods { projectId = "687113" projectSlug = "organizable-play-screens" // Required for discord webhook accessToken = providers.environmentVariable("CURSEFORGE_TOKEN") - minecraftVersions.add("1.20.3") - minecraftVersions.add("1.20.4") + minecraftVersions.add("1.20.5") requires("fabric-api") } modrinth { projectId = "zKrZtg3n" accessToken = providers.environmentVariable("MODRINTH_TOKEN") - minecraftVersions.add("1.20.3") - minecraftVersions.add("1.20.4") + minecraftVersions.add("1.20.5") } github { repository = "kevinthegreat1/OrganizablePlayScreens-Fabric" diff --git a/gradle.properties b/gradle.properties index fe5742a..3ed08c3 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,21 +3,21 @@ org.gradle.jvmargs=-Xmx1G # Fabric Properties # check these on https://fabricmc.net/develop - minecraft_version = 1.20.4 - yarn_mappings = 1.20.4+build.1 - loader_version = 0.15.1 + minecraft_version = 1.20.5 + yarn_mappings = 1.20.5+build.1 + loader_version = 0.15.10 # Mod Properties - mod_version = 1.2.1 + mod_version = 1.2.2 maven_group = com.kevinthegreat archives_base_name = organizable-play-screens # Dependencies - fabric_version = 0.91.2+1.20.4 + fabric_version = 0.97.7+1.20.5 # Mod Menu (https://modrinth.com/mod/modmenu/versions) - modmenu_version = 9.0.0 + modmenu_version = 10.0.0-beta.1 # Essential (https://repo.essential.gg/repository/maven-public/gg/essential/essential-1.20.4-fabric/maven-metadata.xml) essential_minecraft_version = 1.20.4 - essential_version = 15765+ge922acc4a7 + essential_version = 16817+g660dd3ce9d # JUnit (https://mvnrepository.com/artifact/org.junit.jupiter/junit-jupiter-api) junit_version = 5.10.1 diff --git a/src/main/java/com/kevinthegreat/organizableplayscreens/option/OrganizablePlayScreensOptions.java b/src/main/java/com/kevinthegreat/organizableplayscreens/option/OrganizablePlayScreensOptions.java index 558f7f3..ebf2075 100644 --- a/src/main/java/com/kevinthegreat/organizableplayscreens/option/OrganizablePlayScreensOptions.java +++ b/src/main/java/com/kevinthegreat/organizableplayscreens/option/OrganizablePlayScreensOptions.java @@ -134,8 +134,8 @@ public void load() { */ private void parseOption(JsonObject optionsJson, String name, SimpleOption option) { DataResult dataResult = option.getCodec().parse(JsonOps.INSTANCE, optionsJson.get(name)); - dataResult.error().ifPresent(error -> OrganizablePlayScreens.LOGGER.error("Error parsing option value " + optionsJson.get(name) + " for option " + name + ": " + error)); - dataResult.result().ifPresent(option::setValue); + dataResult.ifError(error -> OrganizablePlayScreens.LOGGER.error("Error parsing option value {} for option {}: {}", optionsJson.get(name), name, error)); + dataResult.ifSuccess(option::setValue); } /** @@ -173,8 +173,8 @@ public void save() { */ private void saveOption(JsonObject optionsJson, String name, SimpleOption option) { DataResult dataResult = option.getCodec().encodeStart(JsonOps.INSTANCE, option.getValue()); - dataResult.error().ifPresent(error -> OrganizablePlayScreens.LOGGER.error("Error encoding option value " + option.getValue() + " for option " + name + ": " + error)); - dataResult.result().ifPresent(optionJson -> optionsJson.add(name, optionJson)); + dataResult.ifError(error -> OrganizablePlayScreens.LOGGER.error("Error encoding option value {} for option {}: {}", option.getValue(), name, error)); + dataResult.ifSuccess(optionJson -> optionsJson.add(name, optionJson)); } /**