Skip to content

Commit

Permalink
Updates from main
Browse files Browse the repository at this point in the history
Co-authored-by: Kichura <68134602+kichura@users.noreply.github.com>
  • Loading branch information
FlorianMichael and Kichura committed Jan 18, 2025
1 parent dd272a6 commit 9ba46b6
Show file tree
Hide file tree
Showing 84 changed files with 278 additions and 388 deletions.
16 changes: 15 additions & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
@@ -1,4 +1,18 @@
root = true

[*]
charset = utf-8
indent_size = 4
indent_style = space
insert_final_newline = true
tab_width = 4

[*.java]
indent_style = space
ij_java_class_count_to_use_import_on_demand = 999999
ij_java_names_count_to_use_import_on_demand = 999999
ij_java_imports_layout = *, |, $*
ij_java_generate_final_locals = true
ij_java_generate_final_parameters = true

[{*.json,*.yml}]
indent_size = 2
1 change: 0 additions & 1 deletion .github/FUNDING.yml
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
github: [creeper123123321, FlorianMichael]
custom: ['https://creeper123123321.github.io/#donate', 'https://florianmichael.de/donate']
19 changes: 6 additions & 13 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -1,29 +1,22 @@
name: Java CI with Gradle
on: [ pull_request, push ]
name: Build
on: [ pull_request, push, workflow_dispatch ]

jobs:
build:
runs-on: ubuntu-24.04
steps:
- name: Checkout Repository
uses: actions/checkout@v4
- name: Validate Gradle Wrapper
uses: gradle/actions/wrapper-validation@v4
with:
persist-credentials: false
- name: Set up Gradle
uses: gradle/actions/setup-gradle@v4
- name: Set up JDK 21
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: 21
check-latest: true
- name: Cache Dependencies
uses: actions/cache@v4
with:
path: |
~/.gradle/caches
~/.gradle/wrapper
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
restore-keys: |
${{ runner.os }}-gradle-
- name: Build with Gradle
run: ./gradlew build
- name: Upload Artifacts
Expand Down
10 changes: 6 additions & 4 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,10 @@ jobs:
steps:
- name: Checkout Repository
uses: actions/checkout@v4
- name: Validate Gradle Wrapper
uses: gradle/actions/wrapper-validation@v4
with:
persist-credentials: false
- name: Set up Gradle
uses: gradle/actions/setup-gradle@v4
- name: Set up JDK 21
uses: actions/setup-java@v4
with:
Expand All @@ -18,6 +20,6 @@ jobs:
check-latest: true
- name: Build and Publish
env:
CURSEFORGE_API_KEY: ${{ secrets.CREEPER_CF }}
CURSEFORGE_TOKEN: ${{ secrets.CREEPER_CF }}
MODRINTH_TOKEN: ${{ secrets.MODRINTH_TOKEN }}
run: ./gradlew curseforge modrinth
run: ./gradlew publishMods
20 changes: 0 additions & 20 deletions .github/workflows/update-gradle-wrapper.yml

This file was deleted.

253 changes: 0 additions & 253 deletions build.gradle

This file was deleted.

Loading

0 comments on commit 9ba46b6

Please sign in to comment.