From b8acd7cff42988fe8bab6b5e90034d953ff3e1b9 Mon Sep 17 00:00:00 2001 From: Drex Date: Sun, 23 Mar 2025 01:16:00 +0100 Subject: [PATCH 1/2] Update to 1.21.5-rc1 --- build.gradle | 2 +- gradle.properties | 10 +++++----- gradle/wrapper/gradle-wrapper.properties | 2 +- src/main/java/eu/pb4/playerdata/impl/BaseGson.java | 3 +-- 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/build.gradle b/build.gradle index 2cf4a54..5486f39 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'fabric-loom' version '1.7.+' + id 'fabric-loom' version '1.10.+' id 'maven-publish' } diff --git a/gradle.properties b/gradle.properties index 1c865cf..42f9dbd 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,14 +3,14 @@ org.gradle.jvmargs=-Xmx1G # Fabric Properties # check these on https://fabricmc.net/use -minecraft_version=1.21.3 -yarn_mappings=1.21.3+build.1 -loader_version=0.16.7 +minecraft_version=1.21.5-rc1 +yarn_mappings=1.21.5-rc1+build.3 +loader_version=0.16.10 #Fabric api -fabric_version=0.106.1+1.21.3 +fabric_version=0.119.3+1.21.5 # Mod Properties -mod_version = 0.7.0+1.21.3 +mod_version = 0.7.0+1.21.5 maven_group = eu.pb4 archives_base_name = player-data-api diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 0d18421..2733ed5 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-8.8-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/src/main/java/eu/pb4/playerdata/impl/BaseGson.java b/src/main/java/eu/pb4/playerdata/impl/BaseGson.java index 19aff13..b7c8325 100644 --- a/src/main/java/eu/pb4/playerdata/impl/BaseGson.java +++ b/src/main/java/eu/pb4/playerdata/impl/BaseGson.java @@ -54,8 +54,6 @@ public class BaseGson { public static GsonBuilder createBuilder() { return new GsonBuilder().disableHtmlEscaping() - .registerTypeHierarchyAdapter(Identifier.class, new Identifier.Serializer()) - .registerTypeHierarchyAdapter(Item.class, new RegistrySerializer<>(Registries.ITEM)) .registerTypeHierarchyAdapter(Block.class, new RegistrySerializer<>(Registries.BLOCK)) .registerTypeHierarchyAdapter(SoundEvent.class, new RegistrySerializer<>(Registries.SOUND_EVENT)) @@ -76,6 +74,7 @@ public static GsonBuilder createBuilder() { .registerTypeHierarchyAdapter(PositionSourceType.class, new RegistrySerializer<>(Registries.POSITION_SOURCE_TYPE)) .registerTypeHierarchyAdapter(RuleTestType.class, new RegistrySerializer<>(Registries.RULE_TEST)) .registerTypeHierarchyAdapter(RuleBlockEntityModifier.class, new RegistrySerializer<>(Registries.RULE_BLOCK_ENTITY_MODIFIER)) + .registerTypeHierarchyAdapter(Identifier.class, new CodecSerializer<>(Identifier.CODEC)) .registerTypeHierarchyAdapter(Text.class, new CodecSerializer<>(TextCodecs.CODEC)) .registerTypeHierarchyAdapter(Style.class, new CodecSerializer<>(Style.Codecs.CODEC)) .registerTypeHierarchyAdapter(ItemStack.class, new CodecSerializer<>(ItemStack.CODEC)) From 5599392545e3d0f2b25faef24487639534a46d8e Mon Sep 17 00:00:00 2001 From: Drex Date: Sun, 23 Mar 2025 01:22:07 +0100 Subject: [PATCH 2/2] Update github workflows --- .github/workflows/build.yml | 9 +++++---- .github/workflows/release.yml | 7 ++++--- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8b137ea..d1bdde1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -19,12 +19,13 @@ jobs: runs-on: ${{ matrix.os }} steps: - name: checkout repository - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: validate gradle wrapper - uses: gradle/wrapper-validation-action@v1 + uses: gradle/actions/wrapper-validation@v4 - name: setup jdk ${{ matrix.java }} - uses: actions/setup-java@v1 + uses: actions/setup-java@v4 with: + distribution: temurin java-version: ${{ matrix.java }} - name: make gradle wrapper executable if: ${{ runner.os != 'Windows' }} @@ -32,7 +33,7 @@ jobs: - name: build run: ./gradlew build - name: capture build artifacts - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: Artifacts path: build/libs/ diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a695ae2..b566f80 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/cache@v2 + - uses: actions/cache@v4 with: path: | ~/.gradle/loom-cache @@ -20,10 +20,11 @@ jobs: key: gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }} restore-keys: | gradle- - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Set up JDK - uses: actions/setup-java@v1 + uses: actions/setup-java@v4 with: + distribution: temurin java-version: 21 - name: Grant execute permission for gradlew