diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 000000000..3368622af --- /dev/null +++ b/.gitattributes @@ -0,0 +1,23 @@ +# Normalize as LF in the repository, OS native locally +* text=auto + +*.bat text eol=crlf +gradlew text eol=lf +*.sh text eol=lf + +*.java text +*.java diff=java + +# Binary files that should not be modified +*.dat binary +*.db binary +*.icns binary +*.ico binary +*.jar binary +*.jks binary +*.jpg binary +*.key binary +*.png binary +*.ttf binary +*.wav binary +JavaApplicationStub binary \ No newline at end of file diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 000000000..67be741b9 --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,52 @@ +# Making changes? https://github.com/nektos/act may help you test locally + +name: Build with GitHub Actions + +on: + push: + branches: "**" + tags-ignore: ["**"] + pull_request: + release: + types: [released] + +concurrency: + group: "${{ github.workflow }}-${{ github.event.number || github.ref }}" + cancel-in-progress: true + +env: + RUNTIME_VERSION: 17 + +jobs: + build: + # Only run on PRs if the source branch is on someone else's repo + if: "${{ github.event_name != 'pull_request' || github.repository != github.event.pull_request.head.repo.full_name }}" + + runs-on: "${{ matrix.os }}" + strategy: + matrix: + os: [ubuntu-latest, windows-latest] + steps: + # Setup + - name: Check out + uses: actions/checkout@v3 + - name: "Setup JDK ${{ env.RUNTIME_VERSION }}" + uses: actions/setup-java@v3 + with: + distribution: temurin + java-version: "${{ env.RUNTIME_VERSION }}" + - name: Validate Gradle wrapper + uses: gradle/wrapper-validation-action@v1 + + # Actually build + - name: Build with Gradle + uses: gradle/gradle-build-action@v2 + with: + arguments: build + - name: Archive test results + if: "${{ always() }}" + uses: actions/upload-artifact@v3 + with: + name: "${{ runner.os }}-test-results" + path: | + build/reports/ \ No newline at end of file diff --git a/.gitignore b/.gitignore index 7c9cf9c2a..afa901955 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,76 @@ -/build/ -/.gradle/ +# Build # +######### +MANIFEST.MF +dependency-reduced-pom.xml + +# Compiled # +############ +/bin +/build +/dist +/lib +/out +/run +/target +*.com +*.class +*.dll +*.exe +*.o +*.so + +# Databases # +############# +*.db +*.sql +*.sqlite + +# Packages # +############ +*.7z +*.dmg +*.gz +*.iso +*.rar +*.tar +*.zip + +# Repository # +############## +.git + +# Logging # +########### +/logs +*.log + +# Misc # +######## +*.bak + +# System # +########## +.DS_Store +ehthumbs.db +Thumbs.db + +# Project # +########### +.classpath +.externalToolBuilders +/.gradle +.idea +.project +.settings +.factorypath +/eclipse +nbproject +atlassian-ide-plugin.xml +build.xml +nb-configuration.xml +*.iml +*.ipr +*.iws +/.apt_generated/ +*.launch +/.nb-gradle/ \ No newline at end of file diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock index bac82395c..242565945 100644 Binary files a/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/.gradle/buildOutputCleanup/cache.properties b/.gradle/buildOutputCleanup/cache.properties index be88bb11c..6a6c5f1b1 100644 --- a/.gradle/buildOutputCleanup/cache.properties +++ b/.gradle/buildOutputCleanup/cache.properties @@ -1,2 +1,2 @@ -#Mon Mar 01 13:59:33 GMT 2021 -gradle.version=4.10.3 +#Thu Oct 05 19:00:05 BST 2023 +gradle.version=7.5.1 diff --git a/.gradle/buildOutputCleanup/outputFiles.bin b/.gradle/buildOutputCleanup/outputFiles.bin index 3c420574c..5176480b3 100644 Binary files a/.gradle/buildOutputCleanup/outputFiles.bin and b/.gradle/buildOutputCleanup/outputFiles.bin differ diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 61a9130cd..b84fc1189 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -1,6 +1,45 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/dictionaries/berna.xml b/.idea/dictionaries/berna.xml index 658dac558..596f8ab76 100644 --- a/.idea/dictionaries/berna.xml +++ b/.idea/dictionaries/berna.xml @@ -8,6 +8,10 @@ movecraft passthrough proccessor + pulverizer + spongeapi + spongecommon + spongepowered subcraft teleport vert diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml index 42098b530..e9b829d96 100644 --- a/.idea/jarRepositories.xml +++ b/.idea/jarRepositories.xml @@ -21,6 +21,11 @@