From bfefa51df22e98120b5309990c8a20265ece81e3 Mon Sep 17 00:00:00 2001 From: AlphaKR93 Date: Wed, 15 May 2024 12:47:26 +0900 Subject: [PATCH] Initial --- .editorconfig | 39 + .github/workflows/gradle.yml | 43 + .github/workflows/release.yml | 102 + .github/workflows/upstream.yml | 118 + .gitignore | 61 + LICENSE.md | 23 + README.md | 72 + base | 1 + build.gradle.kts | 243 ++ gradle.properties | 18 + gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 43453 bytes gradle/wrapper/gradle-wrapper.properties | 7 + gradlew | 249 ++ gradlew.bat | 92 + initDev | 52 + ...ve-remaining-timings-implementations.patch | 2100 +++++++++++++++++ ...ve-remaining-timings-implementations.patch | 1255 ++++++++++ settings.gradle.kts | 53 + upstream | 1 + 19 files changed, 4529 insertions(+) create mode 100644 .editorconfig create mode 100644 .github/workflows/gradle.yml create mode 100644 .github/workflows/release.yml create mode 100644 .github/workflows/upstream.yml create mode 100644 .gitignore create mode 100644 LICENSE.md create mode 100644 README.md create mode 120000 base create mode 100644 build.gradle.kts create mode 100644 gradle.properties create mode 100644 gradle/wrapper/gradle-wrapper.jar create mode 100644 gradle/wrapper/gradle-wrapper.properties create mode 100755 gradlew create mode 100644 gradlew.bat create mode 100644 initDev create mode 100644 patches/api/0001-Remove-remaining-timings-implementations.patch create mode 100644 patches/server/0001-Remove-remaining-timings-implementations.patch create mode 100644 settings.gradle.kts create mode 120000 upstream diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..b0747d3 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,39 @@ +[*] +charset=utf-8 +end_of_line=lf +insert_final_newline=true +indent_style=space +indent_size=4 +ij_any_block_comment_add_space = false +ij_any_block_comment_at_first_column = false +ij_any_line_comment_at_first_column = false +ij_any_line_comment_add_space = true +max_line_length = 120 +ij_visual_guides = 80 + +[*.tiny] +indent_style=tab + +[*.bat] +end_of_line=crlf + +[*.yml] +indent_size=2 + +[*.patch] +trim_trailing_whitespace=false + +[*.java] +ij_continuation_indent_size = 4 +ij_java_class_count_to_use_import_on_demand = 999999 +ij_java_insert_inner_class_imports = false +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 + +[*-Server/src/main/resources/data/**/*.json] +indent_size = 2 + +[paper-api-generator/generated/**/*.java] +ij_java_imports_layout = $*,|,* diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml new file mode 100644 index 0000000..4701c19 --- /dev/null +++ b/.github/workflows/gradle.yml @@ -0,0 +1,43 @@ +name: Test Gradle build script + +on: + push: + branches: [ "ver/*", "dev/*", "feat/**/*" ] + paths: + - "*.kt" + - "*.kts" + - "*.toml" + - "gradle-wrapper.*" + workflow_dispatch: + +jobs: + check: + name: Test Gradle build script + strategy: + matrix: + jdk: [21] + java: ['zulu'] + os: [ubuntu-22.04] + + if: "!contains(github.event.commits[0].message, '[CheckSkip]')" + runs-on: ${{ matrix.os }} + steps: + - name: Checkout action + uses: actions/checkout@v3 + + - name: Validate Gradle Wrapper + uses: gradle/wrapper-validation-action@v1 + + - name: Set up JDK ${{ matrix.java }} ${{ matrix.jdk }} + uses: actions/setup-java@v3 + with: + distribution: ${{ matrix.java }} + java-version: ${{ matrix.jdk }} + cache: 'gradle' + + - name: Configure Git + run: | + git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com" && git config --global user.name "github-actions[bot]" + + - name: Run Gradle + run: ./gradlew --stacktrace diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml new file mode 100644 index 0000000..e340f0f --- /dev/null +++ b/.github/workflows/release.yml @@ -0,0 +1,102 @@ +name: Release Volt + +on: + push: + branches: [ "ver/*", "dev/*", "feat/**/*" ] + paths: + - "**.patch" + workflow_dispatch: + +env: + ORG_NAME: PlazmaMC + MC_VERSION: 1.20.4 + +jobs: + release: + name: Release Volt + strategy: + matrix: + base_jdk: [17] + os: [ubuntu-22.04] + + if: "!startsWith(github.event.commits[0].message, '[CI-Skip]')" + runs-on: ${{ matrix.os }} + steps: + - name: Setup Variables + id: setup + env: + BRANCH: ${{ github.ref_name }} + run: echo "branch=${BRANCH##*/}" >> $GITHUB_OUTPUT + + - name: Checkout repository + uses: actions/checkout@v4 + + - name: Validate Gradle Wrapper + uses: gradle/wrapper-validation-action@v1 + + - name: Set up GraalVM ${{ matrix.base_jdk }} + uses: graalvm/setup-graalvm@v1 + with: + github-token: ${{ secrets.GITHUB_TOKEN }} + java-version: ${{ matrix.base_jdk }} + version: latest + cache: 'gradle' + + - name: Configure Git + run: git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com" && git config --global user.name "github-actions[bot]" + + - name: Apply Patches + run: ./gradlew applyPatches --stacktrace + + - name: Build + run: ./gradlew build --stacktrace + + - name: Create Reobf Jar + run: ./gradlew createReobfPaperclipJar --stacktrace + + - name: Create Mojmap Jar + run: ./gradlew createMojmapPaperclipJar --stacktrace + + - name: Publish Packages + if: startsWith(github.ref_name, 'ver/') || startsWith(github.ref_name, 'dev/') + run: | + export GITHUB_USERNAME=${{ env.ORG_NAME }} + export GITHUB_TOKEN=${{ secrets.GITHUB_TOKEN }} + ./gradlew publish --stacktrace + + - name: Get Release Number + if: startsWith(github.ref_name, 'ver/') + run: echo "RELEASE=$(git ls-remote --tags origin | grep "build/${{ env.MC_VERSION }}" | wc -l)" >> $GITHUB_ENV + + - name: Release Artifacts + if: startsWith(github.ref_name, 'ver/') + uses: softprops/action-gh-release@v0.1.15 + with: + name: "Build #${{ env.RELEASE }} for ${{ env.MC_VERSION }}" + tag_name: build/${{ env.MC_VERSION }}/${{ env.RELEASE }} + target_commitish: ${{ github.ref_name }} + generate_release_notes: true + fail_on_unmatched_files: true + files: build/libs/*.jar + + - name: Release Artifacts (Latest/Stable) + if: startsWith(github.ref_name, 'ver/') + uses: softprops/action-gh-release@v0.1.15 + with: + name: "Build #${{ env.RELEASE }} for ${{ env.MC_VERSION }}" + tag_name: build/${{ env.MC_VERSION }}/latest + target_commitish: ${{ github.ref_name }} + generate_release_notes: true + fail_on_unmatched_files: true + files: build/libs/*.jar + + - name: Release Artifacts (Latest/Development) + if: startsWith(github.ref_name, 'dev/') + uses: softprops/action-gh-release@v0.1.15 + with: + name: "Development Build for ${{ env.MC_VERSION }}" + tag_name: build/${{ env.MC_VERSION }}/latest + target_commitish: ${{ github.ref_name }} + generate_release_notes: true + fail_on_unmatched_files: true + files: build/libs/*.jar diff --git a/.github/workflows/upstream.yml b/.github/workflows/upstream.yml new file mode 100644 index 0000000..f78b26f --- /dev/null +++ b/.github/workflows/upstream.yml @@ -0,0 +1,118 @@ +name: Always Up To Date +on: + workflow_dispatch: + schedule: + - cron: "*/20 * * * *" + +jobs: + prepare: + name: Prepare Actions + runs-on: ubuntu-latest + outputs: + matrix: ${{ steps.matrix.outputs.matrix }} + steps: + - name: Pull Branches + id: matrix + run: | + respond=$(curl --silent https://api.github.com/repos/plazmamc/thunderbolt/branches | jq -rc 'del(.[]|.protected) | del(.[]|.commit)') + flavor=$(echo $respond | jq -rc 'map(select(.name | test("feat/.*")) | .flavor = .name | del(.name))') + echo "matrix={\"include\":$(echo "$base $flavor" | jq -sc add)}" >> $GITHUB_OUTPUT + + upstream: + name: Update Base Upstream + runs-on: ubuntu-latest + steps: + - name: Checkout repository + uses: actions/checkout@v4 + with: + ref: base + + - name: Validate Gradle Wrapper + uses: gradle/wrapper-validation-action@v1 + + - name: Setup JDK + uses: actions/setup-java@v4 + with: + distribution: zulu + java-version: 21 + + - name: Determine if update is required + id: check + run: echo "needs=$(./gradlew -q checkNeedsUpdate)" >> $GITHUB_OUTPUT + + - name: Configure Git + if: steps.check.outputs.needs == 'true' + run: git config --global user.email "action@github.com" && git config --global user.name "Github Action" + + - name: Update upstream + if: steps.check.outputs.needs == 'true' + run: ./gradlew updateUpstream + + - name: Apply patches + if: steps.check.outputs.needs == 'true' + run: ./gradlew applyPatches + + - name: Check build + if: steps.check.outputs.needs == 'true' + run: ./gradlew build + + - name: Commit changes + if: steps.check.outputs.needs == 'true' + run: git add . && printf "Updated Upstream (Plazma)\n\nUpstream has released updates that appear to apply and compile correctly\n\n$(cat compare.txt)" | git commit -F - + + - name: Push changes + if: steps.check.outputs.needs == 'true' + uses: ad-m/github-push-action@master + with: + github_token: ${{ secrets.GITHUB_TOKEN }} + + flavor: + name: Update Flavors Upstream + needs: prepare + runs-on: ubuntu-latest + strategy: + matrix: ${{ fromJson(needs.prepare.outputs.matrix) }} + steps: + - name: Checkout repository + uses: actions/checkout@v4 + with: + ref: ${{ matrix.flavor }} + + - name: Validate Gradle Wrapper + uses: gradle/wrapper-validation-action@v1 + + - name: Setup JDK + uses: actions/setup-java@v3 + with: + distribution: zulu + java-version: 21 + + - name: Determine if update is required + id: check + run: echo "needs=$(./gradlew -q checkNeedsUpdate)" >> $GITHUB_OUTPUT + + - name: Configure Git + if: steps.check.outputs.needs == 'true' + run: git config --global user.email "action@github.com" && git config --global user.name "Github Action" + + - name: Update upstream + if: steps.check.outputs.needs == 'true' + run: ./gradlew updateUpstream + + - name: Apply patches + if: steps.check.outputs.needs == 'true' + run: ./gradlew applyPatches + + - name: Check build + if: steps.check.outputs.needs == 'true' + run: ./gradlew build + + - name: Commit changes + if: steps.check.outputs.needs == 'true' + run: git add . && printf "Updated Upstream (Base)\n\nUpstream has released updates that appear to apply and compile correctly\n\n$(cat compare.txt)" | git commit -F - + + - name: Push changes + if: steps.check.outputs.needs == 'true' + uses: ad-m/github-push-action@master + with: + github_token: ${{ secrets.GITHUB_TOKEN }} diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..086664a --- /dev/null +++ b/.gitignore @@ -0,0 +1,61 @@ +# JVM crash related +core.* +hs_err_pid* + +# Intellij +.idea/ +*.iml +*.ipr +*.iws +out/ + +# Eclipse +.classpath +.project +.settings/ + +# netbeans +nbproject/ +nbactions.xml + +# Gradle +!gradle-wrapper.jar +.gradle/ +build/ +*/build/ +run/ +javadoc/ + +# we use maven! +build.xml + +# Maven +log/ +target/ +dependency-reduced-pom.xml + +# various other potential build files +bin/ +dist/ +manifest.mf + +# Mac +.DS_Store/ +.DS_Store + +# vim +.*.sw[a-p] + +# Linux temp files +*~ + +# Paperweight +libs/ +build-data/ +*-API +*-MojangAPI +*-Server +paper-api-generator +compare.txt +*.patch +!patches/**/* diff --git a/LICENSE.md b/LICENSE.md new file mode 100644 index 0000000..6c40a95 --- /dev/null +++ b/LICENSE.md @@ -0,0 +1,23 @@ +The MIT License (MIT) +===================== + +Permission is hereby granted, free of charge, to any person +obtaining a copy of this software and associated documentation +files (the “Software”), to deal in the Software without +restriction, including without limitation the rights to use, +copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following +conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES +OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT +HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +OTHER DEALINGS IN THE SOFTWARE. diff --git a/README.md b/README.md new file mode 100644 index 0000000..1eaa3d6 --- /dev/null +++ b/README.md @@ -0,0 +1,72 @@ +
+ +# Thunderbolt + +### A Server platform with features too experimental to implement into Plazma + +[![Discord](https://img.shields.io/discord/1083716853928558652?style=for-the-badge&logo=discord&logoColor=ffffff&label=DISCORD&color=5865F2)](https://discord.gg/MmfC52K8A8) +[![License](https://img.shields.io/github/license/PlazmaMC/Thunderbolt?style=for-the-badge&logo=github&logoColor=ffffff)](LICENSE.md) +[![Stargazers](https://img.shields.io/github/stars/PlazmaMC/Thunderbolt?label=stars&logo=data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABhWlDQ1BJQ0MgcHJvZmlsZQAAKJF9kT1Iw0AcxV9bxSIVh1YQcYhQnSyIiuimVShChVArtOpgcukXNGlIUlwcBdeCgx+LVQcXZ10dXAVB8APE0clJ0UVK/F9SaBHjwXE/3t173L0D/PUyU82OMUDVLCOViAuZ7KrQ9YogwujDEGYkZupzopiE5/i6h4+vdzGe5X3uz9Gj5EwG+ATiWaYbFvEG8dSmpXPeJ46woqQQnxOPGnRB4keuyy6/cS447OeZESOdmieOEAuFNpbbmBUNlXiSOKqoGuX7My4rnLc4q+Uqa96TvzCU01aWuU5zEAksYgkiBMioooQyLMRo1UgxkaL9uId/wPGL5JLJVQIjxwIqUCE5fvA/+N2tmZ8Yd5NCcaDzxbY/hoGuXaBRs+3vY9tunACBZ+BKa/krdWD6k/RaS4seAb3bwMV1S5P3gMsdoP9JlwzJkQI0/fk88H5G35QFwrdA95rbW3Mfpw9AmrpK3gAHh8BIgbLXPd4dbO/t3zPN/n4Ax9dyyerighsAAAAGYktHRAAAAAAAAPlDu38AAAAJcEhZcwAADdcAAA3XAUIom3gAAAAHdElNRQfmCBMVNjtc7/hFAAABIElEQVQ4y62SzS5DURSFv6smXkAUCRU0UdKYGNTPyCsYYOYFGGi8Ao9QM0PxCh6CgQ4qfiLpBFEjdKCfySaXtDch1uScs9Ze62TvcyAD6o66zV+gjqpvalsd61XXl5GxBySx3/3t7UPqi1pTD9VXdaRbbZIyDQLTwBSwBqzGGaABnAInwCXQSJLk/tO4orb8jra6nwo/CC6NlrqMOq421Y5aVSfUXJe2cqFVo7b5NdwIuVaf1IWM2cyrD+qdOvlTLERIS53pYi6FdqMWet2wGP1tdNE2Q1vK+gfDsdbDlFfzwV3Ems8KmAXegcd4hSvgVq0Bz6GV0ob+HgF1YAA4Cn4LWA9tLusHnscTHavFFF8MrqOeZQVU1HKGXlYr/Cc+AKuOI2h/Jrf7AAAAAElFTkSuQmCC&style=for-the-badge&color=green)](https://github.com/PlazmaMC/Thunderbolt/stargazers) + +[![Upstream Status](https://img.shields.io/github/actions/workflow/status/PlazmaMC/Thunderbolt/upstream.yml?label=upstream&logo=data%3Aimage%2Fpng%3Bbase64%2CiVBORw0KGgoAAAANSUhEUgAAAGAAAABgCAYAAADimHc4AAAACXBIWXMAAAsTAAALEwEAmpwYAAAGD0lEQVR4nO2dW4hVVRiAl5OjCFoMlpYx2WXMXjShi5FFTxFhhmFlQxlRU0kEXQiJorKIMoIiIoJegiiK8pKWZBTUg0ZpaHYhslBL8TKVTWWO00x98XP%2BicNhzt5rnb3P2WvtWd%2FjzDl7r%2FX%2F6%2FrfjjGRSCQSiUQikUgkEolEIpGIJwDHAHOA24CngTXA18Bu4BDwN3AUOAh8D3wOrAOeBLqBWUB70f0ICuBE4E7gXaCP7PwBrARuAqYU3T8vAdqB64EPgSGaxz%2F6joUyu8xoBzgOWAbsofXs0ndPNKMNoA24EThA8ezTPWZ0zAjgIt1IfWMbMM%2BUfJ1f3uQ1Po894rnSnZyAU3WEhcInwGmmDMi0BnozCGMA2KT3ADlKXgycAnQAY4HxwAnA6fouWc%2BfBzYCgxne%2BwtwgQkZ4Fq9KLlyBHgDWARMyPD%2BDr2QvamXNlf%2BAuabENGOu47AvcD9wOQmtOck4FG9NbsgfbjBhARwneNm26eCn9CCtk0EHtdZ5qKE%2BSEdM12WndVifiignbKPvOfQzsPA%2BSaA006vw%2Fq6pOD2jgHucRgw0rfpxkeAccBWBzPAHOMJMrIdBs4q4yNqArbhG2Ca8QxgBrDTov0yW8YaD9d9m013O3C88RRgmoUS%2Fm3FYcHVafKVhfB%2FAk42ngOcCfyc0I9txieApZYb7mwTCMBc4M8R%2BiGz%2FHLjC8CxlhebHhMYVDZmcXEO8wOwwPgEcJ%2BF8FebgAGmAp3GU%2FPyjxZLj5%2Fn5tBRH24aDxTdztICfGBhzp1UdDtLiYR3WJz7Hyy6naUFuCNF%2BGJ7n1p0O0uLRp8l8bYpIcAkYAXwKfAl8EzLg700pETCApPoNiUD6KpjppCTYFczXjimzt%2FPThH%2BULVHS00VfhmvGhO%2BeOvqsTc3JWgw7AagXx3i7wBnVf2%2FJ0UBn%2BnnZgLr9RniUfoYOM%2BUT%2Fj5KUGFP5IN5Dexj%2BhnniKZF9WWIt%2BppT8kJWAv%2FHyUoCM%2FyW8rgl2V0oiXU6KaPzLlFH42JejmKiM0CRHsfrIx6HscJo0LP7MSXCIFGkWU3GbKK%2FzGlaAZKM1mnSm%2F8BtTAnBGnc0zL%2BTZM8zoEH7DSpibU2rQiJu48RAqUXPNTBLZ4xT71AQleCt8AXid5vOacSFHJfgu%2FLYWHT4O17MuNFMJXgu%2FKqBMEjOy8Kve%2BNNMNO4mmQxK8F74wwBbEvoxoCmzafGtC1KUsMU0SgNKCEb4AnBZnVkwoIJ9KaW%2FK%2FQ59ZQgz77UZMFBCUEJfxjgSg09qY7iu1D%2FlxbzenPVc%2BapryD%2FcBYLJQQp%2FJoNuVOOpTXu17Q9YnadMMfO3G%2F9CZbO%2Fy2mZQJYYhF80FZE%2FORbmuS8T3OwvLzhZkX9IUmsyfySyMhIMLFF9MfSOl%2BPZAV4zCL6w9tw%2B6ChEnicFnywvuh2lhbgEdJZXHQ7SwkwXW03aXluQUd7eIlmTko0Rxp3G5%2BQ4hZVR9M%2B7cQsExhUyqWlccCrQk%2BaH3ywTr22YC5nwDkWgQnCLcYngFcTGisJbzON51AZRDJ709jqXVCBhTtvp4%2B5wTWVGr%2B1DKnxb0YDOywav8vHmUDFYPYddiw3PgK8YtmBXp9GEHCu5i%2FbsNnbUmZ6bk5Kbq5N9b%2FX2T%2Baf5t7LDdcNBrQv0zJaqS8l2ZF2vJ%2BERmUamCzOecPc8SnWZsIcIVjlax%2B4IlWJPNpoaaH9WhsixjbrjIBOjBcS5X1quUx95OSerQeaqBIrAj%2FahMiOhNclqPqTq%2FUHOTJGUf7Yr2Z267z1ch3FpmQ0T1B3HWNMqT1O18AbtdylV06osdrpn6Hlqu8RG6nwLOSoZOxXOX%2B4MtV1tiHRIihsNn7044rWlzV95LFg5p%2BOs6UFY2X8bF88RfBHDNziru5xqLKSiuQi%2BNdvqdLNQU9pSzT34JpNbu1VKU%2F9vyioJLEvVArr2SNUE5b4zdoRd%2FoRqyjjClaHV3O7r%2FnIHQJGV%2BrNe1i6IjjzGjXn6DqVlPFWq3ftkM9b0f10nZIfQ3bNX9ZkshvlVhN75wmkUgkEolEIpFIJBKJRCIRM5r5D9WH9bFOGhrhAAAAAElFTkSuQmCC&style=flat-square)](https://github.com/PlazmaMC/Thunderbolt/actions/workflows/upstream.yml) +[![Forks](https://img.shields.io/github/forks/PlazmaMC/Thunderbolt?label=forks&logo=data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABhWlDQ1BJQ0MgcHJvZmlsZQAAKJF9kT1Iw0AcxV9bxSIVh1YQcYhQnSyIiuimVShChVArtOpgcukXNGlIUlwcBdeCgx+LVQcXZ10dXAVB8APE0clJ0UVK/F9SaBHjwXE/3t173L0D/PUyU82OMUDVLCOViAuZ7KrQ9YogwujDEGYkZupzopiE5/i6h4+vdzGe5X3uz9Gj5EwG+ATiWaYbFvEG8dSmpXPeJ46woqQQnxOPGnRB4keuyy6/cS447OeZESOdmieOEAuFNpbbmBUNlXiSOKqoGuX7My4rnLc4q+Uqa96TvzCU01aWuU5zEAksYgkiBMioooQyLMRo1UgxkaL9uId/wPGL5JLJVQIjxwIqUCE5fvA/+N2tmZ8Yd5NCcaDzxbY/hoGuXaBRs+3vY9tunACBZ+BKa/krdWD6k/RaS4seAb3bwMV1S5P3gMsdoP9JlwzJkQI0/fk88H5G35QFwrdA95rbW3Mfpw9AmrpK3gAHh8BIgbLXPd4dbO/t3zPN/n4Ax9dyyerighsAAAAGYktHRAAAAAAAAPlDu38AAAAJcEhZcwAADdcAAA3XAUIom3gAAAAHdElNRQfmCBMVNCYN3/YeAAAA/UlEQVQ4y7WTQUoDQRBFf01czlJcxUyOINGjjAvFHMFzZGdygOwDwTtk6UZcqLlAxCAuMigug89FamIzdAIN+qGhq/6v6qrqbumvAJwBj8AHMAQs4DJgBHy65jSW4Bl4AaZsUAbcufumrnmquSzIcSzpTtLA7XbA1fuBa9qxCob8YgUUAdcFqoC/iSXIgLELOhG+49w4nM+2BTP7ljR3M4/MufbNzYxdN1E0Sm2ialZnsVIllZKOJF24eyLpXdKtmS1S3sYMmO3THOwJziUdbrbkZvaVcnILeAh6vweylAQ9D7z2BXCS0sJS0lrSpdtrSW+pn6sPLIFX4Er/hR9C0wl1FTBzNwAAAABJRU5ErkJggg==&style=flat-square&color=green)](https://github.com/PlazmaMC/Thunderbolt/forks) +[![Watchers](https://img.shields.io/github/watchers/PlazmaMC/Thunderbolt?label=watchers&logo=data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABhWlDQ1BJQ0MgcHJvZmlsZQAAKJF9kT1Iw0AcxV9bxSIVh1YQcYhQnSyIiuimVShChVArtOpgcukXNGlIUlwcBdeCgx+LVQcXZ10dXAVB8APE0clJ0UVK/F9SaBHjwXE/3t173L0D/PUyU82OMUDVLCOViAuZ7KrQ9YogwujDEGYkZupzopiE5/i6h4+vdzGe5X3uz9Gj5EwG+ATiWaYbFvEG8dSmpXPeJ46woqQQnxOPGnRB4keuyy6/cS447OeZESOdmieOEAuFNpbbmBUNlXiSOKqoGuX7My4rnLc4q+Uqa96TvzCU01aWuU5zEAksYgkiBMioooQyLMRo1UgxkaL9uId/wPGL5JLJVQIjxwIqUCE5fvA/+N2tmZ8Yd5NCcaDzxbY/hoGuXaBRs+3vY9tunACBZ+BKa/krdWD6k/RaS4seAb3bwMV1S5P3gMsdoP9JlwzJkQI0/fk88H5G35QFwrdA95rbW3Mfpw9AmrpK3gAHh8BIgbLXPd4dbO/t3zPN/n4Ax9dyyerighsAAAAGYktHRAAAAAAAAPlDu38AAAAJcEhZcwAADdcAAA3XAUIom3gAAAAHdElNRQfmCBMVNw4TRw0nAAAA3UlEQVQ4y83SP04CURAG8I0lewHOwAFUaiwkdmAlp8CL4FHopfIvtOIJWE3opIBK489mQPKy6xYWOskkL9/MN/PNzMuyf2fIcYkZVuGzwPI68gle8Yl7jMIfAntBp4o8wAeecFgSP8I8cgZp8DwC12j8oLCBCd7R34ItbHCzT8ZZSC7QTYrcYo1WhjGWaCbdCt+2SGLN4IwPfnu07QjrkhG6oWKB0+TMd7sRAuzHYuqWmO8tsVd1xjmOS8htPEfORVWHTmweHnEVPg2sqPxIicxhFFjhLd7D2q/8J/YFHSJt9VSqQ08AAAAASUVORK5CYII=&style=flat-square&color=green)](https://github.com/PlazmaMC/Thunderbolt/watchers) + +
+ +[Plazma]: https://github.com/PlazmaMC/Plazma + +## :warning: Warning + +- Thunderbolt는 Plazma에 추가하기에는 아직 **너무 실험적인 패치를 테스트**하기 위한 하위 프로젝트 입니다. +- Plazma에 패치를 추가하기 전 먼저 실험하기 위한 공간으로, 공개 서버에서 **사용하기 매우 부적합**합니다. + - Thunderbolt는 패치 시스템이 어떻게 작동하는지 잘 이해하고 있는 사용자만 사용하는것을 권장합니다. + - Thunderbolt를 공개 서버에서 사용하는 것은 본인 재량이나, Thunderbolt를 사용함으로써 발생하는 **모든 문제에 대한 책임은 사용자에게** 있습니다. +- Thunderbolt에서는 매 업데이트마다 다음과 같은 문제가 발생할 수 있습니다. + - 게임 플레이가 기존 바닐라와 크게 달라질 수 있음. + - 기존 월드가 크게 손상될 수 있음. + - 플러그인이 정상적으로 동작하지 않을 수 있음. + - 서버가 예기치 못한 상황에 갑자기 충돌할 수 있음. + - 기타 예기치 못한 부분에서 심각한 오류가 발생할 수 있음. +- **안정적인 구현체를 사용하고 싶다면 대신 [Plazma]를 사용하십시오.** + +--- + +- Thunderbolt is a sub-project to test patches that are **still too experimental** to add to the Plazma. +- Space for experimentation before adding patches to Plazma, which is **highly unsuitable for use on public servers.** + - Thunderbolt is recommended only for users who understand how patch systems work. + - It is at your own discretion to use Thunderbolt on a public server, but **you are responsible for any problems caused by using Thunderbolt.** +- Thunderbolt can cause the following problems with each update. + - Gameplay may be significantly different from traditional vanilla. + - Existing worlds may be severely compromised. + - The plug-in may not work properly. + - Server may crash suddenly in unexpected situations. + - Severe errors may occur in other unexpected areas. +- **If you want to use a stable implementation, use [Plazma] instead.** + +--- + +## 💬 About Thunderbolt... + +- Thunderbolt is a sub-project to test patches that are still too experimental to add to the Plazma. +- It is divided into several Flavor, and you can download the Flavor you want and experiment with it yourself. + +## ❌ Thunderbolt's Restrictions + +- Only the most up-to-date version available from Plazma is always supported (whether it's a stable version or not) +- Each Flavor is not guaranteed stability and can be deleted suddenly. + +## 🎨 Flavors + +- Vanilla (Base Flavor) + - Implemented [Noisium](https://modrinth.com/mod/noisium) + +## ⚖️ License + +- This project and all patches are licensed under the [MIT license](LICENSE.md) unless otherwise noted in the patch headers. + +## 🌀 Sponsorship - Minecraft Development Dictionary (KOREAN) + +[![Minecraft Development Dictionary](https://img.shields.io/discord/911980670123905054?color=%239c91fd&label=MDD&logo=discord&style=for-the-badge&logoColor=ffffff)](https://discord.gg/AZwXTA9Pgx) +- 한글로 번역&정리된 Minecraft와 서드파티 버킷들의 소식들을 빠르게 만나볼 수 있습니다. +- Skript와 Plugin등 서버 개발과 관련된 질문에 대한 답변을 받으실 수 있습니다. diff --git a/base b/base new file mode 120000 index 0000000..36fee98 --- /dev/null +++ b/base @@ -0,0 +1 @@ +.gradle/caches/paperweight/upstreams/base \ No newline at end of file diff --git a/build.gradle.kts b/build.gradle.kts new file mode 100644 index 0000000..42d1e7d --- /dev/null +++ b/build.gradle.kts @@ -0,0 +1,243 @@ +import io.papermc.paperweight.patcher.tasks.CheckoutRepo +import io.papermc.paperweight.util.* +import org.gradle.api.tasks.testing.logging.TestExceptionFormat +import org.gradle.api.tasks.testing.logging.TestLogEvent +import paper.libs.com.google.gson.JsonObject + +plugins { + java + `kotlin-dsl` + `maven-publish` + id("com.github.johnrengelman.shadow") version "8.1.1" apply false + id("io.papermc.paperweight.patcher") version "1.7.1" +} + +repositories { + mavenCentral() + maven("https://papermc.io/repo/repository/maven-public/") { + content { onlyForConfigurations(configurations.paperclip.name) } + } +} + +val jdkVersion = property("jdkVersion").toString().toInt() +val projectName = property("projectName").toString() +val projectRepo = property("projectRepo").toString() +val upstreamCommitValue = property("baseCommit").toString() +val upstreamRef = "base" + +kotlin.jvmToolchain(jdkVersion) + +dependencies { + remapper("net.fabricmc:tiny-remapper:0.8.10:fat") + decompiler("org.vineflower:vineflower:1.10.1") + paperclip("io.papermc:paperclip:3.0.3") +} + +allprojects { + apply(plugin = "java") + apply(plugin = "maven-publish") + + java.toolchain.languageVersion.set(JavaLanguageVersion.of(jdkVersion)) + + publishing { + repositories.maven("https://maven.pkg.github.com/$projectRepo") { + name = "githubPackage" + + credentials { + username = System.getenv("GITHUB_USERNAME") + password = System.getenv("GITHUB_TOKEN") + } + } + } +} + +subprojects { + tasks { + withType().configureEach { + options.encoding = Charsets.UTF_8.name() + options.release = jdkVersion + options.compilerArgs.addAll(listOf( + "--add-modules=jdk.incubator.vector", + "-Xmaxwarns", "1" + )) + } + + withType { + options.encoding = Charsets.UTF_8.name() + } + + withType { + filteringCharset = Charsets.UTF_8.name() + } + + withType { + testLogging { + showStackTraces = true + exceptionFormat = TestExceptionFormat.FULL + events(TestLogEvent.STANDARD_OUT) + } + } + } + + repositories { + mavenCentral() + maven("https://papermc.io/repo/repository/maven-public/") + maven("https://jitpack.io") + } +} + +paperweight { + serverProject = project(":${projectName.lowercase()}-server") + + remapRepo = "https://papermc.io/repo/repository/maven-public/" + decompileRepo = "https://papermc.io/repo/repository/maven-public/" + + useStandardUpstream("base") { + url = github("PlazmaMC", "Thunderbolt") + ref = providers.gradleProperty("baseCommit") + + withStandardPatcher { + baseName("Thunderbolt") + + apiPatchDir = projectDir.resolve("patches/api") + apiOutputDir = projectDir.resolve("$projectName-API") + + serverPatchDir = projectDir.resolve("patches/server") + serverOutputDir = projectDir.resolve("$projectName-Server") + } + + patchTasks.register("generatedApi") { + isBareDirectory = true + upstreamDirPath = "paper-api-generator/generated" + patchDir = projectDir.resolve("patches/generated-api") + outputDir = projectDir.resolve("paper-api-generator/generated") + } + + patchTasks.register("versionCatalogs") { + isBareDirectory = true + upstreamDirPath = "libs" + patchDir = projectDir.resolve("patches/version-catalog") + outputDir = projectDir.resolve("libs") + } + } +} + +val github = "https://api.github.com/repos/PlazmaMC/Thunderbolt" + +tasks { + applyPatches { + dependsOn("applyVersionCatalogsPatches") + dependsOn("applyGeneratedApiPatches") + } + + rebuildPatches { + dependsOn("rebuildVersionCatalogsPatches") + dependsOn("rebuildGeneratedApiPatches") + } + + generateDevelopmentBundle { + apiCoordinates = "$group:$projectName-api" + libraryRepositories.set( + listOf( + "https://repo.maven.apache.org/maven2/", + "https://maven.pkg.github.com/$projectRepo", + "https://papermc.io/repo/repository/maven-public/" + ) + ) + } + + register("checkNeedsUpdate") { + var latest = "" + + doFirst { + val commit = layout.cache.resolve("commit.json") + download.get().download( + "$github/commits/$upstreamRef", + commit + ) + + latest = gson.fromJson(commit)["sha"].asString + } + + doLast { + println(latest != project.property("baseCommit")) + } + } + + register("updateUpstream") { + dependsOn(clean) + + val tempDir = layout.cacheDir("alwaysUpToDate") + val file = "gradle.properties" + val builder = StringBuilder() + + doFirst { + val commit = layout.cache.resolve("commit.json") + download.get().download( + "$github/commits/$upstreamRef", + commit + ) + + val latestCommit = gson.fromJson(commit)["sha"].asString + + val compare = layout.cache.resolve("compare.json") + download.get().download( + "$github/compare/$upstreamCommitValue...$upstreamRef", + compare + ) + + gson.fromJson(compare)["commits"].asJsonArray.forEach { + builder.append(it.asJsonObject["sha"].asString.subSequence(0, 7)) + builder.append(": ") + builder.append(it.asJsonObject["commit"].asJsonObject["message"].asString.split("\n")[0]) + builder.append("\n") + } + + copy { + from(file) + into(tempDir) + filter { + it.replace( + "baseCommit = .*".toRegex(), + "baseCommit = $latestCommit" + ) + } + } + } + + doLast { + copy { + from(tempDir.file("gradle.properties")) + into(project.file(file).parent) + } + + project.file("compare.txt").writeText(builder.toString()) + } + } + + clean { + doLast { + listOf( + ".gradle/caches", + "$projectName-API", + "$projectName-Server", + "paper-api-generator", + "run", + + // remove dev environment files + "0001-fixup.patch", + "compare.txt" + ).forEach { + projectDir.resolve(it).deleteRecursively() + } + } + } +} + +publishing { + publications.create("devBundle") { + artifact(tasks.generateDevelopmentBundle) { + artifactId = "dev-bundle" + } + } +} diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..50251b7 --- /dev/null +++ b/gradle.properties @@ -0,0 +1,18 @@ +org.gradle.deamon = true +org.gradle.caching = true +org.gradle.parallel = true +org.gradle.vfs.watch = false +org.gradle.jvmargs = -Xmx4G -Dfile.encoding=UTF-8 -Dgraal.CompilerConfiguration=community -Dgraal.UsePriorityInlining=true -Dgraal.Vectorization=true -Dgraal.OptDuplication=true -Dgraal.SpeculativeGuardMovement=true -Dgraal.WriteableCodeCache=true + +paper.runMemoryGb = 8 +paper.runDisableWatchdog = true + +group = org.plazmamc.thunderbolt +projectName = Thunderbolt +projectRepo = PlazmaMC/Thunderbolt + +version = 1.20.6-R0.1-SNAPSHOT +mcVersion = 1.20.6 +jdkVersion = 21 + +baseCommit = 3d028d017fdf78380ecad06c79fe4e7112ed849e diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..e6441136f3d4ba8a0da8d277868979cfbc8ad796 GIT binary patch literal 43453 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 yu?e%!_ptzGB|8GrCfu%p?(_ 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
NnX)EH+Nua)3Y(c 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 '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..7101f8e --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,92 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/initDev b/initDev new file mode 100644 index 0000000..11a77c5 --- /dev/null +++ b/initDev @@ -0,0 +1,52 @@ +# To initialize your development environment, +# run below command in your terminal: +# source ./initDev + +export PROJECT_DIR=$(pwd) + +alias api="cd $PROJECT_DIR/*-API" +alias srv="cd $PROJECT_DIR/*-Server" + +alias ap="./gradlew --no-rebuild applyPatches" +alias aap="./gradlew --no-rebuild applyAPIPatches" +alias agp="./gradlew --no-rebuild applyGeneratedAPIPatches" +alias asp="./gradlew --no-rebuild applyServerPatches" + +alias rp="./gradlew --no-rebuild rebuildPatches" +alias rap="./gradlew --no-rebuild rebuildAPIPatches" +alias rgp="./gradlew --no-rebuild rebuildGeneratedAPIPatches" +alias rsp="./gradlew --no-rebuild rebuildServerPatches" + +alias lg="git log --oneline base..HEAD" +alias rc="git rebase --autosquash -i base" +alias rcc="git rebase --continue" + +# generate Fixup patches for Server +function fs() { + cd *-Server + + git add . + git commit -m "fixup" + git format-patch -1 + mv 0001-fixup.patch ../ + + cd ../ +} + +# generate Fixup patches for API +function fa() { + cd *-API + + git add . + git commit -m "fixup" + git format-patch -1 + mv 0001-fixup.patch ../ + + cd ../ +} + +# ReApply Server Patches +function rasp() { + rm -rf *-Server + ./gradlew applyServerPatches +} diff --git a/patches/api/0001-Remove-remaining-timings-implementations.patch b/patches/api/0001-Remove-remaining-timings-implementations.patch new file mode 100644 index 0000000..8a9e3e8 --- /dev/null +++ b/patches/api/0001-Remove-remaining-timings-implementations.patch @@ -0,0 +1,2100 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: AlphaKR93 +Date: Wed, 15 May 2024 12:43:03 +0900 +Subject: [PATCH] Remove remaining timings implementations + + +diff --git a/src/main/java/co/aikar/timings/FullServerTickHandler.java b/src/main/java/co/aikar/timings/FullServerTickHandler.java +deleted file mode 100644 +index 36b8fe86335df851f9c85d6bb2a91368b4d945d1..0000000000000000000000000000000000000000 +--- a/src/main/java/co/aikar/timings/FullServerTickHandler.java ++++ /dev/null +@@ -1,86 +0,0 @@ +-package co.aikar.timings; +- +-import static co.aikar.timings.TimingsManager.*; +- +-import org.bukkit.Bukkit; +-import org.jetbrains.annotations.NotNull; +- +-@Deprecated(forRemoval = true) +-public class FullServerTickHandler extends TimingHandler { +- private static final TimingIdentifier IDENTITY = new TimingIdentifier("Minecraft", "Full Server Tick", null); +- final TimingData minuteData; +- double avgFreeMemory = -1D; +- double avgUsedMemory = -1D; +- FullServerTickHandler() { +- super(IDENTITY); +- minuteData = new TimingData(id); +- +- TIMING_MAP.put(IDENTITY, this); +- } +- +- @NotNull +- @Override +- public Timing startTiming() { +- if (TimingsManager.needsFullReset) { +- TimingsManager.resetTimings(); +- } else if (TimingsManager.needsRecheckEnabled) { +- TimingsManager.recheckEnabled(); +- } +- return super.startTiming(); +- } +- +- @Override +- public void stopTiming() { +- super.stopTiming(); +- if (!isEnabled()) { +- return; +- } +- if (TimingHistory.timedTicks % 20 == 0) { +- final Runtime runtime = Runtime.getRuntime(); +- double usedMemory = runtime.totalMemory() - runtime.freeMemory(); +- double freeMemory = runtime.maxMemory() - usedMemory; +- if (this.avgFreeMemory == -1) { +- this.avgFreeMemory = freeMemory; +- } else { +- this.avgFreeMemory = (this.avgFreeMemory * (59 / 60D)) + (freeMemory * (1 / 60D)); +- } +- +- if (this.avgUsedMemory == -1) { +- this.avgUsedMemory = usedMemory; +- } else { +- this.avgUsedMemory = (this.avgUsedMemory * (59 / 60D)) + (usedMemory * (1 / 60D)); +- } +- } +- +- long start = System.nanoTime(); +- TimingsManager.tick(); +- long diff = System.nanoTime() - start; +- TIMINGS_TICK.addDiff(diff, null); +- // addDiff for TIMINGS_TICK incremented this, bring it back down to 1 per tick. +- record.setCurTickCount(record.getCurTickCount()-1); +- +- minuteData.setCurTickTotal(record.getCurTickTotal()); +- minuteData.setCurTickCount(1); +- +- boolean violated = isViolated(); +- minuteData.processTick(violated); +- TIMINGS_TICK.processTick(violated); +- processTick(violated); +- +- +- if (TimingHistory.timedTicks % 1200 == 0) { +- MINUTE_REPORTS.add(new TimingHistory.MinuteReport()); +- TimingHistory.resetTicks(false); +- minuteData.reset(); +- } +- if (TimingHistory.timedTicks % Timings.getHistoryInterval() == 0) { +- TimingsManager.HISTORY.add(new TimingHistory()); +- TimingsManager.resetTimings(); +- } +- Bukkit.getUnsafe().reportTimings(); +- } +- +- boolean isViolated() { +- return record.getCurTickTotal() > 50000000; +- } +-} +diff --git a/src/main/java/co/aikar/timings/NullTimingHandler.java b/src/main/java/co/aikar/timings/NullTimingHandler.java +deleted file mode 100644 +index 81671cf40feeed2844ee8d92348d48062aaf2c46..0000000000000000000000000000000000000000 +--- a/src/main/java/co/aikar/timings/NullTimingHandler.java ++++ /dev/null +@@ -1,69 +0,0 @@ +-/* +- * This file is licensed under the MIT License (MIT). +- * +- * Copyright (c) 2014 Daniel Ennis +- * +- * Permission is hereby granted, free of charge, to any person obtaining a copy +- * of this software and associated documentation files (the "Software"), to deal +- * in the Software without restriction, including without limitation the rights +- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +- * copies of the Software, and to permit persons to whom the Software is +- * furnished to do so, subject to the following conditions: +- * +- * The above copyright notice and this permission notice shall be included in +- * all copies or substantial portions of the Software. +- * +- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +- * THE SOFTWARE. +- */ +-package co.aikar.timings; +- +-import org.jetbrains.annotations.NotNull; +-import org.jetbrains.annotations.Nullable; +- +-@Deprecated(forRemoval = true) +-public final class NullTimingHandler implements Timing { +- public static final Timing NULL = new NullTimingHandler(); +- @NotNull +- @Override +- public Timing startTiming() { +- return this; +- } +- +- @Override +- public void stopTiming() { +- +- } +- +- @NotNull +- @Override +- public Timing startTimingIfSync() { +- return this; +- } +- +- @Override +- public void stopTimingIfSync() { +- +- } +- +- @Override +- public void abort() { +- +- } +- +- @Nullable +- @Override +- public TimingHandler getTimingHandler() { +- return null; +- } +- +- @Override +- public void close() { +- +- } +-} +diff --git a/src/main/java/co/aikar/timings/TimedEventExecutor.java b/src/main/java/co/aikar/timings/TimedEventExecutor.java +deleted file mode 100644 +index 6fbc64e0f214d0c8e5afcbe385e414a4e1fe1c72..0000000000000000000000000000000000000000 +--- a/src/main/java/co/aikar/timings/TimedEventExecutor.java ++++ /dev/null +@@ -1,90 +0,0 @@ +-/* +- * This file is licensed under the MIT License (MIT). +- * +- * Copyright (c) 2014 Daniel Ennis +- * +- * Permission is hereby granted, free of charge, to any person obtaining a copy +- * of this software and associated documentation files (the "Software"), to deal +- * in the Software without restriction, including without limitation the rights +- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +- * copies of the Software, and to permit persons to whom the Software is +- * furnished to do so, subject to the following conditions: +- * +- * The above copyright notice and this permission notice shall be included in +- * all copies or substantial portions of the Software. +- * +- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +- * THE SOFTWARE. +- */ +-package co.aikar.timings; +- +-import org.bukkit.Bukkit; +-import org.bukkit.event.Event; +-import org.bukkit.event.EventException; +-import org.bukkit.event.Listener; +-import org.bukkit.plugin.EventExecutor; +-import org.bukkit.plugin.Plugin; +- +-import java.lang.reflect.Method; +-import org.jetbrains.annotations.NotNull; +-import org.jetbrains.annotations.Nullable; +- +-@Deprecated(forRemoval = true) +-public class TimedEventExecutor implements EventExecutor { +- +- private final EventExecutor executor; +- private final Timing timings; +- +- /** +- * Wraps an event executor and associates a timing handler to it. +- * +- * @param executor Executor to wrap +- * @param plugin Owning plugin +- * @param method EventHandler method +- * @param eventClass Owning class +- */ +- public TimedEventExecutor(@NotNull EventExecutor executor, @NotNull Plugin plugin, @Nullable Method method, @NotNull Class eventClass) { +- this.executor = executor; +- String id; +- +- if (method == null) { +- if (executor.getClass().getEnclosingClass() != null) { // Oh Skript, how we love you +- method = executor.getClass().getEnclosingMethod(); +- } +- } +- +- if (method != null) { +- id = method.getDeclaringClass().getName(); +- } else { +- id = executor.getClass().getName(); +- } +- +- +- final String eventName = eventClass.getSimpleName(); +- boolean verbose = "BlockPhysicsEvent".equals(eventName); +- this.timings = Timings.ofSafe(plugin, (verbose ? "## " : "") + +- "Event: " + id + " (" + eventName + ")"); +- } +- +- @Override +- public void execute(@NotNull Listener listener, @NotNull Event event) throws EventException { +- if (event.isAsynchronous() || !Timings.timingsEnabled || !Bukkit.isPrimaryThread()) { +- executor.execute(listener, event); +- return; +- } +- //try (Timing ignored = timings.startTiming()){ // Purpur +- executor.execute(listener, event); +- //} // Purpur +- } +- +- @Override +- @NotNull +- public String toString() { +- return "TimedEventExecutor['" + this.executor.toString() + "']"; +- } +-} +diff --git a/src/main/java/co/aikar/timings/Timing.java b/src/main/java/co/aikar/timings/Timing.java +index 1d866e980abc542bdfee1ce082cd9cdd7761e9f7..e6b4d724f2a4540fbd59c36a5fe9526ab214df68 100644 +--- a/src/main/java/co/aikar/timings/Timing.java ++++ b/src/main/java/co/aikar/timings/Timing.java +@@ -39,6 +39,7 @@ public interface Timing extends AutoCloseable { + * @return Timing + */ + @NotNull ++ @Deprecated(forRemoval = true) // Thunderbolt - Remove remaining timings implementations + @io.papermc.paper.annotation.DoNotUse // Purpur + Timing startTiming(); + +@@ -47,6 +48,7 @@ public interface Timing extends AutoCloseable { + * + * Will automatically be called when this Timing is used with try-with-resources + */ ++ @Deprecated(forRemoval = true) // Thunderbolt - Remove remaining timings implementations + @io.papermc.paper.annotation.DoNotUse // Purpur + void stopTiming(); + +@@ -58,6 +60,7 @@ public interface Timing extends AutoCloseable { + * @return Timing + */ + @NotNull ++ @Deprecated(forRemoval = true) // Thunderbolt - Remove remaining timings implementations + @io.papermc.paper.annotation.DoNotUse // Purpur + Timing startTimingIfSync(); + +@@ -68,13 +71,14 @@ public interface Timing extends AutoCloseable { + * + * But only if we are on the primary thread. + */ ++ @Deprecated(forRemoval = true) // Thunderbolt - Remove remaining timings implementations + @io.papermc.paper.annotation.DoNotUse // Purpur + void stopTimingIfSync(); + + /** + * @deprecated Doesn't do anything - Removed + */ +- @Deprecated ++ @Deprecated(forRemoval = true) // Thunderbolt - Remove remaining timings implementations + @io.papermc.paper.annotation.DoNotUse // Purpur + void abort(); + +@@ -84,9 +88,11 @@ public interface Timing extends AutoCloseable { + * @return TimingHandler + */ + @Nullable +- TimingHandler getTimingHandler(); ++ @Deprecated(forRemoval = true) @io.papermc.paper.annotation.DoNotUse // Thunderbolt - Remove remaining timings implementations ++ Object getTimingHandler(); // Thunderbolt - Remove remaining timings implementations + + @Override ++ @Deprecated(forRemoval = true) // Thunderbolt - Remove remaining timings implementations + @io.papermc.paper.annotation.DoNotUse // Purpur + void close(); + } +diff --git a/src/main/java/co/aikar/timings/TimingData.java b/src/main/java/co/aikar/timings/TimingData.java +deleted file mode 100644 +index a5d13a1e44edb861f45c83a9b4309fbf799d407d..0000000000000000000000000000000000000000 +--- a/src/main/java/co/aikar/timings/TimingData.java ++++ /dev/null +@@ -1,122 +0,0 @@ +-/* +- * This file is licensed under the MIT License (MIT). +- * +- * Copyright (c) 2014 Daniel Ennis +- * +- * Permission is hereby granted, free of charge, to any person obtaining a copy +- * of this software and associated documentation files (the "Software"), to deal +- * in the Software without restriction, including without limitation the rights +- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +- * copies of the Software, and to permit persons to whom the Software is +- * furnished to do so, subject to the following conditions: +- * +- * The above copyright notice and this permission notice shall be included in +- * all copies or substantial portions of the Software. +- * +- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +- * THE SOFTWARE. +- */ +-package co.aikar.timings; +- +-import java.util.List; +-import org.jetbrains.annotations.NotNull; +- +-import static co.aikar.util.JSONUtil.toArray; +- +-/** +- *

Lightweight object for tracking timing data

+- * +- * This is broken out to reduce memory usage +- */ +-class TimingData { +- private final int id; +- private int count = 0; +- private int lagCount = 0; +- private long totalTime = 0; +- private long lagTotalTime = 0; +- private int curTickCount = 0; +- private long curTickTotal = 0; +- +- TimingData(int id) { +- this.id = id; +- } +- +- private TimingData(TimingData data) { +- this.id = data.id; +- this.totalTime = data.totalTime; +- this.lagTotalTime = data.lagTotalTime; +- this.count = data.count; +- this.lagCount = data.lagCount; +- } +- +- void add(long diff) { +- ++curTickCount; +- curTickTotal += diff; +- } +- +- void processTick(boolean violated) { +- totalTime += curTickTotal; +- count += curTickCount; +- if (violated) { +- lagTotalTime += curTickTotal; +- lagCount += curTickCount; +- } +- curTickTotal = 0; +- curTickCount = 0; +- } +- +- void reset() { +- count = 0; +- lagCount = 0; +- curTickTotal = 0; +- curTickCount = 0; +- totalTime = 0; +- lagTotalTime = 0; +- } +- +- protected TimingData clone() { +- return new TimingData(this); +- } +- +- @NotNull +- List export() { +- List list = toArray( +- id, +- count, +- totalTime); +- if (lagCount > 0) { +- list.add(lagCount); +- list.add(lagTotalTime); +- } +- return list; +- } +- +- boolean hasData() { +- return count > 0; +- } +- +- long getTotalTime() { +- return totalTime; +- } +- +- int getCurTickCount() { +- return curTickCount; +- } +- +- void setCurTickCount(int curTickCount) { +- this.curTickCount = curTickCount; +- } +- +- long getCurTickTotal() { +- return curTickTotal; +- } +- +- void setCurTickTotal(long curTickTotal) { +- this.curTickTotal = curTickTotal; +- } +-} +diff --git a/src/main/java/co/aikar/timings/TimingHandler.java b/src/main/java/co/aikar/timings/TimingHandler.java +deleted file mode 100644 +index 199789d56d22fcb1b77ebd56805cc28aa5a5ab0a..0000000000000000000000000000000000000000 +--- a/src/main/java/co/aikar/timings/TimingHandler.java ++++ /dev/null +@@ -1,226 +0,0 @@ +-/* +- * This file is licensed under the MIT License (MIT). +- * +- * Copyright (c) 2014 Daniel Ennis +- * +- * Permission is hereby granted, free of charge, to any person obtaining a copy +- * of this software and associated documentation files (the "Software"), to deal +- * in the Software without restriction, including without limitation the rights +- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +- * copies of the Software, and to permit persons to whom the Software is +- * furnished to do so, subject to the following conditions: +- * +- * The above copyright notice and this permission notice shall be included in +- * all copies or substantial portions of the Software. +- * +- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +- * THE SOFTWARE. +- */ +-package co.aikar.timings; +- +-import co.aikar.util.LoadingIntMap; +-import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap; +- +-import java.util.ArrayDeque; +-import java.util.Deque; +-import java.util.concurrent.atomic.AtomicInteger; +-import java.util.logging.Level; +-import java.util.logging.Logger; +- +-import org.bukkit.Bukkit; +-import org.jetbrains.annotations.NotNull; +-import org.jetbrains.annotations.Nullable; +- +-class TimingHandler implements Timing { +- +- private static AtomicInteger idPool = new AtomicInteger(1); +- private static Deque TIMING_STACK = new ArrayDeque<>(); +- final int id = idPool.getAndIncrement(); +- +- final TimingIdentifier identifier; +- private final boolean verbose; +- +- private final Int2ObjectOpenHashMap children = new LoadingIntMap<>(TimingData::new); +- +- final TimingData record; +- private TimingHandler startParent; +- private final TimingHandler groupHandler; +- +- private long start = 0; +- private int timingDepth = 0; +- private boolean added; +- private boolean timed; +- private boolean enabled; +- +- TimingHandler(@NotNull TimingIdentifier id) { +- this.identifier = id; +- this.verbose = id.name.startsWith("##"); +- this.record = new TimingData(this.id); +- this.groupHandler = id.groupHandler; +- +- TimingIdentifier.getGroup(id.group).handlers.add(this); +- checkEnabled(); +- } +- +- final void checkEnabled() { +- enabled = Timings.timingsEnabled && (!verbose || Timings.verboseEnabled); +- } +- +- void processTick(boolean violated) { +- if (timingDepth != 0 || record.getCurTickCount() == 0) { +- timingDepth = 0; +- start = 0; +- return; +- } +- +- record.processTick(violated); +- for (TimingData handler : children.values()) { +- handler.processTick(violated); +- } +- } +- +- @NotNull +- @Override +- public Timing startTimingIfSync() { +- startTiming(); +- return this; +- } +- +- @Override +- public void stopTimingIfSync() { +- stopTiming(); +- } +- +- @NotNull +- public Timing startTiming() { +- if (!enabled || !Bukkit.isPrimaryThread()) { +- return this; +- } +- if (++timingDepth == 1) { +- startParent = TIMING_STACK.peekLast(); +- start = System.nanoTime(); +- } +- TIMING_STACK.addLast(this); +- return this; +- } +- +- public void stopTiming() { +- if (!enabled || timingDepth <= 0 || start == 0 || !Bukkit.isPrimaryThread()) { +- return; +- } +- +- popTimingStack(); +- if (--timingDepth == 0) { +- addDiff(System.nanoTime() - start, startParent); +- startParent = null; +- start = 0; +- } +- } +- +- private void popTimingStack() { +- TimingHandler last; +- while ((last = TIMING_STACK.removeLast()) != this) { +- last.timingDepth = 0; +- if ("Minecraft".equalsIgnoreCase(last.identifier.group)) { +- Logger.getGlobal().log(Level.SEVERE, "TIMING_STACK_CORRUPTION - Look above this for any errors and report this to Paper unless it has a plugin in the stack trace (" + last.identifier + " did not stopTiming)"); +- } else { +- Logger.getGlobal().log(Level.SEVERE, "TIMING_STACK_CORRUPTION - Report this to the plugin " + last.identifier.group + " (Look for errors above this in the logs) (" + last.identifier + " did not stopTiming)", new Throwable()); +- } +- +- boolean found = TIMING_STACK.contains(this); +- if (!found) { +- // We aren't even in the stack... Don't pop everything +- TIMING_STACK.addLast(last); +- break; +- } +- } +- } +- +- @Override +- public final void abort() { +- +- } +- +- void addDiff(long diff, @Nullable TimingHandler parent) { +- if (parent != null) { +- parent.children.get(id).add(diff); +- } +- +- record.add(diff); +- if (!added) { +- added = true; +- timed = true; +- TimingsManager.HANDLERS.add(this); +- } +- if (groupHandler != null) { +- groupHandler.addDiff(diff, parent); +- groupHandler.children.get(id).add(diff); +- } +- } +- +- /** +- * Reset this timer, setting all values to zero. +- */ +- void reset(boolean full) { +- record.reset(); +- if (full) { +- timed = false; +- } +- start = 0; +- timingDepth = 0; +- added = false; +- children.clear(); +- checkEnabled(); +- } +- +- @NotNull +- @Override +- public TimingHandler getTimingHandler() { +- return this; +- } +- +- @Override +- public boolean equals(Object o) { +- return (this == o); +- } +- +- @Override +- public int hashCode() { +- return id; +- } +- +- /** +- * This is simply for the Closeable interface so it can be used with try-with-resources () +- */ +- @Override +- public void close() { +- stopTimingIfSync(); +- } +- +- public boolean isSpecial() { +- return this == TimingsManager.FULL_SERVER_TICK || this == TimingsManager.TIMINGS_TICK; +- } +- +- boolean isTimed() { +- return timed; +- } +- +- public boolean isEnabled() { +- return enabled; +- } +- +- @NotNull +- TimingData[] cloneChildren() { +- final TimingData[] clonedChildren = new TimingData[children.size()]; +- int i = 0; +- for (TimingData child : children.values()) { +- clonedChildren[i++] = child.clone(); +- } +- return clonedChildren; +- } +-} +diff --git a/src/main/java/co/aikar/timings/TimingHistory.java b/src/main/java/co/aikar/timings/TimingHistory.java +deleted file mode 100644 +index 02e88db63be2d5e31da6b65157ba7b971b1f10f3..0000000000000000000000000000000000000000 +--- a/src/main/java/co/aikar/timings/TimingHistory.java ++++ /dev/null +@@ -1,355 +0,0 @@ +-/* +- * This file is licensed under the MIT License (MIT). +- * +- * Copyright (c) 2014 Daniel Ennis +- * +- * Permission is hereby granted, free of charge, to any person obtaining a copy +- * of this software and associated documentation files (the "Software"), to deal +- * in the Software without restriction, including without limitation the rights +- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +- * copies of the Software, and to permit persons to whom the Software is +- * furnished to do so, subject to the following conditions: +- * +- * The above copyright notice and this permission notice shall be included in +- * all copies or substantial portions of the Software. +- * +- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +- * THE SOFTWARE. +- */ +-package co.aikar.timings; +- +-import co.aikar.timings.TimingHistory.RegionData.RegionId; +-import com.google.common.base.Function; +-import com.google.common.collect.Sets; +-import org.bukkit.Bukkit; +-import org.bukkit.Chunk; +-import org.bukkit.Material; +-import org.bukkit.World; +-import org.bukkit.block.BlockState; +-import org.bukkit.entity.Entity; +-import org.bukkit.entity.EntityType; +-import org.bukkit.entity.Player; +-import co.aikar.util.LoadingMap; +-import co.aikar.util.MRUMapCache; +- +-import java.lang.management.ManagementFactory; +-import java.util.Collection; +-import java.util.EnumMap; +-import java.util.List; +-import java.util.Map; +-import java.util.Set; +-import org.jetbrains.annotations.NotNull; +-import org.jetbrains.annotations.Nullable; +- +-import static co.aikar.timings.TimingsManager.FULL_SERVER_TICK; +-import static co.aikar.timings.TimingsManager.MINUTE_REPORTS; +-import static co.aikar.util.JSONUtil.*; +- +-@Deprecated(forRemoval = true) +-@SuppressWarnings({"deprecation", "SuppressionAnnotation", "Convert2Lambda", "Anonymous2MethodRef"}) +-public class TimingHistory { +- public static long lastMinuteTime; +- public static long timedTicks; +- public static long playerTicks; +- public static long entityTicks; +- public static long tileEntityTicks; +- public static long activatedEntityTicks; +- private static int worldIdPool = 1; +- static Map worldMap = LoadingMap.newHashMap(new Function() { +- @NotNull +- @Override +- public Integer apply(@Nullable String input) { +- return worldIdPool++; +- } +- }); +- private final long endTime; +- private final long startTime; +- private final long totalTicks; +- private final long totalTime; // Represents all time spent running the server this history +- private final MinuteReport[] minuteReports; +- +- private final TimingHistoryEntry[] entries; +- final Set tileEntityTypeSet = Sets.newHashSet(); +- final Set entityTypeSet = Sets.newHashSet(); +- private final Map worlds; +- +- TimingHistory() { +- this.endTime = System.currentTimeMillis() / 1000; +- this.startTime = TimingsManager.historyStart / 1000; +- if (timedTicks % 1200 != 0 || MINUTE_REPORTS.isEmpty()) { +- this.minuteReports = MINUTE_REPORTS.toArray(new MinuteReport[MINUTE_REPORTS.size() + 1]); +- this.minuteReports[this.minuteReports.length - 1] = new MinuteReport(); +- } else { +- this.minuteReports = MINUTE_REPORTS.toArray(new MinuteReport[MINUTE_REPORTS.size()]); +- } +- long ticks = 0; +- for (MinuteReport mp : this.minuteReports) { +- ticks += mp.ticksRecord.timed; +- } +- this.totalTicks = ticks; +- this.totalTime = FULL_SERVER_TICK.record.getTotalTime(); +- this.entries = new TimingHistoryEntry[TimingsManager.HANDLERS.size()]; +- +- int i = 0; +- for (TimingHandler handler : TimingsManager.HANDLERS) { +- entries[i++] = new TimingHistoryEntry(handler); +- } +- +- // Information about all loaded chunks/entities +- //noinspection unchecked +- this.worlds = toObjectMapper(Bukkit.getWorlds(), new Function() { +- @NotNull +- @Override +- public JSONPair apply(World world) { +- Map regions = LoadingMap.newHashMap(RegionData.LOADER); +- +- for (Chunk chunk : world.getLoadedChunks()) { +- RegionData data = regions.get(new RegionId(chunk.getX(), chunk.getZ())); +- +- for (Entity entity : chunk.getEntities()) { +- if (entity == null) { +- Bukkit.getLogger().warning("Null entity detected in chunk at position x: " + chunk.getX() + ", z: " + chunk.getZ()); +- continue; +- } +- +- data.entityCounts.get(entity.getType()).increment(); +- } +- +- for (BlockState tileEntity : chunk.getTileEntities(false)) { +- if (tileEntity == null) { +- Bukkit.getLogger().warning("Null tileentity detected in chunk at position x: " + chunk.getX() + ", z: " + chunk.getZ()); +- continue; +- } +- +- data.tileEntityCounts.get(tileEntity.getBlock().getType()).increment(); +- } +- } +- return pair( +- worldMap.get(world.getName()), +- toArrayMapper(regions.values(),new Function() { +- @NotNull +- @Override +- public Object apply(RegionData input) { +- return toArray( +- input.regionId.x, +- input.regionId.z, +- toObjectMapper(input.entityCounts.entrySet(), +- new Function, JSONPair>() { +- @NotNull +- @Override +- public JSONPair apply(Map.Entry entry) { +- entityTypeSet.add(entry.getKey()); +- return pair( +- String.valueOf(entry.getKey().ordinal()), +- entry.getValue().count() +- ); +- } +- } +- ), +- toObjectMapper(input.tileEntityCounts.entrySet(), +- new Function, JSONPair>() { +- @NotNull +- @Override +- public JSONPair apply(Map.Entry entry) { +- tileEntityTypeSet.add(entry.getKey()); +- return pair( +- String.valueOf(entry.getKey().ordinal()), +- entry.getValue().count() +- ); +- } +- } +- ) +- ); +- } +- }) +- ); +- } +- }); +- } +- static class RegionData { +- final RegionId regionId; +- @SuppressWarnings("Guava") +- static Function LOADER = new Function() { +- @NotNull +- @Override +- public RegionData apply(@NotNull RegionId id) { +- return new RegionData(id); +- } +- }; +- RegionData(@NotNull RegionId id) { +- this.regionId = id; +- } +- +- @Override +- public boolean equals(Object o) { +- if (this == o) { +- return true; +- } +- if (o == null || getClass() != o.getClass()) { +- return false; +- } +- +- RegionData that = (RegionData) o; +- +- return regionId.equals(that.regionId); +- +- } +- +- @Override +- public int hashCode() { +- return regionId.hashCode(); +- } +- +- @SuppressWarnings("unchecked") +- final Map entityCounts = MRUMapCache.of(LoadingMap.of( +- new EnumMap(EntityType.class), k -> new Counter() +- )); +- @SuppressWarnings("unchecked") +- final Map tileEntityCounts = MRUMapCache.of(LoadingMap.of( +- new EnumMap(Material.class), k -> new Counter() +- )); +- +- static class RegionId { +- final int x, z; +- final long regionId; +- RegionId(int x, int z) { +- this.x = x >> 5 << 5; +- this.z = z >> 5 << 5; +- this.regionId = ((long) (this.x) << 32) + (this.z >> 5 << 5) - Integer.MIN_VALUE; +- } +- +- @Override +- public boolean equals(Object o) { +- if (this == o) return true; +- if (o == null || getClass() != o.getClass()) return false; +- +- RegionId regionId1 = (RegionId) o; +- +- return regionId == regionId1.regionId; +- +- } +- +- @Override +- public int hashCode() { +- return (int) (regionId ^ (regionId >>> 32)); +- } +- } +- } +- static void resetTicks(boolean fullReset) { +- if (fullReset) { +- // Non full is simply for 1 minute reports +- timedTicks = 0; +- } +- lastMinuteTime = System.nanoTime(); +- playerTicks = 0; +- tileEntityTicks = 0; +- entityTicks = 0; +- activatedEntityTicks = 0; +- } +- +- @NotNull +- Object export() { +- return createObject( +- pair("s", startTime), +- pair("e", endTime), +- pair("tk", totalTicks), +- pair("tm", totalTime), +- pair("w", worlds), +- pair("h", toArrayMapper(entries, new Function() { +- @Nullable +- @Override +- public Object apply(TimingHistoryEntry entry) { +- TimingData record = entry.data; +- if (!record.hasData()) { +- return null; +- } +- return entry.export(); +- } +- })), +- pair("mp", toArrayMapper(minuteReports, new Function() { +- @NotNull +- @Override +- public Object apply(MinuteReport input) { +- return input.export(); +- } +- })) +- ); +- } +- +- static class MinuteReport { +- final long time = System.currentTimeMillis() / 1000; +- +- final TicksRecord ticksRecord = new TicksRecord(); +- final PingRecord pingRecord = new PingRecord(); +- final TimingData fst = TimingsManager.FULL_SERVER_TICK.minuteData.clone(); +- final double tps = 1E9 / ( System.nanoTime() - lastMinuteTime ) * ticksRecord.timed; +- final double usedMemory = TimingsManager.FULL_SERVER_TICK.avgUsedMemory; +- final double freeMemory = TimingsManager.FULL_SERVER_TICK.avgFreeMemory; +- final double loadAvg = ManagementFactory.getOperatingSystemMXBean().getSystemLoadAverage(); +- +- @NotNull +- List export() { +- return toArray( +- time, +- Math.round(tps * 100D) / 100D, +- Math.round(pingRecord.avg * 100D) / 100D, +- fst.export(), +- toArray(ticksRecord.timed, +- ticksRecord.player, +- ticksRecord.entity, +- ticksRecord.activatedEntity, +- ticksRecord.tileEntity +- ), +- usedMemory, +- freeMemory, +- loadAvg +- ); +- } +- } +- +- private static class TicksRecord { +- final long timed; +- final long player; +- final long entity; +- final long tileEntity; +- final long activatedEntity; +- +- TicksRecord() { +- timed = timedTicks - (TimingsManager.MINUTE_REPORTS.size() * 1200); +- player = playerTicks; +- entity = entityTicks; +- tileEntity = tileEntityTicks; +- activatedEntity = activatedEntityTicks; +- } +- +- } +- +- private static class PingRecord { +- final double avg; +- +- PingRecord() { +- final Collection onlinePlayers = Bukkit.getOnlinePlayers(); +- int totalPing = 0; +- for (Player player : onlinePlayers) { +- totalPing += player.spigot().getPing(); +- } +- avg = onlinePlayers.isEmpty() ? 0 : totalPing / onlinePlayers.size(); +- } +- } +- +- +- private static class Counter { +- private int count = 0; +- public int increment() { +- return ++count; +- } +- public int count() { +- return count; +- } +- } +-} +diff --git a/src/main/java/co/aikar/timings/TimingHistoryEntry.java b/src/main/java/co/aikar/timings/TimingHistoryEntry.java +deleted file mode 100644 +index 86d5ac6bd0d7d0003688761aceb3f3343575319f..0000000000000000000000000000000000000000 +--- a/src/main/java/co/aikar/timings/TimingHistoryEntry.java ++++ /dev/null +@@ -1,58 +0,0 @@ +-/* +- * This file is licensed under the MIT License (MIT). +- * +- * Copyright (c) 2014 Daniel Ennis +- * +- * Permission is hereby granted, free of charge, to any person obtaining a copy +- * of this software and associated documentation files (the "Software"), to deal +- * in the Software without restriction, including without limitation the rights +- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +- * copies of the Software, and to permit persons to whom the Software is +- * furnished to do so, subject to the following conditions: +- * +- * The above copyright notice and this permission notice shall be included in +- * all copies or substantial portions of the Software. +- * +- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +- * THE SOFTWARE. +- */ +-package co.aikar.timings; +- +-import com.google.common.base.Function; +- +-import java.util.List; +-import org.jetbrains.annotations.NotNull; +- +-import static co.aikar.util.JSONUtil.toArrayMapper; +- +-class TimingHistoryEntry { +- final TimingData data; +- private final TimingData[] children; +- +- TimingHistoryEntry(@NotNull TimingHandler handler) { +- this.data = handler.record.clone(); +- children = handler.cloneChildren(); +- } +- +- @NotNull +- List export() { +- List result = data.export(); +- if (children.length > 0) { +- result.add( +- toArrayMapper(children, new Function() { +- @NotNull +- @Override +- public Object apply(TimingData child) { +- return child.export(); +- } +- }) +- ); +- } +- return result; +- } +-} +diff --git a/src/main/java/co/aikar/timings/TimingIdentifier.java b/src/main/java/co/aikar/timings/TimingIdentifier.java +deleted file mode 100644 +index df142a89b8c43acb81eb383eac0ef048a1f49a6e..0000000000000000000000000000000000000000 +--- a/src/main/java/co/aikar/timings/TimingIdentifier.java ++++ /dev/null +@@ -1,116 +0,0 @@ +-/* +- * This file is licensed under the MIT License (MIT). +- * +- * Copyright (c) 2014 Daniel Ennis +- * +- * Permission is hereby granted, free of charge, to any person obtaining a copy +- * of this software and associated documentation files (the "Software"), to deal +- * in the Software without restriction, including without limitation the rights +- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +- * copies of the Software, and to permit persons to whom the Software is +- * furnished to do so, subject to the following conditions: +- * +- * The above copyright notice and this permission notice shall be included in +- * all copies or substantial portions of the Software. +- * +- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +- * THE SOFTWARE. +- */ +-package co.aikar.timings; +- +-import co.aikar.util.LoadingMap; +- +-import java.util.ArrayList; +-import java.util.Collections; +-import java.util.List; +-import java.util.Map; +-import java.util.Objects; +-import java.util.concurrent.ConcurrentHashMap; +-import java.util.concurrent.atomic.AtomicInteger; +-import org.jetbrains.annotations.NotNull; +-import org.jetbrains.annotations.Nullable; +- +-/** +- *

Used as a basis for fast HashMap key comparisons for the Timing Map.

+- * +- * This class uses interned strings giving us the ability to do an identity check instead of equals() on the strings +- */ +-final class TimingIdentifier { +- /** +- * Holds all groups. Autoloads on request for a group by name. +- */ +- static final Map GROUP_MAP = LoadingMap.of(new ConcurrentHashMap<>(64, .5F), TimingGroup::new); +- private static final TimingGroup DEFAULT_GROUP = getGroup("Minecraft"); +- final String group; +- final String name; +- final TimingHandler groupHandler; +- private final int hashCode; +- +- TimingIdentifier(@Nullable String group, @NotNull String name, @Nullable Timing groupHandler) { +- this.group = group != null ? group: DEFAULT_GROUP.name; +- this.name = name; +- this.groupHandler = groupHandler != null ? groupHandler.getTimingHandler() : null; +- this.hashCode = (31 * this.group.hashCode()) + this.name.hashCode(); +- } +- +- @NotNull +- static TimingGroup getGroup(@Nullable String groupName) { +- if (groupName == null) { +- //noinspection ConstantConditions +- return DEFAULT_GROUP; +- } +- +- return GROUP_MAP.get(groupName); +- } +- +- @Override +- public boolean equals(Object o) { +- if (o == null) { +- return false; +- } +- +- TimingIdentifier that = (TimingIdentifier) o; +- return Objects.equals(group, that.group) && Objects.equals(name, that.name); +- } +- +- @Override +- public int hashCode() { +- return hashCode; +- } +- +- @Override +- public String toString() { +- return "TimingIdentifier{id=" + group + ":" + name +'}'; +- } +- +- static class TimingGroup { +- +- private static AtomicInteger idPool = new AtomicInteger(1); +- final int id = idPool.getAndIncrement(); +- +- final String name; +- final List handlers = Collections.synchronizedList(new ArrayList<>(64)); +- +- private TimingGroup(String name) { +- this.name = name; +- } +- +- @Override +- public boolean equals(Object o) { +- if (this == o) return true; +- if (o == null || getClass() != o.getClass()) return false; +- TimingGroup that = (TimingGroup) o; +- return id == that.id; +- } +- +- @Override +- public int hashCode() { +- return id; +- } +- } +-} +diff --git a/src/main/java/co/aikar/timings/Timings.java b/src/main/java/co/aikar/timings/Timings.java +index 752d54830aa8baa1450bf72da03ae55ed30293c2..d933858f24f0a48f1d1d38b4956918a76309144f 100644 +--- a/src/main/java/co/aikar/timings/Timings.java ++++ b/src/main/java/co/aikar/timings/Timings.java +@@ -47,6 +47,7 @@ import org.jetbrains.annotations.Nullable; + @SuppressWarnings({"UnusedDeclaration", "WeakerAccess", "SameParameterValue"}) + public final class Timings { + ++ /* // Thunderbolt - Remove remaining timings implementations + final static List requestingReport = Lists.newArrayList(); + private static final int MAX_HISTORY_FRAMES = 12; + public static final Timing NULL_HANDLER = new NullTimingHandler(); +@@ -55,6 +56,7 @@ public final class Timings { + private static int historyInterval = -1; + private static int historyLength = -1; + private static boolean warnedAboutDeprecationOnEnable; ++ */ // Thunderbolt - Remove remaining timings implementations + + private Timings() {} + +@@ -65,13 +67,15 @@ public final class Timings { + * @param name Name of Timing + * @return Handler + */ +- @NotNull ++ @Deprecated(forRemoval = true) @io.papermc.paper.annotation.DoNotUse // Thunderbolt - Remove remaining timings implementations + public static Timing of(@NotNull Plugin plugin, @NotNull String name) { ++ throw new org.plazmamc.thunderbolt.DeprecatedException("Timings is deprecated and will be removed in the future. Use Spark instead."); /* // Thunderbolt - Remove remaining timings implementations + Timing pluginHandler = null; + if (plugin != null) { + pluginHandler = ofSafe(plugin.getName(), "Combined Total", TimingsManager.PLUGIN_GROUP_HANDLER); + } + return of(plugin, name, pluginHandler); ++ */ // Thunderbolt - Remove remaining timings implementations + } + + /** +@@ -86,11 +90,13 @@ public final class Timings { + * @param groupHandler Parent handler to mirror .start/stop calls to + * @return Timing Handler + */ +- @NotNull ++ @Deprecated(forRemoval = true) @io.papermc.paper.annotation.DoNotUse // Thunderbolt - Remove remaining timings implementations // Thunderbolt - Remove remaining timings implementations + public static Timing of(@NotNull Plugin plugin, @NotNull String name, @Nullable Timing groupHandler) { ++ /* // Thunderbolt - Remove remaining timings implementations + Preconditions.checkNotNull(plugin, "Plugin can not be null"); + Bukkit.getLogger().warning(String.format("Plugin '%s' is creating timing '%s' - this is deprecated behavior, please report it to the authors: %s", plugin.getName(), name, String.join(", ", plugin.getDescription().getAuthors()))); + return TimingsManager.getHandler(plugin.getName(), name, groupHandler); ++ */ throw new org.plazmamc.thunderbolt.DeprecatedException("Timings is deprecated and will be removed in the future. Use Spark instead."); // Thunderbolt - Remove remaining timings implementations + } + + /** +@@ -104,9 +110,10 @@ public final class Timings { + * @param name Name of Timing + * @return Timing Handler + */ +- @NotNull ++ @Deprecated(forRemoval = true) @io.papermc.paper.annotation.DoNotUse // Thunderbolt - Remove remaining timings implementations + public static Timing ofStart(@NotNull Plugin plugin, @NotNull String name) { +- return ofStart(plugin, name, null); ++ // return ofStart(plugin, name, null); // Thunderbolt - Remove remaining timings implementations ++ throw new org.plazmamc.thunderbolt.DeprecatedException("Timings is deprecated and will be removed in the future. Use Spark instead."); // Thunderbolt - Remove remaining timings implementations + } + + /** +@@ -121,11 +128,13 @@ public final class Timings { + * @param groupHandler Parent handler to mirror .start/stop calls to + * @return Timing Handler + */ +- @NotNull ++ @Deprecated(forRemoval = true) @io.papermc.paper.annotation.DoNotUse // Thunderbolt - Remove remaining timings implementations + public static Timing ofStart(@NotNull Plugin plugin, @NotNull String name, @Nullable Timing groupHandler) { ++ /* // Thunderbolt - Remove remaining timings implementations + Timing timing = of(plugin, name, groupHandler); + //timing.startTiming(); // Purpur + return timing; ++ */ throw new org.plazmamc.thunderbolt.DeprecatedException("Timings is deprecated and will be removed in the future. Use Spark instead."); // Thunderbolt - Remove remaining timings implementations + } + + /** +@@ -133,8 +142,10 @@ public final class Timings { + * + * @return Enabled or not + */ ++ @Deprecated(forRemoval = true) @io.papermc.paper.annotation.DoNotUse // Thunderbolt - Remove remaining timings implementations + public static boolean isTimingsEnabled() { +- return timingsEnabled; ++ // return timingsEnabled; // Thunderbolt - Remove remaining timings implementations ++ return false; // Thunderbolt - Remove remaining timings implementations + } + + /** +@@ -144,14 +155,18 @@ public final class Timings { + * + * @param enabled Should timings be reported + */ ++ @Deprecated(forRemoval = true) @io.papermc.paper.annotation.DoNotUse // Thunderbolt - Remove remaining timings implementations + public static void setTimingsEnabled(boolean enabled) { ++ /* // Thunderbolt - Remove remaining timings implementations + // Purpur start - we don't do that here... + timingsEnabled = false; + //warnAboutDeprecationOnEnable(); + //reset(); + // Purpur end ++ */ throw new org.plazmamc.thunderbolt.DeprecatedException("Timings is deprecated and will be removed in the future. Use Spark instead."); // Thunderbolt - Remove remaining timings implementations + } + ++ /* // Thunderbolt - Remove remaining timings implementations + private static void warnAboutDeprecationOnEnable() { + if (timingsEnabled && !warnedAboutDeprecationOnEnable) { + Bukkit.getLogger().warning(PlainTextComponentSerializer.plainText().serialize(deprecationMessage())); +@@ -181,6 +196,7 @@ public final class Timings { + ) + .build(); + } ++ */ // Thunderbolt - Remove remaining timings implementations + + /** + *

Sets whether or not the Timings should monitor at Verbose level.

+@@ -189,8 +205,10 @@ public final class Timings { + * + * @return Enabled or not + */ ++ @Deprecated(forRemoval = true) @io.papermc.paper.annotation.DoNotUse // Thunderbolt - Remove remaining timings implementations + public static boolean isVerboseTimingsEnabled() { +- return verboseEnabled; ++ // return verboseEnabled; // Thunderbolt - Remove remaining timings implementations ++ return false; // Thunderbolt - Remove remaining timings implementations + } + + /** +@@ -201,9 +219,11 @@ public final class Timings { + * + * @param enabled Should high-frequency timings be reported + */ ++ @Deprecated(forRemoval = true) @io.papermc.paper.annotation.DoNotUse // Thunderbolt - Remove remaining timings implementations + public static void setVerboseTimingsEnabled(boolean enabled) { +- verboseEnabled = enabled; +- TimingsManager.needsRecheckEnabled = true; ++ // verboseEnabled = enabled; // Thunderbolt - Remove remaining timings implementations ++ // TimingsManager.needsRecheckEnabled = true; // Thunderbolt - Remove remaining timings implementations ++ throw new org.plazmamc.thunderbolt.DeprecatedException("Timings is deprecated and will be removed in the future. Use Spark instead."); // Thunderbolt - Remove remaining timings implementations + } + + /** +@@ -213,8 +233,10 @@ public final class Timings { + * + * @return Interval in ticks + */ ++ @Deprecated(forRemoval = true) @io.papermc.paper.annotation.DoNotUse // Thunderbolt - Remove remaining timings implementations + public static int getHistoryInterval() { +- return historyInterval; ++ // return historyInterval; // Thunderbolt - Remove remaining timings implementations ++ throw new org.plazmamc.thunderbolt.DeprecatedException("Timings is deprecated and will be removed in the future. Use Spark instead."); // Thunderbolt - Remove remaining timings implementations + } + + /** +@@ -227,12 +249,15 @@ public final class Timings { + * + * @param interval Interval in ticks + */ ++ @Deprecated(forRemoval = true) @io.papermc.paper.annotation.DoNotUse // Thunderbolt - Remove remaining timings implementations + public static void setHistoryInterval(int interval) { ++ /* // Thunderbolt - Remove remaining timings implementations + historyInterval = Math.max(20*60, interval); + // Recheck the history length with the new Interval + if (historyLength != -1) { + setHistoryLength(historyLength); + } ++ */ throw new org.plazmamc.thunderbolt.DeprecatedException("Timings is deprecated and will be removed in the future. Use Spark instead."); // Thunderbolt - Remove remaining timings implementations + } + + /** +@@ -242,8 +267,10 @@ public final class Timings { + * + * @return Duration in Ticks + */ ++ @Deprecated(forRemoval = true) @io.papermc.paper.annotation.DoNotUse // Thunderbolt - Remove remaining timings implementations + public static int getHistoryLength() { +- return historyLength; ++ // return historyLength; // Thunderbolt - Remove remaining timings implementations ++ throw new org.plazmamc.thunderbolt.DeprecatedException("Timings is deprecated and will be removed in the future. Use Spark instead."); // Thunderbolt - Remove remaining timings implementations + } + + /** +@@ -257,7 +284,9 @@ public final class Timings { + * + * @param length Duration in ticks + */ ++ @Deprecated(forRemoval = true) @io.papermc.paper.annotation.DoNotUse // Thunderbolt - Remove remaining timings implementations + public static void setHistoryLength(int length) { ++ /* // Thunderbolt - Remove remaining timings implementations + // Cap at 12 History Frames, 1 hour at 5 minute frames. + int maxLength = historyInterval * MAX_HISTORY_FRAMES; + // For special cases of servers with special permission to bypass the max. +@@ -274,13 +303,16 @@ public final class Timings { + } + TimingsManager.HISTORY = EvictingQueue.create(frames); + TimingsManager.HISTORY.addAll(oldQueue); ++ */ throw new org.plazmamc.thunderbolt.DeprecatedException("Timings is deprecated and will be removed in the future. Use Spark instead."); // Thunderbolt - Remove remaining timings implementations + } + + /** + * Resets all Timing Data + */ ++ @Deprecated(forRemoval = true) @io.papermc.paper.annotation.DoNotUse // Thunderbolt - Remove remaining timings implementations + public static void reset() { +- TimingsManager.reset(); ++ // TimingsManager.reset(); // Thunderbolt - Remove remaining timings implementations ++ throw new org.plazmamc.thunderbolt.DeprecatedException("Timings is deprecated and will be removed in the future. Use Spark instead."); // Thunderbolt - Remove remaining timings implementations + } + + /** +@@ -289,11 +321,14 @@ public final class Timings { + * If sender is null, ConsoleCommandSender will be used. + * @param sender The sender to send to, or null to use the ConsoleCommandSender + */ ++ @Deprecated(forRemoval = true) @io.papermc.paper.annotation.DoNotUse // Thunderbolt - Remove remaining timings implementations + public static void generateReport(@Nullable CommandSender sender) { ++ /* // Thunderbolt - Remove remaining timings implementations + if (sender == null) { + sender = Bukkit.getConsoleSender(); + } + requestingReport.add(sender); ++ */ throw new org.plazmamc.thunderbolt.DeprecatedException("Timings is deprecated and will be removed in the future. Use Spark instead."); // Thunderbolt - Remove remaining timings implementations + } + + /** +@@ -301,9 +336,11 @@ public final class Timings { + * Use with {@link org.bukkit.command.BufferedCommandSender} to get full response when done! + * @param sender The listener to send responses too. + */ +- public static void generateReport(@NotNull TimingsReportListener sender) { +- Preconditions.checkNotNull(sender); +- requestingReport.add(sender); ++ @Deprecated(forRemoval = true) @io.papermc.paper.annotation.DoNotUse // Thunderbolt - Remove remaining timings implementations ++ public static void generateReport(@NotNull Object sender) { // Thunderbolt - Remove remaining timings implementations ++ // Preconditions.checkNotNull(sender); // Thunderbolt - Remove remaining timings implementations ++ // requestingReport.add(sender); // Thunderbolt - Remove remaining timings implementations ++ throw new org.plazmamc.thunderbolt.DeprecatedException("Timings is deprecated and will be removed in the future. Use Spark instead."); // Thunderbolt - Remove remaining timings implementations + } + + /* +@@ -312,6 +349,7 @@ public final class Timings { + These do not have isPrimaryThread() checks in the startTiming/stopTiming + ================= + */ ++ /* // Thunderbolt - Remove remaining timings implementations + @NotNull + static TimingHandler ofSafe(@NotNull String name) { + return ofSafe(null, name, null); +@@ -335,5 +373,6 @@ public final class Timings { + static TimingHandler ofSafe(@Nullable String groupName, @NotNull String name, @Nullable Timing groupHandler) { + return TimingsManager.getHandler(groupName, name, groupHandler); + } ++ */ // Thunderbolt - Remove remaining timings implementations + } + +diff --git a/src/main/java/co/aikar/timings/TimingsCommand.java b/src/main/java/co/aikar/timings/TimingsCommand.java +index 1abfcee0f6d632f4cd8d74b4994a90c9ea9d254c..eeabeeccf97602b25337b8b8c90c824f877ae53a 100644 +--- a/src/main/java/co/aikar/timings/TimingsCommand.java ++++ b/src/main/java/co/aikar/timings/TimingsCommand.java +@@ -40,7 +40,7 @@ import static net.kyori.adventure.text.Component.text; + @Deprecated(forRemoval = true) + public class TimingsCommand extends BukkitCommand { + private static final List TIMINGS_SUBCOMMANDS = ImmutableList.of("report", "reset", "on", "off", "paste", "verbon", "verboff"); +- private long lastResetAttempt = 0; ++ // private long lastResetAttempt = 0; + + public TimingsCommand(@NotNull String name) { + super(name); +@@ -54,13 +54,13 @@ public class TimingsCommand extends BukkitCommand { + if (!testPermission(sender)) { + return true; + } +- if (true) { +- net.kyori.adventure.text.minimessage.MiniMessage mm = net.kyori.adventure.text.minimessage.MiniMessage.miniMessage(); +- sender.sendMessage(mm.deserialize("Purpur has removed timings to save your performance. Please use /spark instead")); +- sender.sendMessage(mm.deserialize("For more information, view its documentation at")); +- sender.sendMessage(mm.deserialize("https://spark.lucko.me/docs/Command-Usage")); +- return true; +- } ++ // Thunderbolt start - Remove remaining timings implementations ++ net.kyori.adventure.text.minimessage.MiniMessage mm = net.kyori.adventure.text.minimessage.MiniMessage.miniMessage(); ++ sender.sendMessage(mm.deserialize("Purpur has removed timings to save your performance. Please use /spark instead")); ++ sender.sendMessage(mm.deserialize("For more information, view its documentation at")); ++ sender.sendMessage(mm.deserialize("https://spark.lucko.me/docs/Command-Usage")); ++ /* ++ // Thunderbolt end - Remove remaining timings implementations + if (args.length < 1) { + sender.sendMessage(text("Usage: " + this.usageMessage, NamedTextColor.RED)); + return true; +@@ -109,6 +109,7 @@ public class TimingsCommand extends BukkitCommand { + } else { + sender.sendMessage(text("Usage: " + this.usageMessage, NamedTextColor.RED)); + } ++ */ + return true; + } + +@@ -119,7 +120,7 @@ public class TimingsCommand extends BukkitCommand { + Preconditions.checkNotNull(args, "Arguments cannot be null"); + Preconditions.checkNotNull(alias, "Alias cannot be null"); + +- if (false && args.length == 1) { // Purpur ++ if (args.length == 1) { // Purpur // Thunderbolt + return StringUtil.copyPartialMatches(args[0], TIMINGS_SUBCOMMANDS, + new ArrayList(TIMINGS_SUBCOMMANDS.size())); + } +diff --git a/src/main/java/co/aikar/timings/TimingsManager.java b/src/main/java/co/aikar/timings/TimingsManager.java +deleted file mode 100644 +index 5e1558ca3ffeeaf2645fa003965474a442d650bf..0000000000000000000000000000000000000000 +--- a/src/main/java/co/aikar/timings/TimingsManager.java ++++ /dev/null +@@ -1,192 +0,0 @@ +-/* +- * This file is licensed under the MIT License (MIT). +- * +- * Copyright (c) 2014 Daniel Ennis +- * +- * Permission is hereby granted, free of charge, to any person obtaining a copy +- * of this software and associated documentation files (the "Software"), to deal +- * in the Software without restriction, including without limitation the rights +- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +- * copies of the Software, and to permit persons to whom the Software is +- * furnished to do so, subject to the following conditions: +- * +- * The above copyright notice and this permission notice shall be included in +- * all copies or substantial portions of the Software. +- * +- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +- * THE SOFTWARE. +- */ +-package co.aikar.timings; +- +-import co.aikar.util.LoadingMap; +-import com.google.common.collect.EvictingQueue; +-import org.bukkit.Bukkit; +-import org.bukkit.Server; +-import org.bukkit.command.Command; +-import org.bukkit.plugin.Plugin; +-import org.bukkit.plugin.java.PluginClassLoader; +- +-import java.util.ArrayList; +-import java.util.List; +-import java.util.Map; +-import java.util.concurrent.ConcurrentHashMap; +-import java.util.logging.Level; +-import org.jetbrains.annotations.NotNull; +-import org.jetbrains.annotations.Nullable; +- +-/** +- * @deprecated Timings will likely be replaced with Spark in the future +- */ +-@Deprecated(forRemoval = true) +-public final class TimingsManager { +- static final Map TIMING_MAP = LoadingMap.of( +- new ConcurrentHashMap<>(4096, .5F), TimingHandler::new +- ); +- public static final FullServerTickHandler FULL_SERVER_TICK = new FullServerTickHandler(); +- public static final TimingHandler TIMINGS_TICK = Timings.ofSafe("Timings Tick", FULL_SERVER_TICK); +- public static final Timing PLUGIN_GROUP_HANDLER = Timings.ofSafe("Plugins"); +- public static String url = "https://timings.aikar.co/"; +- public static List hiddenConfigs = new ArrayList(); +- public static boolean privacy = false; +- +- static final List HANDLERS = new ArrayList<>(1024); +- static final List MINUTE_REPORTS = new ArrayList<>(64); +- +- static EvictingQueue HISTORY = EvictingQueue.create(12); +- static long timingStart = 0; +- static long historyStart = 0; +- static boolean needsFullReset = false; +- static boolean needsRecheckEnabled = false; +- +- private TimingsManager() {} +- +- /** +- * Resets all timing data on the next tick +- */ +- static void reset() { +- needsFullReset = true; +- } +- +- /** +- * Ticked every tick by CraftBukkit to count the number of times a timer +- * caused TPS loss. +- */ +- static void tick() { +- if (Timings.timingsEnabled) { +- boolean violated = FULL_SERVER_TICK.isViolated(); +- +- for (TimingHandler handler : HANDLERS) { +- if (handler.isSpecial()) { +- // We manually call this +- continue; +- } +- handler.processTick(violated); +- } +- +- TimingHistory.playerTicks += Bukkit.getOnlinePlayers().size(); +- TimingHistory.timedTicks++; +- // Generate TPS/Ping/Tick reports every minute +- } +- } +- static void stopServer() { +- Timings.timingsEnabled = false; +- recheckEnabled(); +- } +- static void recheckEnabled() { +- synchronized (TIMING_MAP) { +- for (TimingHandler timings : TIMING_MAP.values()) { +- timings.checkEnabled(); +- } +- } +- needsRecheckEnabled = false; +- } +- static void resetTimings() { +- if (needsFullReset) { +- // Full resets need to re-check every handlers enabled state +- // Timing map can be modified from async so we must sync on it. +- synchronized (TIMING_MAP) { +- for (TimingHandler timings : TIMING_MAP.values()) { +- timings.reset(true); +- } +- } +- Bukkit.getLogger().log(Level.INFO, "Timings Reset"); +- HISTORY.clear(); +- needsFullReset = false; +- needsRecheckEnabled = false; +- timingStart = System.currentTimeMillis(); +- } else { +- // Soft resets only need to act on timings that have done something +- // Handlers can only be modified on main thread. +- for (TimingHandler timings : HANDLERS) { +- timings.reset(false); +- } +- } +- +- HANDLERS.clear(); +- MINUTE_REPORTS.clear(); +- +- TimingHistory.resetTicks(true); +- historyStart = System.currentTimeMillis(); +- } +- +- @NotNull +- static TimingHandler getHandler(@Nullable String group, @NotNull String name, @Nullable Timing parent) { +- return TIMING_MAP.get(new TimingIdentifier(group, name, parent)); +- } +- +- +- /** +- *

Due to access restrictions, we need a helper method to get a Command TimingHandler with String group

+- * +- * Plugins should never call this +- * +- * @param pluginName Plugin this command is associated with +- * @param command Command to get timings for +- * @return TimingHandler +- */ +- @NotNull +- public static Timing getCommandTiming(@Nullable String pluginName, @NotNull Command command) { +- Plugin plugin = null; +- final Server server = Bukkit.getServer(); +- if (!( server == null || pluginName == null || +- "minecraft".equals(pluginName) || "bukkit".equals(pluginName) || +- "spigot".equalsIgnoreCase(pluginName) || "paper".equals(pluginName) +- )) { +- plugin = server.getPluginManager().getPlugin(pluginName); +- } +- if (plugin == null) { +- // Plugin is passing custom fallback prefix, try to look up by class loader +- plugin = getPluginByClassloader(command.getClass()); +- } +- if (plugin == null) { +- return Timings.ofSafe("Command: " + pluginName + ":" + command.getTimingName()); +- } +- +- return Timings.ofSafe(plugin, "Command: " + pluginName + ":" + command.getTimingName()); +- } +- +- /** +- * Looks up the class loader for the specified class, and if it is a PluginClassLoader, return the +- * Plugin that created this class. +- * +- * @param clazz Class to check +- * @return Plugin if created by a plugin +- */ +- @Nullable +- public static Plugin getPluginByClassloader(@Nullable Class clazz) { +- if (clazz == null) { +- return null; +- } +- final ClassLoader classLoader = clazz.getClassLoader(); +- if (classLoader instanceof PluginClassLoader) { +- PluginClassLoader pluginClassLoader = (PluginClassLoader) classLoader; +- return pluginClassLoader.getPlugin(); +- } +- return null; +- } +-} +diff --git a/src/main/java/co/aikar/timings/TimingsReportListener.java b/src/main/java/co/aikar/timings/TimingsReportListener.java +deleted file mode 100644 +index 3af5b8ea795311582044c712de50d29412024b77..0000000000000000000000000000000000000000 +--- a/src/main/java/co/aikar/timings/TimingsReportListener.java ++++ /dev/null +@@ -1,87 +0,0 @@ +-package co.aikar.timings; +- +-import com.google.common.base.Preconditions; +-import com.google.common.collect.Lists; +-import org.bukkit.Bukkit; +-import org.bukkit.command.CommandSender; +-import org.bukkit.command.ConsoleCommandSender; +-import org.bukkit.command.MessageCommandSender; +-import org.bukkit.command.RemoteConsoleCommandSender; +-import org.jetbrains.annotations.NotNull; +-import org.jetbrains.annotations.Nullable; +- +-import java.util.List; +- +-@Deprecated(forRemoval = true) +-@SuppressWarnings("WeakerAccess") +-public class TimingsReportListener implements net.kyori.adventure.audience.ForwardingAudience, MessageCommandSender { +- private final List senders; +- private final Runnable onDone; +- private String timingsURL; +- +- public TimingsReportListener(@NotNull CommandSender senders) { +- this(senders, null); +- } +- public TimingsReportListener(@NotNull CommandSender sender, @Nullable Runnable onDone) { +- this(Lists.newArrayList(sender), onDone); +- } +- public TimingsReportListener(@NotNull List senders) { +- this(senders, null); +- } +- public TimingsReportListener(@NotNull List senders, @Nullable Runnable onDone) { +- Preconditions.checkNotNull(senders); +- Preconditions.checkArgument(!senders.isEmpty(), "senders is empty"); +- +- this.senders = Lists.newArrayList(senders); +- this.onDone = onDone; +- } +- +- @Nullable +- public String getTimingsURL() { +- return timingsURL; +- } +- +- public void done() { +- done(null); +- } +- +- public void done(@Nullable String url) { +- this.timingsURL = url; +- if (onDone != null) { +- onDone.run(); +- } +- for (CommandSender sender : senders) { +- if (sender instanceof TimingsReportListener) { +- ((TimingsReportListener) sender).done(); +- } +- } +- } +- +- @Override +- public void sendMessage(final @NotNull net.kyori.adventure.identity.Identity source, final @NotNull net.kyori.adventure.text.Component message, final @NotNull net.kyori.adventure.audience.MessageType type) { +- net.kyori.adventure.audience.ForwardingAudience.super.sendMessage(source, message, type); +- } +- +- @NotNull +- @Override +- public Iterable audiences() { +- return this.senders; +- } +- +- @Override +- public void sendMessage(@NotNull String message) { +- senders.forEach((sender) -> sender.sendMessage(message)); +- } +- +- public void addConsoleIfNeeded() { +- boolean hasConsole = false; +- for (CommandSender sender : this.senders) { +- if (sender instanceof ConsoleCommandSender || sender instanceof RemoteConsoleCommandSender) { +- hasConsole = true; +- } +- } +- if (!hasConsole) { +- this.senders.add(Bukkit.getConsoleSender()); +- } +- } +-} +diff --git a/src/main/java/co/aikar/timings/UnsafeTimingHandler.java b/src/main/java/co/aikar/timings/UnsafeTimingHandler.java +deleted file mode 100644 +index 632c4961515f5052551f841cfa840e60bba7a257..0000000000000000000000000000000000000000 +--- a/src/main/java/co/aikar/timings/UnsafeTimingHandler.java ++++ /dev/null +@@ -1,53 +0,0 @@ +-/* +- * This file is licensed under the MIT License (MIT). +- * +- * Copyright (c) 2014 Daniel Ennis +- * +- * Permission is hereby granted, free of charge, to any person obtaining a copy +- * of this software and associated documentation files (the "Software"), to deal +- * in the Software without restriction, including without limitation the rights +- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +- * copies of the Software, and to permit persons to whom the Software is +- * furnished to do so, subject to the following conditions: +- * +- * The above copyright notice and this permission notice shall be included in +- * all copies or substantial portions of the Software. +- * +- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +- * THE SOFTWARE. +- */ +-package co.aikar.timings; +- +-import org.bukkit.Bukkit; +-import org.jetbrains.annotations.NotNull; +- +-class UnsafeTimingHandler extends TimingHandler { +- +- UnsafeTimingHandler(@NotNull TimingIdentifier id) { +- super(id); +- } +- +- private static void checkThread() { +- if (!Bukkit.isPrimaryThread()) { +- throw new IllegalStateException("Calling Timings from Async Operation"); +- } +- } +- +- @NotNull +- @Override +- public Timing startTiming() { +- checkThread(); +- return super.startTiming(); +- } +- +- @Override +- public void stopTiming() { +- checkThread(); +- super.stopTiming(); +- } +-} +diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java +index 0857a65ecbc36e0e4b8a7d0cda52be35f238f660..6178368dcf63504e3ae0e1f521ec2a16d6548ced 100644 +--- a/src/main/java/org/bukkit/UnsafeValues.java ++++ b/src/main/java/org/bukkit/UnsafeValues.java +@@ -40,7 +40,6 @@ public interface UnsafeValues { + net.kyori.adventure.text.Component resolveWithContext(net.kyori.adventure.text.Component component, org.bukkit.command.CommandSender context, org.bukkit.entity.Entity scoreboardSubject, boolean bypassPermissions) throws java.io.IOException; + // Paper end + +- void reportTimings(); // Paper + Material toLegacy(Material material); + + Material fromLegacy(Material material); +@@ -154,7 +153,7 @@ public interface UnsafeValues { + * Server name to report to timings v2 + * @return name + */ +- String getTimingsServerName(); ++ // String getTimingsServerName(); // Thunderbolt - Remove remaining timings implementations + + /** + * Called once by the version command on first use, then cached. +diff --git a/src/main/java/org/bukkit/command/FormattedCommandAlias.java b/src/main/java/org/bukkit/command/FormattedCommandAlias.java +index abe256e1e45ce28036da4aa1586715bc8a1a3414..cf055d721c4c66eba9479ad88f3b6a514bf9677d 100644 +--- a/src/main/java/org/bukkit/command/FormattedCommandAlias.java ++++ b/src/main/java/org/bukkit/command/FormattedCommandAlias.java +@@ -12,7 +12,7 @@ public class FormattedCommandAlias extends Command { + + public FormattedCommandAlias(@NotNull String alias, @NotNull String[] formatStrings) { + super(alias); +- timings = co.aikar.timings.TimingsManager.getCommandTiming("minecraft", this); // Spigot ++ // timings = co.aikar.timings.TimingsManager.getCommandTiming("minecraft", this); // Spigot // Thunderbolt - Remove remaining timings implementations + this.formatStrings = formatStrings; + } + +diff --git a/src/main/java/org/bukkit/command/SimpleCommandMap.java b/src/main/java/org/bukkit/command/SimpleCommandMap.java +index fdedac32544be6534288c8ba28abe7f5c4c56f3b..2e40b577333e251c90871ee4b534e85f6b226c73 100644 +--- a/src/main/java/org/bukkit/command/SimpleCommandMap.java ++++ b/src/main/java/org/bukkit/command/SimpleCommandMap.java +@@ -70,7 +70,7 @@ public class SimpleCommandMap implements CommandMap { + */ + @Override + public boolean register(@NotNull String label, @NotNull String fallbackPrefix, @NotNull Command command) { +- command.timings = co.aikar.timings.TimingsManager.getCommandTiming(fallbackPrefix, command); // Paper ++ // command.timings = co.aikar.timings.TimingsManager.getCommandTiming(fallbackPrefix, command); // Paper // Thunderbolt - Remove remaining timings implementations + label = label.toLowerCase(java.util.Locale.ENGLISH).trim(); + fallbackPrefix = fallbackPrefix.toLowerCase(java.util.Locale.ENGLISH).trim(); + boolean registered = register(label, command, false, fallbackPrefix); +@@ -165,11 +165,13 @@ public class SimpleCommandMap implements CommandMap { + parsedArgs = event.getArgs(); + // Purpur end + ++ /* // Thunderbolt - Remove remaining timings implementations + // Paper start - Plugins do weird things to workaround normal registration + if (target.timings == null) { + target.timings = co.aikar.timings.TimingsManager.getCommandTiming(null, target); + } + // Paper end ++ */ // Thunderbolt - Remove remaining timings implementations + + try { + //try (co.aikar.timings.Timing ignored = target.timings.startTiming()) { // Paper - use try with resources // Purpur +diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java +index 5dc64d8c9aeae612fd31af0673f3530a9e777dfc..62242daa0bd7851479748cd62627f51cfe6bc6f1 100644 +--- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java ++++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java +@@ -60,7 +60,7 @@ public final class SimplePluginManager implements PluginManager { + public final Map> defSubs = new HashMap>(); + public PluginManager paperPluginManager; + // Paper end +- private boolean useTimings = false; ++ // private boolean useTimings = false; // Thunderbolt - Remove remaining timings implementations + + public SimplePluginManager(@NotNull Server instance, @NotNull SimpleCommandMap commandMap) { + server = instance; +@@ -723,7 +723,7 @@ public final class SimplePluginManager implements PluginManager { + throw new IllegalPluginAccessException("Plugin attempted to register " + event + " while not enabled"); + } + +- executor = new co.aikar.timings.TimedEventExecutor(executor, plugin, null, event); // Paper ++ // executor = new co.aikar.timings.TimedEventExecutor(executor, plugin, null, event); // Paper // Thunderbolt - Remove remaining timings implementations + if (false) { // Spigot - RL handles useTimings check now // Paper + getEventListeners(event).register(new TimedRegisteredListener(listener, executor, priority, plugin, ignoreCancelled)); + } else { +@@ -958,8 +958,9 @@ public final class SimplePluginManager implements PluginManager { + + @Override + public boolean useTimings() { +- if (true) {return this.paperPluginManager.useTimings();} // Paper +- return co.aikar.timings.Timings.isTimingsEnabled(); // Spigot ++ // if (true) {return this.paperPluginManager.useTimings();} // Paper ++ // return co.aikar.timings.Timings.isTimingsEnabled(); // Spigot ++ return false; // Thunderbolt - Remove remaining timings implementations + } + + /** +@@ -968,7 +969,8 @@ public final class SimplePluginManager implements PluginManager { + * @param use True if per event timing code should be used + */ + public void useTimings(boolean use) { +- co.aikar.timings.Timings.setTimingsEnabled(use); // Paper ++ // co.aikar.timings.Timings.setTimingsEnabled(use); // Paper // Thunderbolt - Remove remaining timings implementations ++ throw new org.plazmamc.thunderbolt.DeprecatedException("Timings is deprecated and will be removed in the future. Use Spark instead."); // Thunderbolt - Remove remaining timings implementations // Thunderbolt - Remove remaining timings implementations + } + + // Paper start +diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java +index 0c6ca7588fb3d6b6497ddf032fe75e5c6c9719e5..2c340f40902c910b0a9ce6383d4d0294133cd88e 100644 +--- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java ++++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java +@@ -294,21 +294,21 @@ public final class JavaPluginLoader implements PluginLoader { + } + } + +- EventExecutor executor = new co.aikar.timings.TimedEventExecutor(new EventExecutor() { // Paper +- @Override +- public void execute(@NotNull Listener listener, @NotNull Event event) throws EventException { // Paper +- try { +- if (!eventClass.isAssignableFrom(event.getClass())) { +- return; +- } +- method.invoke(listener, event); +- } catch (InvocationTargetException ex) { +- throw new EventException(ex.getCause()); +- } catch (Throwable t) { +- throw new EventException(t); ++ // Thunderbolt start - Remove remaining timings implementations ++ // Paper ++ EventExecutor executor = (listener1, event) -> { // Paper ++ try { ++ if (!eventClass.isAssignableFrom(event.getClass())) { ++ return; + } ++ method.invoke(listener1, event); ++ } catch (InvocationTargetException ex) { ++ throw new EventException(ex.getCause()); ++ } catch (Throwable t) { ++ throw new EventException(t); + } +- }, plugin, method, eventClass); // Paper ++ }; // Paper ++ // Thunderbolt end - Remove remaining timings implementations + if (false) { // Spigot - RL handles useTimings check now + eventSet.add(new TimedRegisteredListener(listener, executor, eh.priority(), plugin, eh.ignoreCancelled())); + } else { +diff --git a/src/main/java/org/plazmamc/thunderbolt/DeprecatedException.java b/src/main/java/org/plazmamc/thunderbolt/DeprecatedException.java +new file mode 100644 +index 0000000000000000000000000000000000000000..d7c6e3b39b3a9977b07b9761c3d884ff68d56ee9 +--- /dev/null ++++ b/src/main/java/org/plazmamc/thunderbolt/DeprecatedException.java +@@ -0,0 +1,7 @@ ++package org.plazmamc.thunderbolt; ++ ++public class DeprecatedException extends RuntimeException { ++ public DeprecatedException(String message) { ++ super(message); ++ } ++} +diff --git a/src/main/java/org/spigotmc/CustomTimingsHandler.java b/src/main/java/org/spigotmc/CustomTimingsHandler.java +index 9c2d605c50cbf9aefa56ec209df9f6cea1392e89..ba99e25371031042b14fc483aab2697e17fb79b7 100644 +--- a/src/main/java/org/spigotmc/CustomTimingsHandler.java ++++ b/src/main/java/org/spigotmc/CustomTimingsHandler.java +@@ -26,9 +26,9 @@ package org.spigotmc; + import org.bukkit.Bukkit; + import org.jetbrains.annotations.NotNull; + import org.bukkit.plugin.AuthorNagException; +-import co.aikar.timings.Timing; +-import co.aikar.timings.Timings; +-import co.aikar.timings.TimingsManager; ++// import co.aikar.timings.Timing; // Thunderbolt - Remove remaining timings implementations ++// import co.aikar.timings.Timings; // Thunderbolt - Remove remaining timings implementations ++// import co.aikar.timings.TimingsManager; // Thunderbolt - Remove remaining timings implementations + + import java.lang.reflect.Method; + import java.util.logging.Level; +@@ -43,9 +43,10 @@ import java.util.logging.Level; + */ + @Deprecated(forRemoval = true) + public final class CustomTimingsHandler { +- private final Timing handler; ++ // private final Timing handler; // Thunderbolt - Remove remaining timings implementations + + public CustomTimingsHandler(@NotNull String name) { ++ throw new org.plazmamc.thunderbolt.DeprecatedException("Timings is deprecated and will be removed in the future. Use Spark instead."); /* // Thunderbolt - Remove remaining timings implementations /* + Timing timing; + + new AuthorNagException("Deprecated use of CustomTimingsHandler. Please Switch to Timings.of ASAP").printStackTrace(); +@@ -59,9 +60,19 @@ public final class CustomTimingsHandler { + timing = Timings.NULL_HANDLER; + } + handler = timing; ++ */ // Thunderbolt - Remove remaining timings implementations + } + +- public void startTiming() { /*handler.startTiming();*/ } // Purpur +- public void stopTiming() { /*handler.stopTiming();*/ } // Purpur ++ // Thunderbolt start - Remove remaining timings implementations ++ public void startTiming() { ++ /*handler.startTiming();*/ // Purpur ++ throw new org.plazmamc.thunderbolt.DeprecatedException("Timings is deprecated and will be removed in the future. Use Spark instead."); // Thunderbolt - Remove remaining timings implementations ++ } ++ ++ public void stopTiming() { ++ /*handler.stopTiming();*/ // Purpur ++ throw new org.plazmamc.thunderbolt.DeprecatedException("Timings is deprecated and will be removed in the future. Use Spark instead."); // Thunderbolt - Remove remaining timings implementations ++ } ++ // Thunderbolt end - Remove remaining timings implementations + + } diff --git a/patches/server/0001-Remove-remaining-timings-implementations.patch b/patches/server/0001-Remove-remaining-timings-implementations.patch new file mode 100644 index 0000000..0cc074f --- /dev/null +++ b/patches/server/0001-Remove-remaining-timings-implementations.patch @@ -0,0 +1,1255 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: AlphaKR93 +Date: Wed, 15 May 2024 14:12:50 +0900 +Subject: [PATCH] Remove remaining timings implementations + + +diff --git a/src/main/java/co/aikar/timings/MinecraftTimings.java b/src/main/java/co/aikar/timings/MinecraftTimings.java +deleted file mode 100644 +index 4b467f1af93452d13829f756d55dee18b8889d40..0000000000000000000000000000000000000000 +--- a/src/main/java/co/aikar/timings/MinecraftTimings.java ++++ /dev/null +@@ -1,181 +0,0 @@ +-package co.aikar.timings; +- +-import com.google.common.collect.MapMaker; +-import io.papermc.paper.configuration.GlobalConfiguration; +-import net.minecraft.commands.functions.CommandFunction; +-import net.minecraft.network.protocol.Packet; +-import net.minecraft.world.level.block.Block; +-import net.minecraft.world.level.block.entity.BlockEntity; +-import org.bukkit.plugin.Plugin; +-import org.bukkit.scheduler.BukkitTask; +- +-import org.bukkit.craftbukkit.scheduler.CraftTask; +- +-import java.util.Map; +- +-// TODO: Re-implement missing timers +-@Deprecated(forRemoval = true) +-public final class MinecraftTimings { +- +- public static final Timing serverOversleep = Timings.ofSafe("Server Oversleep"); +- public static final Timing playerListTimer = Timings.ofSafe("Player List"); +- public static final Timing commandFunctionsTimer = Timings.ofSafe("Command Functions"); +- public static final Timing connectionTimer = Timings.ofSafe("Connection Handler"); +- public static final Timing tickablesTimer = Timings.ofSafe("Tickables"); +- public static final Timing minecraftSchedulerTimer = Timings.ofSafe("Minecraft Scheduler"); +- public static final Timing bukkitSchedulerTimer = Timings.ofSafe("Bukkit Scheduler"); +- public static final Timing bukkitSchedulerPendingTimer = Timings.ofSafe("Bukkit Scheduler - Pending"); +- public static final Timing bukkitSchedulerFinishTimer = Timings.ofSafe("Bukkit Scheduler - Finishing"); +- public static final Timing chunkIOTickTimer = Timings.ofSafe("ChunkIOTick"); +- public static final Timing timeUpdateTimer = Timings.ofSafe("Time Update"); +- public static final Timing serverCommandTimer = Timings.ofSafe("Server Command"); +- public static final Timing savePlayers = Timings.ofSafe("Save Players"); +- +- public static final Timing tickEntityTimer = Timings.ofSafe("## tickEntity"); +- public static final Timing tickTileEntityTimer = Timings.ofSafe("## tickTileEntity"); +- public static final Timing packetProcessTimer = Timings.ofSafe("## Packet Processing"); +- public static final Timing scheduledBlocksTimer = Timings.ofSafe("## Scheduled Blocks"); +- public static final Timing structureGenerationTimer = Timings.ofSafe("Structure Generation"); +- +- public static final Timing processQueueTimer = Timings.ofSafe("processQueue"); +- public static final Timing processTasksTimer = Timings.ofSafe("processTasks"); +- +- public static final Timing playerCommandTimer = Timings.ofSafe("playerCommand"); +- +- public static final Timing entityActivationCheckTimer = Timings.ofSafe("entityActivationCheck"); +- +- public static final Timing antiXrayUpdateTimer = Timings.ofSafe("anti-xray - update"); +- public static final Timing antiXrayObfuscateTimer = Timings.ofSafe("anti-xray - obfuscate"); +- public static final Timing scoreboardScoreSearch = Timings.ofSafe("Scoreboard score search"); // Paper - add timings for scoreboard search +- public static final Timing distanceManagerTick = Timings.ofSafe("Distance Manager Tick"); // Paper - add timings for distance manager +- +- public static final Timing midTickChunkTasks = Timings.ofSafe("Mid Tick Chunk Tasks"); +- +- private static final Map, String> taskNameCache = new MapMaker().weakKeys().makeMap(); +- +- private MinecraftTimings() {} +- +- public static Timing getInternalTaskName(String taskName) { +- return Timings.ofSafe(taskName); +- } +- +- /** +- * Gets a timer associated with a plugins tasks. +- * @param bukkitTask +- * @param period +- * @return +- */ +- public static Timing getPluginTaskTimings(BukkitTask bukkitTask, long period) { +- if (!bukkitTask.isSync()) { +- return NullTimingHandler.NULL; +- } +- Plugin plugin; +- +- CraftTask craftTask = (CraftTask) bukkitTask; +- +- final Class taskClass = craftTask.getTaskClass(); +- if (bukkitTask.getOwner() != null) { +- plugin = bukkitTask.getOwner(); +- } else { +- plugin = TimingsManager.getPluginByClassloader(taskClass); +- } +- +- final String taskname = taskNameCache.computeIfAbsent(taskClass, clazz -> { +- try { +- String clsName = !clazz.isMemberClass() +- ? clazz.getName() +- : clazz.getCanonicalName(); +- if (clsName != null && clsName.contains("$Lambda$")) { +- clsName = clsName.replaceAll("(Lambda\\$.*?)/.*", "$1"); +- } +- return clsName != null ? clsName : "UnknownTask"; +- } catch (Throwable ex) { +- new Exception("Error occurred detecting class name", ex).printStackTrace(); +- return "MangledClassFile"; +- } +- }); +- +- StringBuilder name = new StringBuilder(64); +- name.append("Task: ").append(taskname); +- if (period > 0) { +- name.append(" (interval:").append(period).append(")"); +- } else { +- name.append(" (Single)"); +- } +- +- if (plugin == null) { +- return Timings.ofSafe(null, name.toString()); +- } +- +- return Timings.ofSafe(plugin, name.toString()); +- } +- +- /** +- * Get a named timer for the specified entity type to track type specific timings. +- * @param entityType +- * @return +- */ +- public static Timing getEntityTimings(String entityType, String type) { +- return Timings.ofSafe("Minecraft", "## tickEntity - " + entityType + " - " + type, tickEntityTimer); +- } +- +- public static Timing getBehaviorTimings(String type) { +- return Timings.ofSafe("## Behavior - " + type); +- } +- +- public static Timing getSensorTimings(String type, int rate) { +- return Timings.ofSafe("## Sensor - " + type + " (Default rate: " + rate + ")"); +- } +- +- /** +- * Get a named timer for the specified tile entity type to track type specific timings. +- * @param entity +- * @return +- */ +- public static Timing getTileEntityTimings(BlockEntity entity) { +- String entityType = entity.getClass().getName(); +- return Timings.ofSafe("Minecraft", "## tickTileEntity - " + entityType, tickTileEntityTimer); +- } +- public static Timing getCancelTasksTimer() { +- return Timings.ofSafe("Cancel Tasks"); +- } +- public static Timing getCancelTasksTimer(Plugin plugin) { +- return Timings.ofSafe(plugin, "Cancel Tasks"); +- } +- +- public static void stopServer() { +- TimingsManager.stopServer(); +- } +- +- public static Timing getBlockTiming(Block block) { +- return Timings.ofSafe("## Scheduled Block: " + block.toString(), scheduledBlocksTimer); +- } +-/* +- public static Timing getStructureTiming(StructureGenerator structureGenerator) { +- return Timings.ofSafe("Structure Generator - " + structureGenerator.getName(), structureGenerationTimer); +- }*/ +- +- public static Timing getPacketTiming(Packet packet) { +- return Timings.ofSafe("## Packet - " + packet.getClass().getName(), packetProcessTimer); +- } +- +- public static Timing getCommandFunctionTiming(CommandFunction function) { +- return Timings.ofSafe("Command Function - " + function.id()); +- } +- +- public static void processConfig(GlobalConfiguration.Timings config) { +- TimingsManager.url = config.url; +- if (!TimingsManager.url.endsWith("/")) { +- TimingsManager.url += "/"; +- } +- TimingsManager.privacy = config.serverNamePrivacy; +- if (!config.hiddenConfigEntries.contains("proxies.velocity.secret")) { +- config.hiddenConfigEntries.add("proxies.velocity.secret"); +- } +- TimingsManager.hiddenConfigs.addAll(config.hiddenConfigEntries); +- co.aikar.timings.Timings.setVerboseTimingsEnabled(config.verbose); +- co.aikar.timings.Timings.setTimingsEnabled(config.enabled); +- co.aikar.timings.Timings.setHistoryInterval(config.historyInterval * 20); +- co.aikar.timings.Timings.setHistoryLength(config.historyLength * 20); +- } +-} +diff --git a/src/main/java/co/aikar/timings/TimingsExport.java b/src/main/java/co/aikar/timings/TimingsExport.java +deleted file mode 100644 +index b35a9f4c5f8960864c402ede8a51fb5ab9c4fcc0..0000000000000000000000000000000000000000 +--- a/src/main/java/co/aikar/timings/TimingsExport.java ++++ /dev/null +@@ -1,389 +0,0 @@ +-/* +- * This file is licensed under the MIT License (MIT). +- * +- * Copyright (c) 2014 Daniel Ennis +- * +- * Permission is hereby granted, free of charge, to any person obtaining a copy +- * of this software and associated documentation files (the "Software"), to deal +- * in the Software without restriction, including without limitation the rights +- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +- * copies of the Software, and to permit persons to whom the Software is +- * furnished to do so, subject to the following conditions: +- * +- * The above copyright notice and this permission notice shall be included in +- * all copies or substantial portions of the Software. +- * +- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +- * THE SOFTWARE. +- */ +-package co.aikar.timings; +- +-import com.google.common.collect.Sets; +-import io.papermc.paper.adventure.PaperAdventure; +-import net.kyori.adventure.text.event.ClickEvent; +-import net.kyori.adventure.text.format.NamedTextColor; +-import net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer; +-import net.minecraft.server.MinecraftServer; +-import org.apache.commons.lang.StringUtils; +-import org.bukkit.Bukkit; +-import org.bukkit.Material; +-import org.bukkit.configuration.ConfigurationSection; +-import org.bukkit.configuration.MemorySection; +-import org.bukkit.entity.EntityType; +-import org.json.simple.JSONObject; +-import org.json.simple.JSONValue; +-import oshi.SystemInfo; +-import oshi.hardware.HardwareAbstractionLayer; +- +-import java.io.ByteArrayOutputStream; +-import java.io.IOException; +-import java.io.InputStream; +-import java.io.OutputStream; +-import java.lang.management.ManagementFactory; +-import java.lang.management.OperatingSystemMXBean; +-import java.lang.management.RuntimeMXBean; +-import java.net.HttpURLConnection; +-import java.net.InetAddress; +-import java.net.URL; +-import java.util.List; +-import java.util.Map; +-import java.util.Set; +-import java.util.logging.Level; +-import java.util.zip.GZIPOutputStream; +- +-import static co.aikar.timings.TimingsManager.HISTORY; +-import static co.aikar.util.JSONUtil.appendObjectData; +-import static co.aikar.util.JSONUtil.createObject; +-import static co.aikar.util.JSONUtil.pair; +-import static co.aikar.util.JSONUtil.toArray; +-import static co.aikar.util.JSONUtil.toArrayMapper; +-import static co.aikar.util.JSONUtil.toObjectMapper; +-import static net.kyori.adventure.text.Component.text; +- +-@SuppressWarnings({"rawtypes", "SuppressionAnnotation"}) +-@Deprecated(forRemoval = true) +-public class TimingsExport extends Thread { +- +- private final TimingsReportListener listeners; +- private final Map out; +- private final TimingHistory[] history; +- private static long lastReport = 0; +- +- private TimingsExport(TimingsReportListener listeners, Map out, TimingHistory[] history) { +- super("Timings paste thread"); +- this.listeners = listeners; +- this.out = out; +- this.history = history; +- } +- +- /** +- * Checks if any pending reports are being requested, and builds one if needed. +- */ +- public static void reportTimings() { +- if (Timings.requestingReport.isEmpty()) { +- return; +- } +- TimingsReportListener listeners = new TimingsReportListener(Timings.requestingReport); +- listeners.addConsoleIfNeeded(); +- +- Timings.requestingReport.clear(); +- long now = System.currentTimeMillis(); +- final long lastReportDiff = now - lastReport; +- if (lastReportDiff < 60000) { +- listeners.sendMessage(text("Please wait at least 1 minute in between Timings reports. (" + (int)((60000 - lastReportDiff) / 1000) + " seconds)", NamedTextColor.RED)); +- listeners.done(); +- return; +- } +- final long lastStartDiff = now - TimingsManager.timingStart; +- if (lastStartDiff < 180000) { +- listeners.sendMessage(text("Please wait at least 3 minutes before generating a Timings report. Unlike Timings v1, v2 benefits from longer timings and is not as useful with short timings. (" + (int)((180000 - lastStartDiff) / 1000) + " seconds)", NamedTextColor.RED)); +- listeners.done(); +- return; +- } +- listeners.sendMessage(text("Preparing Timings Report...", NamedTextColor.GREEN)); +- lastReport = now; +- Map parent = createObject( +- // Get some basic system details about the server +- pair("version", Bukkit.getVersion()), +- pair("maxplayers", Bukkit.getMaxPlayers()), +- pair("start", TimingsManager.timingStart / 1000), +- pair("end", System.currentTimeMillis() / 1000), +- pair("online-mode", Bukkit.getServer().getOnlineMode()), +- pair("sampletime", (System.currentTimeMillis() - TimingsManager.timingStart) / 1000), +- pair("datapacks", toArrayMapper(MinecraftServer.getServer().getPackRepository().getSelectedPacks(), pack -> { +- return PlainTextComponentSerializer.plainText().serialize(PaperAdventure.asAdventure(pack.getChatLink(true))); +- })) +- ); +- if (!TimingsManager.privacy) { +- appendObjectData(parent, +- pair("server", Bukkit.getUnsafe().getTimingsServerName()), +- pair("motd", Bukkit.getServer().getMotd()), +- pair("icon", Bukkit.getServer().getServerIcon().getData()) +- ); +- } +- +- final Runtime runtime = Runtime.getRuntime(); +- RuntimeMXBean runtimeBean = ManagementFactory.getRuntimeMXBean(); +- +- OperatingSystemMXBean osInfo = ManagementFactory.getOperatingSystemMXBean(); +- +- HardwareAbstractionLayer hardwareInfo = new SystemInfo().getHardware(); +- +- parent.put("system", createObject( +- pair("timingcost", getCost()), +- pair("loadavg", osInfo.getSystemLoadAverage()), +- pair("name", System.getProperty("os.name")), +- pair("version", System.getProperty("os.version")), +- pair("jvmversion", System.getProperty("java.version")), +- pair("jvmvendor", System.getProperty("java.vendor")), +- pair("jvmvendorversion", System.getProperty("java.vendor.version")), +- pair("arch", System.getProperty("os.arch")), +- pair("maxmem", runtime.maxMemory()), +- pair("memory", createObject( +- pair("heap", ManagementFactory.getMemoryMXBean().getHeapMemoryUsage().toString()), +- pair("nonheap", ManagementFactory.getMemoryMXBean().getNonHeapMemoryUsage().toString()), +- pair("finalizing", ManagementFactory.getMemoryMXBean().getObjectPendingFinalizationCount()) +- )), +- pair("cpu", runtime.availableProcessors()), +- pair("cpuname", hardwareInfo.getProcessor().getProcessorIdentifier().getName().trim()), +- pair("runtime", runtimeBean.getUptime()), +- pair("flags", StringUtils.join(runtimeBean.getInputArguments(), " ")), +- pair("gc", toObjectMapper(ManagementFactory.getGarbageCollectorMXBeans(), input -> pair(input.getName(), toArray(input.getCollectionCount(), input.getCollectionTime())))) +- ) +- ); +- +- parent.put("worlds", toObjectMapper(MinecraftServer.getServer().getAllLevels(), world -> { +- if (world.getWorld().getName().equals("worldeditregentempworld")) return null; +- return pair(world.getWorld().getName(), createObject( +- pair("gamerules", toObjectMapper(world.getWorld().getGameRules(), rule -> { +- return pair(rule, world.getWorld().getGameRuleValue(rule)); +- })), +- pair("ticking-distance", world.getWorld().getSimulationDistance()), +- pair("no-ticking-distance", world.getWorld().getViewDistance()), +- pair("sending-distance", world.getWorld().getSendViewDistance()) +- )); +- })); +- +- Set tileEntityTypeSet = Sets.newHashSet(); +- Set entityTypeSet = Sets.newHashSet(); +- +- int size = HISTORY.size(); +- TimingHistory[] history = new TimingHistory[size + 1]; +- int i = 0; +- for (TimingHistory timingHistory : HISTORY) { +- tileEntityTypeSet.addAll(timingHistory.tileEntityTypeSet); +- entityTypeSet.addAll(timingHistory.entityTypeSet); +- history[i++] = timingHistory; +- } +- +- history[i] = new TimingHistory(); // Current snapshot +- tileEntityTypeSet.addAll(history[i].tileEntityTypeSet); +- entityTypeSet.addAll(history[i].entityTypeSet); +- +- +- Map handlers = createObject(); +- Map groupData; +- synchronized (TimingIdentifier.GROUP_MAP) { +- for (TimingIdentifier.TimingGroup group : TimingIdentifier.GROUP_MAP.values()) { +- synchronized (group.handlers) { +- for (TimingHandler id : group.handlers) { +- +- if (!id.isTimed() && !id.isSpecial()) { +- continue; +- } +- +- String name = id.identifier.name; +- if (name.startsWith("##")) { +- name = name.substring(3); +- } +- handlers.put(id.id, toArray( +- group.id, +- name +- )); +- } +- } +- } +- +- groupData = toObjectMapper( +- TimingIdentifier.GROUP_MAP.values(), group -> pair(group.id, group.name)); +- } +- +- parent.put("idmap", createObject( +- pair("groups", groupData), +- pair("handlers", handlers), +- pair("worlds", toObjectMapper(TimingHistory.worldMap.entrySet(), input -> pair(input.getValue(), input.getKey()))), +- pair("tileentity", +- toObjectMapper(tileEntityTypeSet, input -> pair(input.ordinal(), input.name()))), +- pair("entity", +- toObjectMapper(entityTypeSet, input -> pair(input.ordinal(), input.name()))) +- )); +- +- // Information about loaded plugins +- +- parent.put("plugins", toObjectMapper(Bukkit.getPluginManager().getPlugins(), +- plugin -> pair(plugin.getName(), createObject( +- pair("version", plugin.getDescription().getVersion()), +- pair("description", String.valueOf(plugin.getDescription().getDescription()).trim()), +- pair("website", plugin.getDescription().getWebsite()), +- pair("authors", StringUtils.join(plugin.getDescription().getAuthors(), ", ")) +- )))); +- +- +- +- // Information on the users Config +- +- parent.put("config", createObject( +- pair("spigot", mapAsJSON(Bukkit.spigot().getSpigotConfig(), null)), +- pair("bukkit", mapAsJSON(Bukkit.spigot().getBukkitConfig(), null)), +- pair("paper", mapAsJSON(Bukkit.spigot().getPaperConfig(), null)), // Pufferfish +- pair("pufferfish", mapAsJSON(gg.pufferfish.pufferfish.PufferfishConfig.getConfigCopy(), null)) // Pufferfish +- )); +- +- new TimingsExport(listeners, parent, history).start(); +- } +- +- static long getCost() { +- // Benchmark the users System.nanotime() for cost basis +- int passes = 100; +- TimingHandler SAMPLER1 = Timings.ofSafe("Timings Sampler 1"); +- TimingHandler SAMPLER2 = Timings.ofSafe("Timings Sampler 2"); +- TimingHandler SAMPLER3 = Timings.ofSafe("Timings Sampler 3"); +- TimingHandler SAMPLER4 = Timings.ofSafe("Timings Sampler 4"); +- TimingHandler SAMPLER5 = Timings.ofSafe("Timings Sampler 5"); +- TimingHandler SAMPLER6 = Timings.ofSafe("Timings Sampler 6"); +- +- long start = System.nanoTime(); +- for (int i = 0; i < passes; i++) { +- SAMPLER1.startTiming(); +- SAMPLER2.startTiming(); +- SAMPLER3.startTiming(); +- SAMPLER3.stopTiming(); +- SAMPLER4.startTiming(); +- SAMPLER5.startTiming(); +- SAMPLER6.startTiming(); +- SAMPLER6.stopTiming(); +- SAMPLER5.stopTiming(); +- SAMPLER4.stopTiming(); +- SAMPLER2.stopTiming(); +- SAMPLER1.stopTiming(); +- } +- long timingsCost = (System.nanoTime() - start) / passes / 6; +- SAMPLER1.reset(true); +- SAMPLER2.reset(true); +- SAMPLER3.reset(true); +- SAMPLER4.reset(true); +- SAMPLER5.reset(true); +- SAMPLER6.reset(true); +- return timingsCost; +- } +- +- private static JSONObject mapAsJSON(ConfigurationSection config, String parentKey) { +- +- JSONObject object = new JSONObject(); +- for (String key : config.getKeys(false)) { +- String fullKey = (parentKey != null ? parentKey + "." + key : key); +- if (fullKey.equals("database") || fullKey.equals("settings.bungeecord-addresses") || TimingsManager.hiddenConfigs.contains(fullKey) || key.startsWith("seed-") || key.equals("worldeditregentempworld") || key.equals("feature-seeds")) { +- continue; +- } +- final Object val = config.get(key); +- +- object.put(key, valAsJSON(val, fullKey)); +- } +- return object; +- } +- +- private static Object valAsJSON(Object val, final String parentKey) { +- if (!(val instanceof MemorySection)) { +- if (val instanceof List) { +- Iterable v = (Iterable) val; +- return toArrayMapper(v, input -> valAsJSON(input, parentKey)); +- } else { +- return String.valueOf(val); +- } +- } else { +- return mapAsJSON((ConfigurationSection) val, parentKey); +- } +- } +- +- @Override +- public void run() { +- out.put("data", toArrayMapper(history, TimingHistory::export)); +- +- +- String response = null; +- String timingsURL = null; +- try { +- HttpURLConnection con = (HttpURLConnection) new URL(TimingsManager.url + "post").openConnection(); +- con.setDoOutput(true); +- String hostName = "BrokenHost"; +- try { +- hostName = InetAddress.getLocalHost().getHostName(); +- } catch (Exception ignored) {} +- con.setRequestProperty("User-Agent", "Paper/" + Bukkit.getUnsafe().getTimingsServerName() + "/" + hostName); +- con.setRequestMethod("POST"); +- con.setInstanceFollowRedirects(false); +- +- OutputStream request = new GZIPOutputStream(con.getOutputStream()) {{ +- this.def.setLevel(7); +- }}; +- +- request.write(JSONValue.toJSONString(out).getBytes("UTF-8")); +- request.close(); +- +- response = getResponse(con); +- +- if (con.getResponseCode() != 302) { +- listeners.sendMessage(text( "Upload Error: " + con.getResponseCode() + ": " + con.getResponseMessage(), NamedTextColor.RED)); +- listeners.sendMessage(text("Check your logs for more information", NamedTextColor.RED)); +- if (response != null) { +- Bukkit.getLogger().log(Level.SEVERE, response); +- } +- return; +- } +- +- timingsURL = con.getHeaderField("Location"); +- listeners.sendMessage(text("View Timings Report: ", NamedTextColor.GREEN).append(text(timingsURL).clickEvent(ClickEvent.clickEvent(ClickEvent.Action.OPEN_URL, timingsURL)))); +- +- if (response != null && !response.isEmpty()) { +- Bukkit.getLogger().log(Level.INFO, "Timing Response: " + response); +- } +- } catch (IOException ex) { +- listeners.sendMessage(text("Error uploading timings, check your logs for more information", NamedTextColor.RED)); +- if (response != null) { +- Bukkit.getLogger().log(Level.SEVERE, response); +- } +- Bukkit.getLogger().log(Level.SEVERE, "Could not paste timings", ex); +- } finally { +- this.listeners.done(timingsURL); +- } +- } +- +- private String getResponse(HttpURLConnection con) throws IOException { +- InputStream is = null; +- try { +- is = con.getInputStream(); +- ByteArrayOutputStream bos = new ByteArrayOutputStream(); +- +- byte[] b = new byte[1024]; +- int bytesRead; +- while ((bytesRead = is.read(b)) != -1) { +- bos.write(b, 0, bytesRead); +- } +- return bos.toString(); +- +- } catch (IOException ex) { +- listeners.sendMessage(text("Error uploading timings, check your logs for more information", NamedTextColor.RED)); +- Bukkit.getLogger().log(Level.WARNING, con.getResponseMessage(), ex); +- return null; +- } finally { +- if (is != null) { +- is.close(); +- } +- } +- } +-} +diff --git a/src/main/java/co/aikar/timings/WorldTimingsHandler.java b/src/main/java/co/aikar/timings/WorldTimingsHandler.java +deleted file mode 100644 +index 22687667ec69a954261e55e59261286ac1b8b8cd..0000000000000000000000000000000000000000 +--- a/src/main/java/co/aikar/timings/WorldTimingsHandler.java ++++ /dev/null +@@ -1,140 +0,0 @@ +-package co.aikar.timings; +- +-import net.minecraft.server.level.ServerLevel; +-import net.minecraft.world.level.Level; +-import net.minecraft.world.level.storage.PrimaryLevelData; +- +-/** +- * Set of timers per world, to track world specific timings. +- */ +-// TODO: Re-implement missing timers +-@Deprecated(forRemoval = true) +-public class WorldTimingsHandler { +- public final Timing mobSpawn; +- public final Timing doChunkUnload; +- public final Timing doPortalForcer; +- public final Timing scheduledBlocks; +- public final Timing scheduledBlocksCleanup; +- public final Timing scheduledBlocksTicking; +- public final Timing chunkTicks; +- public final Timing lightChunk; +- public final Timing chunkTicksBlocks; +- public final Timing doVillages; +- public final Timing doChunkMap; +- public final Timing doChunkMapUpdate; +- public final Timing doChunkMapToUpdate; +- public final Timing doChunkMapSortMissing; +- public final Timing doChunkMapSortSendToPlayers; +- public final Timing doChunkMapPlayersNeedingChunks; +- public final Timing doChunkMapPendingSendToPlayers; +- public final Timing doChunkMapUnloadChunks; +- public final Timing doChunkGC; +- public final Timing doSounds; +- public final Timing entityRemoval; +- public final Timing entityTick; +- public final Timing tileEntityTick; +- public final Timing tileEntityPending; +- public final Timing tracker1; +- public final Timing tracker2; +- public final Timing doTick; +- public final Timing tickEntities; +- public final Timing chunks; +- public final Timing newEntities; +- public final Timing raids; +- public final Timing chunkProviderTick; +- public final Timing broadcastChunkUpdates; +- public final Timing countNaturalMobs; +- +- public final Timing chunkLoad; +- public final Timing chunkLoadPopulate; +- public final Timing syncChunkLoad; +- public final Timing chunkLoadLevelTimer; +- public final Timing chunkIO; +- public final Timing chunkPostLoad; +- public final Timing worldSave; +- public final Timing worldSaveChunks; +- public final Timing worldSaveLevel; +- public final Timing chunkSaveData; +- +- +- public final Timing miscMobSpawning; +- +- public final Timing poiUnload; +- public final Timing chunkUnload; +- public final Timing poiSaveDataSerialization; +- public final Timing chunkSave; +- public final Timing chunkSaveDataSerialization; +- public final Timing chunkSaveIOWait; +- public final Timing chunkUnloadPrepareSave; +- public final Timing chunkUnloadPOISerialization; +- public final Timing chunkUnloadDataSave; +- +- public WorldTimingsHandler(Level server) { +- String name = ((PrimaryLevelData) server.getLevelData()).getLevelName() + " - "; +- +- mobSpawn = Timings.ofSafe(name + "mobSpawn"); +- doChunkUnload = Timings.ofSafe(name + "doChunkUnload"); +- scheduledBlocks = Timings.ofSafe(name + "Scheduled Blocks"); +- scheduledBlocksCleanup = Timings.ofSafe(name + "Scheduled Blocks - Cleanup"); +- scheduledBlocksTicking = Timings.ofSafe(name + "Scheduled Blocks - Ticking"); +- chunkTicks = Timings.ofSafe(name + "Chunk Ticks"); +- lightChunk = Timings.ofSafe(name + "Light Chunk"); +- chunkTicksBlocks = Timings.ofSafe(name + "Chunk Ticks - Blocks"); +- doVillages = Timings.ofSafe(name + "doVillages"); +- doChunkMap = Timings.ofSafe(name + "doChunkMap"); +- doChunkMapUpdate = Timings.ofSafe(name + "doChunkMap - Update"); +- doChunkMapToUpdate = Timings.ofSafe(name + "doChunkMap - To Update"); +- doChunkMapSortMissing = Timings.ofSafe(name + "doChunkMap - Sort Missing"); +- doChunkMapSortSendToPlayers = Timings.ofSafe(name + "doChunkMap - Sort Send To Players"); +- doChunkMapPlayersNeedingChunks = Timings.ofSafe(name + "doChunkMap - Players Needing Chunks"); +- doChunkMapPendingSendToPlayers = Timings.ofSafe(name + "doChunkMap - Pending Send To Players"); +- doChunkMapUnloadChunks = Timings.ofSafe(name + "doChunkMap - Unload Chunks"); +- doSounds = Timings.ofSafe(name + "doSounds"); +- doChunkGC = Timings.ofSafe(name + "doChunkGC"); +- doPortalForcer = Timings.ofSafe(name + "doPortalForcer"); +- entityTick = Timings.ofSafe(name + "entityTick"); +- entityRemoval = Timings.ofSafe(name + "entityRemoval"); +- tileEntityTick = Timings.ofSafe(name + "tileEntityTick"); +- tileEntityPending = Timings.ofSafe(name + "tileEntityPending"); +- +- chunkLoad = Timings.ofSafe(name + "Chunk Load"); +- chunkLoadPopulate = Timings.ofSafe(name + "Chunk Load - Populate"); +- syncChunkLoad = Timings.ofSafe(name + "Sync Chunk Load"); +- chunkLoadLevelTimer = Timings.ofSafe(name + "Chunk Load - Load Level"); +- chunkIO = Timings.ofSafe(name + "Chunk Load - DiskIO"); +- chunkPostLoad = Timings.ofSafe(name + "Chunk Load - Post Load"); +- worldSave = Timings.ofSafe(name + "World Save"); +- worldSaveLevel = Timings.ofSafe(name + "World Save - Level"); +- worldSaveChunks = Timings.ofSafe(name + "World Save - Chunks"); +- chunkSaveData = Timings.ofSafe(name + "Chunk Save - Data"); +- +- tracker1 = Timings.ofSafe(name + "tracker stage 1"); +- tracker2 = Timings.ofSafe(name + "tracker stage 2"); +- doTick = Timings.ofSafe(name + "doTick"); +- tickEntities = Timings.ofSafe(name + "tickEntities"); +- +- chunks = Timings.ofSafe(name + "Chunks"); +- newEntities = Timings.ofSafe(name + "New entity registration"); +- raids = Timings.ofSafe(name + "Raids"); +- chunkProviderTick = Timings.ofSafe(name + "Chunk provider tick"); +- broadcastChunkUpdates = Timings.ofSafe(name + "Broadcast chunk updates"); +- countNaturalMobs = Timings.ofSafe(name + "Count natural mobs"); +- +- +- miscMobSpawning = Timings.ofSafe(name + "Mob spawning - Misc"); +- +- poiUnload = Timings.ofSafe(name + "Chunk unload - POI"); +- chunkUnload = Timings.ofSafe(name + "Chunk unload - Chunk"); +- poiSaveDataSerialization = Timings.ofSafe(name + "Chunk save - POI Data serialization"); +- chunkSave = Timings.ofSafe(name + "Chunk save - Chunk"); +- chunkSaveDataSerialization = Timings.ofSafe(name + "Chunk save - Chunk Data serialization"); +- chunkSaveIOWait = Timings.ofSafe(name + "Chunk save - Chunk IO Wait"); +- chunkUnloadPrepareSave = Timings.ofSafe(name + "Chunk unload - Async Save Prepare"); +- chunkUnloadPOISerialization = Timings.ofSafe(name + "Chunk unload - POI Data Serialization"); +- chunkUnloadDataSave = Timings.ofSafe(name + "Chunk unload - Data Serialization"); +- } +- +- public static Timing getTickList(ServerLevel worldserver, String timingsType) { +- return Timings.ofSafe(((PrimaryLevelData) worldserver.getLevelData()).getLevelName() + " - Scheduled " + timingsType); +- } +-} +diff --git a/src/main/java/gg/pufferfish/pufferfish/compat/ServerConfigurations.java b/src/main/java/gg/pufferfish/pufferfish/compat/ServerConfigurations.java +index 4ad189d52b27560424ddb311d0817a334637dc95..f7e64bcd8810f7f5782d5314ec16290dc30cb518 100644 +--- a/src/main/java/gg/pufferfish/pufferfish/compat/ServerConfigurations.java ++++ b/src/main/java/gg/pufferfish/pufferfish/compat/ServerConfigurations.java +@@ -1,6 +1,6 @@ + package gg.pufferfish.pufferfish.compat; + +-import co.aikar.timings.TimingsManager; ++// import co.aikar.timings.TimingsManager; // Thunderbolt - Remove remaining timings implementations + import com.google.common.io.Files; + import org.bukkit.configuration.InvalidConfigurationException; + import org.bukkit.configuration.file.YamlConfiguration; +@@ -37,7 +37,7 @@ public class ServerConfigurations { + + public static String getCleanCopy(String configName) throws IOException { + File file = new File(configName); +- List hiddenConfigs = TimingsManager.hiddenConfigs; ++ // List hiddenConfigs = TimingsManager.hiddenConfigs; // Thunderbolt - Remove remaining timings implementations + + switch (Files.getFileExtension(configName)) { + case "properties": { +@@ -45,9 +45,11 @@ public class ServerConfigurations { + try (FileInputStream inputStream = new FileInputStream(file)) { + properties.load(inputStream); + } ++ /* // Thunderbolt - Remove remaining timings implementations + for (String hiddenConfig : hiddenConfigs) { + properties.remove(hiddenConfig); + } ++ */ // Thunderbolt - Remove remaining timings implementations + ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); + properties.store(outputStream, ""); + return Arrays.stream(outputStream.toString() +@@ -63,11 +65,13 @@ public class ServerConfigurations { + throw new IOException(e); + } + configuration.options().header(null); ++ /* // Thunderbolt - Remove remaining timings implementations + for (String key : configuration.getKeys(true)) { + if (hiddenConfigs.contains(key)) { + configuration.set(key, null); + } + } ++ */ // Thunderbolt - Remove remaining timings implementations + return configuration.saveToString(); + } + default: +diff --git a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java +index 8445a0b25d647b2c1f9a44f849084cdec0842e18..bf6233c3cee2554dd2970f3e5e7ad30aaef2fd96 100644 +--- a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java ++++ b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java +@@ -1,6 +1,6 @@ + package io.papermc.paper.configuration; + +-import co.aikar.timings.MinecraftTimings; ++// import co.aikar.timings.MinecraftTimings; // Thunderbolt - Remove remaining timings implementations + import com.mojang.logging.LogUtils; + import io.papermc.paper.configuration.constraint.Constraints; + import io.papermc.paper.configuration.type.number.IntOr; +@@ -93,6 +93,7 @@ public class GlobalConfiguration extends ConfigurationPart { + public boolean useDisplayNameInQuitMessage = false; + } + ++ /* // Thunderbolt - Remove remaining timings implementations + @Deprecated(forRemoval = true) + public Timings timings; + +@@ -124,6 +125,7 @@ public class GlobalConfiguration extends ConfigurationPart { + MinecraftTimings.processConfig(this); + } + } ++ */ // Thunderbolt - Remove remaining timings implementations + + public Proxies proxies; + +diff --git a/src/main/java/io/papermc/paper/plugin/manager/PaperEventManager.java b/src/main/java/io/papermc/paper/plugin/manager/PaperEventManager.java +index 23594fb7eb4b2f33146592866608c2858ef23937..db405389e7b3ec6136cb68161d437940d242ff13 100644 +--- a/src/main/java/io/papermc/paper/plugin/manager/PaperEventManager.java ++++ b/src/main/java/io/papermc/paper/plugin/manager/PaperEventManager.java +@@ -1,6 +1,6 @@ + package io.papermc.paper.plugin.manager; + +-import co.aikar.timings.TimedEventExecutor; ++// import co.aikar.timings.TimedEventExecutor; // Thunderbolt - Remove remaining timings implementations + import com.destroystokyo.paper.event.server.ServerExceptionEvent; + import com.destroystokyo.paper.exception.ServerEventException; + import com.google.common.collect.Sets; +@@ -96,7 +96,7 @@ class PaperEventManager { + throw new IllegalPluginAccessException("Plugin attempted to register " + event + " while not enabled"); + } + +- executor = new TimedEventExecutor(executor, plugin, null, event); ++ // executor = new TimedEventExecutor(executor, plugin, null, event); // Thunderbolt - Remove remaining timings implementations + this.getEventListeners(event).register(new RegisteredListener(listener, executor, priority, plugin, ignoreCancelled)); + } + +@@ -183,7 +183,7 @@ class PaperEventManager { + } + } + +- EventExecutor executor = new TimedEventExecutor(EventExecutor.create(method, eventClass), plugin, method, eventClass); ++ EventExecutor executor = EventExecutor.create(method, eventClass); // Thunderbolt - Remove remaining timings implementations + eventSet.add(new RegisteredListener(listener, executor, eh.priority(), plugin, eh.ignoreCancelled())); + } + return ret; +diff --git a/src/main/java/io/papermc/paper/plugin/manager/PaperPluginManagerImpl.java b/src/main/java/io/papermc/paper/plugin/manager/PaperPluginManagerImpl.java +index 097500a59336db1bbfffcd1aa4cff7a8586e46ec..844e340c331c6dd12eaaac247f871b042ceb6c25 100644 +--- a/src/main/java/io/papermc/paper/plugin/manager/PaperPluginManagerImpl.java ++++ b/src/main/java/io/papermc/paper/plugin/manager/PaperPluginManagerImpl.java +@@ -232,7 +232,7 @@ public class PaperPluginManagerImpl implements PluginManager, DependencyContext + + @Override + public boolean useTimings() { +- return co.aikar.timings.Timings.isTimingsEnabled(); ++ return false; // Thunderbolt - Remove remaining timings implementations + } + + @Override +diff --git a/src/main/java/net/minecraft/network/protocol/PacketUtils.java b/src/main/java/net/minecraft/network/protocol/PacketUtils.java +index 8c134a642ccaf3530022f2e675a858d726e1dda4..2cc6668b64c5e8ae3c39a934efae95933e1c83db 100644 +--- a/src/main/java/net/minecraft/network/protocol/PacketUtils.java ++++ b/src/main/java/net/minecraft/network/protocol/PacketUtils.java +@@ -50,7 +50,7 @@ public class PacketUtils { + try { // Paper - detailed watchdog information + if (listener instanceof ServerCommonPacketListenerImpl serverCommonPacketListener && serverCommonPacketListener.processedDisconnect) return; // CraftBukkit - Don't handle sync packets for kicked players + if (listener.shouldHandleMessage(packet)) { +- co.aikar.timings.Timing timing = co.aikar.timings.MinecraftTimings.getPacketTiming(packet); // Paper - timings ++ // co.aikar.timings.Timing timing = co.aikar.timings.MinecraftTimings.getPacketTiming(packet); // Paper - timings // Thunderbolt - Remove remaining timings implementations + try { // Paper - timings // Purpur + packet.handle(listener); + } catch (Exception exception) { +diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java +index 72a8033f7a0f4c1564e05da31c7015ef2a6694c5..90d74011cd27f2ea151e9eb76675c30c822d8835 100644 +--- a/src/main/java/net/minecraft/server/MinecraftServer.java ++++ b/src/main/java/net/minecraft/server/MinecraftServer.java +@@ -193,7 +193,7 @@ import org.bukkit.craftbukkit.Main; + import org.bukkit.event.server.ServerLoadEvent; + // CraftBukkit end + +-import co.aikar.timings.MinecraftTimings; // Paper ++// import co.aikar.timings.MinecraftTimings; // Paper // Thunderbolt - Remove remaining timings implementations + + public abstract class MinecraftServer extends ReentrantBlockableEventLoop implements ServerInfo, CommandSource, AutoCloseable { + +@@ -990,7 +990,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop waitable = new Waitable<>() { +@@ -858,9 +859,10 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface + co.aikar.timings.Timings.generateReport(new co.aikar.timings.TimingsReportListener(sender, waitable)); + } else { + // Paper end ++ */ // Thunderbolt - Remove remaining timings implementations + ConsoleInput serverCommand = new ConsoleInput(event.getCommand(), wrapper); + this.server.dispatchServerCommand(event.getSender(), serverCommand); +- } // Paper ++ // } // Paper // Thunderbolt - Remove remaining timings implementations + }); + // Paper start + if (waitableArray[0] != null) { +diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java +index 873ef80c02b4c6494529a6327faf82902a0181da..9afadf28d33275d3e9f35fdcc6cf679d6b117457 100644 +--- a/src/main/java/net/minecraft/server/level/ServerLevel.java ++++ b/src/main/java/net/minecraft/server/level/ServerLevel.java +@@ -1,7 +1,7 @@ + package net.minecraft.server.level; + + import com.google.common.annotations.VisibleForTesting; +-import co.aikar.timings.TimingHistory; // Paper ++// import co.aikar.timings.TimingHistory; // Paper // Thunderbolt - Remove remaining timings implementations + import com.google.common.collect.Lists; + import com.mojang.datafixers.DataFixer; + import com.mojang.datafixers.util.Pair; +@@ -1497,9 +1497,9 @@ public class ServerLevel extends Level implements WorldGenLevel { + currentlyTickingEntity.lazySet(entity); + } + // Paper end - log detailed entity tick information +- ++TimingHistory.entityTicks; // Paper - timings ++ //++TimingHistory.entityTicks; // Paper - timings // Thunderbolt - Remove remaining timings implementations + // Spigot start +- co.aikar.timings.Timing timer; // Paper ++ //co.aikar.timings.Timing timer; // Paper // Thunderbolt - Remove remaining timings implementations + /*if (!org.spigotmc.ActivationRange.checkIfActive(entity)) { // Paper - comment out - EAR 2, reimplement below + entity.tickCount++; + timer = entity.getType().inactiveTickTimer.startTiming(); try { // Paper - timings +@@ -1522,7 +1522,7 @@ public class ServerLevel extends Level implements WorldGenLevel { + });*/ // Purpur + //gameprofilerfiller.incrementCounter("tickNonPassenger"); // Purpur + if (isActive) { // Paper - EAR 2 +- TimingHistory.activatedEntityTicks++; ++ // TimingHistory.activatedEntityTicks++; // Thunderbolt - Remove remaining timings implementations + entity.tick(); + entity.postTick(); // CraftBukkit + } else { entity.inactiveTick(); } // Paper - EAR 2 +diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java +index fdfe8f5bc5ad0e5f5ded41d87756a5866d041df1..9e519813080e76b43ad68f1a67b0dd0610062b68 100644 +--- a/src/main/java/net/minecraft/server/players/PlayerList.java ++++ b/src/main/java/net/minecraft/server/players/PlayerList.java +@@ -1,6 +1,6 @@ + package net.minecraft.server.players; + +-import co.aikar.timings.MinecraftTimings; ++// import co.aikar.timings.MinecraftTimings; // Thunderbolt - Remove remaining timings implementations + import com.google.common.collect.Lists; + import com.google.common.collect.Maps; + import com.google.common.collect.Sets; +diff --git a/src/main/java/net/minecraft/world/entity/EntityType.java b/src/main/java/net/minecraft/world/entity/EntityType.java +index 32a1b5a1d01fd4dc603a76fde259f3a0d4749fad..824855365586538ad78dfe379df53e89cd2c60f5 100644 +--- a/src/main/java/net/minecraft/world/entity/EntityType.java ++++ b/src/main/java/net/minecraft/world/entity/EntityType.java +@@ -356,10 +356,12 @@ public class EntityType implements FeatureElement, EntityTypeT + this(factory, spawnGroup, saveable, summonable, fireImmune, spawnableFarFromPlayer, canSpawnInside, dimensions, spawnBoxScale, maxTrackDistance, trackTickInterval, requiredFeatures, "custom"); + } + public EntityType(EntityType.EntityFactory factory, MobCategory spawnGroup, boolean saveable, boolean summonable, boolean fireImmune, boolean spawnableFarFromPlayer, ImmutableSet canSpawnInside, EntityDimensions dimensions, float spawnBoxScale, int maxTrackDistance, int trackTickInterval, FeatureFlagSet requiredFeatures, String id) { ++ /* // Thunderbolt - Remove remaining timings implementations + this.tickTimer = co.aikar.timings.MinecraftTimings.getEntityTimings(id, "tick"); + this.inactiveTickTimer = co.aikar.timings.MinecraftTimings.getEntityTimings(id, "inactiveTick"); + this.passengerTickTimer = co.aikar.timings.MinecraftTimings.getEntityTimings(id, "passengerTick"); + this.passengerInactiveTickTimer = co.aikar.timings.MinecraftTimings.getEntityTimings(id, "passengerInactiveTick"); ++ */ // Thunderbolt - Remove remaining timings implementations + // Paper end + this.builtInRegistryHolder = BuiltInRegistries.ENTITY_TYPE.createIntrusiveHolder(this); + this.factory = factory; +@@ -730,10 +732,12 @@ public class EntityType implements FeatureElement, EntityTypeT + } + + // Paper start - timings ++ /* // Thunderbolt - Remove remaining timings implementations + public final co.aikar.timings.Timing tickTimer; + public final co.aikar.timings.Timing inactiveTickTimer; + public final co.aikar.timings.Timing passengerTickTimer; + public final co.aikar.timings.Timing passengerInactiveTickTimer; ++ */ // Thunderbolt - Remove remaining timings implementations + // Paper end + public boolean trackDeltas() { + return this != EntityType.PLAYER && this != EntityType.LLAMA_SPIT && this != EntityType.WITHER && this != EntityType.BAT && this != EntityType.ITEM_FRAME && this != EntityType.GLOW_ITEM_FRAME && this != EntityType.LEASH_KNOT && this != EntityType.PAINTING && this != EntityType.END_CRYSTAL && this != EntityType.EVOKER_FANGS; +diff --git a/src/main/java/net/minecraft/world/entity/ai/behavior/Behavior.java b/src/main/java/net/minecraft/world/entity/ai/behavior/Behavior.java +index 612a14806ec63b0dcf31814396282f4b7f4a527c..b72936610ae125d1d972608364c79c85703f987e 100644 +--- a/src/main/java/net/minecraft/world/entity/ai/behavior/Behavior.java ++++ b/src/main/java/net/minecraft/world/entity/ai/behavior/Behavior.java +@@ -16,7 +16,7 @@ public abstract class Behavior implements BehaviorContro + private final int maxDuration; + // Paper start - configurable behavior tick rate and timings + private final String configKey; +- private final co.aikar.timings.Timing timing; ++ // private final co.aikar.timings.Timing timing; // Thunderbolt - Remove remaining timings implementations + // Paper end - configurable behavior tick rate and timings + + public Behavior(Map, MemoryStatus> requiredMemoryState) { +@@ -38,7 +38,7 @@ public abstract class Behavior implements BehaviorContro + key = key.substring(lastSeparator + 1); + } + this.configKey = key.toLowerCase(java.util.Locale.ROOT); +- this.timing = co.aikar.timings.MinecraftTimings.getBehaviorTimings(configKey); ++ // this.timing = co.aikar.timings.MinecraftTimings.getBehaviorTimings(configKey); // Thunderbolt - Remove remaining timings implementations + // Paper end - configurable behavior tick rate and timings + } + +diff --git a/src/main/java/net/minecraft/world/entity/ai/sensing/Sensor.java b/src/main/java/net/minecraft/world/entity/ai/sensing/Sensor.java +index 703006eb5df8099c4f51cdb4e41f95cacfbe43a6..a17f85cd0f52fba5d1ca64b20350310102377304 100644 +--- a/src/main/java/net/minecraft/world/entity/ai/sensing/Sensor.java ++++ b/src/main/java/net/minecraft/world/entity/ai/sensing/Sensor.java +@@ -28,7 +28,7 @@ public abstract class Sensor { + private long timeToTick; + // Paper start - configurable sensor tick rate and timings + private final String configKey; +- private final co.aikar.timings.Timing timing; ++ // private final co.aikar.timings.Timing timing; // Thunderbolt - Remove remaining timings implementations + // Paper end + + public Sensor(int senseInterval) { +@@ -39,7 +39,7 @@ public abstract class Sensor { + key = key.substring(lastSeparator + 1); + } + this.configKey = key.toLowerCase(java.util.Locale.ROOT); +- this.timing = co.aikar.timings.MinecraftTimings.getSensorTimings(configKey, senseInterval); ++ // this.timing = co.aikar.timings.MinecraftTimings.getSensorTimings(configKey, senseInterval); // Thunderbolt - Remove remaining timings implementations + // Paper end + this.scanRate = senseInterval; + this.timeToTick = (long)RANDOM.nextInt(senseInterval); +diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java +index 349fb7a53ac5752b60e5167c5e9dc4596ea4442f..271bd95dd351eb026009e2f593017fed6642ae66 100644 +--- a/src/main/java/net/minecraft/world/level/Level.java ++++ b/src/main/java/net/minecraft/world/level/Level.java +@@ -183,7 +183,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable { + + public final com.destroystokyo.paper.antixray.ChunkPacketBlockController chunkPacketBlockController; // Paper - Anti-Xray + public final org.purpurmc.purpur.PurpurWorldConfig purpurConfig; // Purpur +- public final co.aikar.timings.WorldTimingsHandler timings; // Paper ++ // public final co.aikar.timings.WorldTimingsHandler timings; // Paper // Thunderbolt - Remove remaining timings implementations + public static BlockPos lastPhysicsProblem; // Spigot + private org.spigotmc.TickLimiter entityLimiter; + private org.spigotmc.TickLimiter tileLimiter; +@@ -373,7 +373,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable { + public void onBorderSetDamageSafeZOne(WorldBorder border, double safeZoneRadius) {} + }); + // CraftBukkit end +- this.timings = new co.aikar.timings.WorldTimingsHandler(this); // Paper - code below can generate new world and access timings ++ // this.timings = new co.aikar.timings.WorldTimingsHandler(this); // Paper - code below can generate new world and access timings // Thunderbolt - Remove remaining timings implementations + this.entityLimiter = new org.spigotmc.TickLimiter(this.spigotConfig.entityMaxTickTime); + this.tileLimiter = new org.spigotmc.TickLimiter(this.spigotConfig.tileMaxTickTime); + this.chunkPacketBlockController = this.paperConfig().anticheat.antiXray.enabled ? new com.destroystokyo.paper.antixray.ChunkPacketBlockControllerAntiXray(this, executor) : com.destroystokyo.paper.antixray.ChunkPacketBlockController.NO_OPERATION_INSTANCE; // Paper - Anti-Xray +@@ -1396,7 +1396,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable { + + //this.timings.tileEntityTick.stopTiming(); // Spigot // Purpur + this.tickingBlockEntities = false; +- co.aikar.timings.TimingHistory.tileEntityTicks += this.blockEntityTickers.size(); // Paper ++ // co.aikar.timings.TimingHistory.tileEntityTicks += this.blockEntityTickers.size(); // Paper // Thunderbolt - Remove remaining timings implementations + //gameprofilerfiller.pop(); // Purpur + this.spigotConfig.currentPrimedTnt = 0; // Spigot + } +diff --git a/src/main/java/net/minecraft/world/level/block/Block.java b/src/main/java/net/minecraft/world/level/block/Block.java +index 5ae3decf100d21f7d4a471c155eaf5e00e996580..5ed1cbeea5946888ef564a06b9a9d5a1379ca2da 100644 +--- a/src/main/java/net/minecraft/world/level/block/Block.java ++++ b/src/main/java/net/minecraft/world/level/block/Block.java +@@ -107,6 +107,7 @@ public class Block extends BlockBehaviour implements ItemLike { + this != Blocks.STRUCTURE_BLOCK && + this != Blocks.JIGSAW; + } ++ /* // Thunderbolt - Remove remaining timings implementations + public co.aikar.timings.Timing timing; + public co.aikar.timings.Timing getTiming() { + if (timing == null) { +@@ -114,6 +115,7 @@ public class Block extends BlockBehaviour implements ItemLike { + } + return timing; + } ++ */ // Thunderbolt - Remove remaining timings implementations + // Paper end + @Nullable + private String descriptionId; +diff --git a/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java +index 8dc1436fe78759cee5247cc28e8a18999e738a1b..ace886913b43252c5216b716e1a6b42a652fd411 100644 +--- a/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java ++++ b/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java +@@ -33,14 +33,14 @@ import org.bukkit.craftbukkit.persistence.CraftPersistentDataTypeRegistry; + import org.bukkit.inventory.InventoryHolder; + // CraftBukkit end + +-import org.spigotmc.CustomTimingsHandler; // Spigot +-import co.aikar.timings.MinecraftTimings; // Paper +-import co.aikar.timings.Timing; // Paper ++// import org.spigotmc.CustomTimingsHandler; // Spigot // Thunderbolt - Remove remaining timings implementations ++// import co.aikar.timings.MinecraftTimings; // Paper // Thunderbolt - Remove remaining timings implementations ++// import co.aikar.timings.Timing; // Paper // Thunderbolt - Remove remaining timings implementations + + public abstract class BlockEntity { + static boolean ignoreTileUpdates; // Paper - Perf: Optimize Hoppers + +- public Timing tickTimer = MinecraftTimings.getTileEntityTimings(this); // Paper ++ // public Timing tickTimer = MinecraftTimings.getTileEntityTimings(this); // Paper // Thunderbolt - Remove remaining timings implementations + // CraftBukkit start - data containers + private static final CraftPersistentDataTypeRegistry DATA_TYPE_REGISTRY = new CraftPersistentDataTypeRegistry(); + public CraftPersistentDataContainer persistentDataContainer; +diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java +index 529064c9ac5880233cfd82d3bb02fd8ee4bd8ced..6f8114c5642c96628a4b7d13ae539709dbb3691c 100644 +--- a/src/main/java/org/bukkit/craftbukkit/Main.java ++++ b/src/main/java/org/bukkit/craftbukkit/Main.java +@@ -375,8 +375,8 @@ public class Main { + tryPreloadClass("org.jline.terminal.impl.MouseSupport"); + tryPreloadClass("org.jline.terminal.impl.MouseSupport$1"); + tryPreloadClass("org.jline.terminal.Terminal$MouseTracking"); +- tryPreloadClass("co.aikar.timings.TimingHistory"); +- tryPreloadClass("co.aikar.timings.TimingHistory$MinuteReport"); ++ // tryPreloadClass("co.aikar.timings.TimingHistory"); // Thunderbolt - Remove remaining timings implementations ++ // tryPreloadClass("co.aikar.timings.TimingHistory$MinuteReport"); // Thunderbolt - Remove remaining timings implementations + tryPreloadClass("io.netty.channel.AbstractChannelHandlerContext"); + tryPreloadClass("io.netty.channel.AbstractChannelHandlerContext$11"); + tryPreloadClass("io.netty.channel.AbstractChannelHandlerContext$12"); +diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java +index 324495c8be1a54434e7c73158d7d20dba625b7f7..c4e15c73f1912d0cb8eb1b442c0a6a2db1856993 100644 +--- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java ++++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java +@@ -1,6 +1,6 @@ + package org.bukkit.craftbukkit.scheduler; + +-import co.aikar.timings.MinecraftTimings; // Paper ++// import co.aikar.timings.MinecraftTimings; // Paper // Thunderbolt - Remove remaining timings implementations + import com.google.common.base.Preconditions; + import com.google.common.util.concurrent.ThreadFactoryBuilder; + import java.util.ArrayList; +@@ -304,7 +304,7 @@ public class CraftScheduler implements BukkitScheduler { + } + return false; + } +- }){{this.timings=co.aikar.timings.MinecraftTimings.getCancelTasksTimer();}}; // Paper ++ })/*{{this.timings=co.aikar.timings.MinecraftTimings.getCancelTasksTimer();}}*/; // Paper // Thunderbolt - Remove remaining timings implementations + this.handle(task, 0L); + for (CraftTask taskPending = this.head.getNext(); taskPending != null; taskPending = taskPending.getNext()) { + if (taskPending == task) { +@@ -344,7 +344,7 @@ public class CraftScheduler implements BukkitScheduler { + } + } + } +- }){{this.timings=co.aikar.timings.MinecraftTimings.getCancelTasksTimer(plugin);}}; // Paper ++ })/*{{this.timings=co.aikar.timings.MinecraftTimings.getCancelTasksTimer(plugin);}}*/; // Paper // Thunderbolt - Remove remaining timings implementations + this.handle(task, 0L); + for (CraftTask taskPending = this.head.getNext(); taskPending != null; taskPending = taskPending.getNext()) { + if (taskPending == task) { +diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java +index 5835dc236b3f5291a804f7fb14a12eb466d4e0ba..878d8800f35c49a04a1632381e64137fbe619937 100644 +--- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java ++++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java +@@ -2,14 +2,14 @@ package org.bukkit.craftbukkit.scheduler; + + import java.util.function.Consumer; + +-import co.aikar.timings.NullTimingHandler; ++// import co.aikar.timings.NullTimingHandler; // Thunderbolt - Remove remaining timings implementations + import org.bukkit.Bukkit; + import org.bukkit.plugin.Plugin; + import org.bukkit.scheduler.BukkitTask; + +-import org.spigotmc.CustomTimingsHandler; // Spigot +-import co.aikar.timings.MinecraftTimings; // Paper +-import co.aikar.timings.Timing; // Paper ++// import org.spigotmc.CustomTimingsHandler; // Spigot // Thunderbolt - Remove remaining timings implementations ++// import co.aikar.timings.MinecraftTimings; // Paper // Thunderbolt - Remove remaining timings implementations ++// import co.aikar.timings.Timing; // Paper // Thunderbolt - Remove remaining timings implementations + + public class CraftTask implements BukkitTask, Runnable { // Spigot + +@@ -31,7 +31,7 @@ public class CraftTask implements BukkitTask, Runnable { // Spigot + private long nextRun; + public final Runnable rTask; // Paper + public final Consumer cTask; // Paper +- public Timing timings; // Paper ++ // public Timing timings; // Paper // Thunderbolt - Remove remaining timings implementations + private final Plugin plugin; + private final int id; + private final long createdAt = System.nanoTime(); +@@ -55,7 +55,7 @@ public class CraftTask implements BukkitTask, Runnable { // Spigot + this.id = id; + this.period = CraftTask.NO_REPEATING; + this.taskName = taskName; +- this.timings = MinecraftTimings.getInternalTaskName(taskName); ++ // this.timings = MinecraftTimings.getInternalTaskName(taskName); // Thunderbolt - Remove remaining timings implementations + } + // Paper end + +@@ -76,7 +76,7 @@ public class CraftTask implements BukkitTask, Runnable { // Spigot + } + this.id = id; + this.period = period; +- timings = task != null ? MinecraftTimings.getPluginTaskTimings(this, period) : NullTimingHandler.NULL; // Paper ++ // timings = task != null ? MinecraftTimings.getPluginTaskTimings(this, period) : NullTimingHandler.NULL; // Paper // Thunderbolt - Remove remaining timings implementations + } + + @Override +diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java +index ef222478b46b5edc7b4c6d636a5b452fb10221bc..070e1a97e0d18402db8376fde9d71f31ba3d4388 100644 +--- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java ++++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java +@@ -215,6 +215,7 @@ public final class CraftMagicNumbers implements UnsafeValues { + return ENTITY_TYPES_ENTITY_TYPE.get(entityTypes); + } + // Paper end ++ /* // Thunderbolt - Remove remaining timings implementations + // ======================================================================== + // Paper start + @Override +@@ -222,6 +223,7 @@ public final class CraftMagicNumbers implements UnsafeValues { + co.aikar.timings.TimingsExport.reportTimings(); + } + // Paper end ++ */ // Thunderbolt - Remove remaining timings implementations + + public static byte toLegacyData(BlockState data) { + return CraftLegacy.toLegacyData(data); +@@ -504,10 +506,12 @@ public final class CraftMagicNumbers implements UnsafeValues { + return new CraftDamageSourceBuilder(damageType); + } + // Paper start ++ /* // Thunderbolt - Remove remaining timings implementations + @Override + public String getTimingsServerName() { + return io.papermc.paper.configuration.GlobalConfiguration.get().timings.serverName; + } ++ */ // Thunderbolt - Remove remaining timings implementations + + @Override + public com.destroystokyo.paper.util.VersionFetcher getVersionFetcher() { +diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java +index 583647f6c9ca0fb092f30c97693bd548f692dfd3..a46f90860b5d3565bae429b6d5a60edf90a4299f 100644 +--- a/src/main/java/org/spigotmc/ActivationRange.java ++++ b/src/main/java/org/spigotmc/ActivationRange.java +@@ -35,7 +35,7 @@ import net.minecraft.world.entity.projectile.FireworkRocketEntity; + import net.minecraft.world.entity.projectile.ThrowableProjectile; + import net.minecraft.world.entity.projectile.ThrownTrident; + import net.minecraft.world.entity.raid.Raider; +-import co.aikar.timings.MinecraftTimings; ++// import co.aikar.timings.MinecraftTimings; // Thunderbolt - Remove remaining timings implementations + import net.minecraft.world.entity.schedule.Activity; + import net.minecraft.world.level.Level; + import net.minecraft.world.phys.AABB; diff --git a/settings.gradle.kts b/settings.gradle.kts new file mode 100644 index 0000000..939bf06 --- /dev/null +++ b/settings.gradle.kts @@ -0,0 +1,53 @@ +import java.util.Locale + +val projectName = "Thunderbolt" + +pluginManagement { + repositories { + gradlePluginPortal() + maven("https://repo.papermc.io/repository/maven-public/") + } +} + +plugins { + id("org.gradle.toolchains.foojay-resolver-convention") version "0.4.0" +} + +if (!file(".git").exists()) { + val errorText = """ + + =================================[ ERROR ]================================= + The Thunderbolt project directory is not a properly cloned Git repository. + + In order to build Volt from source you must clone + the repository using Git, not download a code zip from GitHub. + + See https://github.com/PaperMC/Paper/blob/master/CONTRIBUTING.md + for further information on building and modifying Thunderbolt. + =========================================================================== + """.trimIndent() + error(errorText) +} + +if (file("libs").exists()) { + dependencyResolutionManagement { + versionCatalogs { + create("api") { + from(files("libs/api.versions.toml")) + } + create("server") { + from(files("libs/server.versions.toml")) + } + create("common") { + from(files("libs/common.versions.toml")) + } + } + } +} + +rootProject.name = projectName.lowercase() +for (name in listOf("$projectName-API", "$projectName-Server")) { + val projName = name.lowercase(Locale.ENGLISH) + include(projName) + findProject(":$projName")!!.projectDir = file(name) +} diff --git a/upstream b/upstream new file mode 120000 index 0000000..39acbba --- /dev/null +++ b/upstream @@ -0,0 +1 @@ +.gradle/caches/paperweight/upstreams/plazma \ No newline at end of file