From b7ec6467e7b67e5e915dab5520235777c7bb734e Mon Sep 17 00:00:00 2001 From: TheBjoRedCraft Date: Fri, 5 Jun 2026 21:18:15 +0200 Subject: [PATCH] feat: update versioning and adjust trader item prices for balance --- .github/workflows/publish.yml | 60 ++----------------- gradle.properties | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- .../dev/slne/spawn/trader/trades/Trades.kt | 6 +- 4 files changed, 9 insertions(+), 61 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 7291d65..f6b1095 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -6,61 +6,9 @@ on: - version/* workflow_dispatch: -env: - SLNE_SNAPSHOTS_REPO_USERNAME: ${{ secrets.SLNE_SNAPSHOTS_REPO_USERNAME }} - SLNE_SNAPSHOTS_REPO_PASSWORD: ${{ secrets.SLNE_SNAPSHOTS_REPO_PASSWORD }} - SLNE_RELEASES_REPO_USERNAME: ${{ secrets.SLNE_RELEASES_REPO_USERNAME }} - SLNE_RELEASES_REPO_PASSWORD: ${{ secrets.SLNE_RELEASES_REPO_PASSWORD }} - MODULE_REGEX: "spawn-trader.*-all\\.jar$" - jobs: build: - runs-on: ubuntu-latest - steps: - - name: Collect Workflow Telemetry - uses: catchpoint/workflow-telemetry-action@v2 - - - name: Checkout Repository - uses: actions/checkout@v4 - with: - fetch-depth: 0 - - - name: Cache Gradle packages - uses: actions/cache@v3 - with: - path: | - ~/.gradle/caches - ~/.gradle/wrapper - key: gradle-${{ runner.os }}-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }} - restore-keys: gradle-${{ runner.os }}- - - - name: Setup JDK - uses: actions/setup-java@v4 - with: - distribution: 'graalvm' - java-version: '25' - - - name: Build all modules with Gradle - run: ./gradlew build shadowJar --parallel --no-scan - - - name: Extract Project Version - id: get_version - run: echo "VERSION=$(./gradlew properties | grep "^version:" | awk '{print $2}')" >> $GITHUB_ENV - - - name: Find and filter JAR files - id: find_jars - run: | - echo "JAR_FILES<> $GITHUB_ENV - find . -path "**/build/libs/*.jar" | grep -E "${{ env.MODULE_REGEX }}" >> $GITHUB_ENV - echo "EOF" >> $GITHUB_ENV - - - name: Create GitHub Release - uses: softprops/action-gh-release@v2 - with: - tag_name: v${{ env.VERSION }} - name: Release ${{ env.VERSION }} - draft: false - prerelease: false - files: ${{ env.JAR_FILES }} - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + uses: SLNE-Development/surf-workflows/.github/workflows/build-publish-release-gradle.yml@master + with: + modules: "spawn-trader-*-all.jar" + secrets: inherit \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index cf04838..87b0351 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ kotlin.code.style=official kotlin.stdlib.default.dependency=false org.gradle.parallel=true -version=1.4.3-SNAPSHOT \ No newline at end of file +version=1.4.4 \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index f670658..1a70468 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions-snapshots/gradle-9.4.0-20260117005955+0000-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.0-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/src/main/java/dev/slne/spawn/trader/trades/Trades.kt b/src/main/java/dev/slne/spawn/trader/trades/Trades.kt index 6b6e2e7..30c9318 100644 --- a/src/main/java/dev/slne/spawn/trader/trades/Trades.kt +++ b/src/main/java/dev/slne/spawn/trader/trades/Trades.kt @@ -24,12 +24,12 @@ enum class Trades(val displayName: TextComponent, val singleItem: ItemStack, val } } }, - 500 + 100 ), LIGHT_BLOCK( buildText { traderColored("Lichtblock".toSmallCaps(), TextDecoration.BOLD) }, ItemType.LIGHT.createItemStack(), - 250 + 50 ), GLOBE_BANNER_PATTERN( buildText { traderColored("Globus Banner-Muster".toSmallCaps(), TextDecoration.BOLD) }, @@ -39,6 +39,6 @@ enum class Trades(val displayName: TextComponent, val singleItem: ItemStack, val TRADER_CLOCK( buildText { traderColored("Händlers Uhr".toSmallCaps(), TextDecoration.BOLD) }, plugin.spawnTradersClockItem, - 50000 + 10000 ) } \ No newline at end of file