mirror of
https://github.com/IntellectualSites/PlotSquared.git
synced 2025-07-03 14:14:43 +02:00
Compare commits
1 Commits
fix/v7/min
...
fix/v6/mis
| Author | SHA1 | Date | |
|---|---|---|---|
| 764d3b8166 |
3
.github/ISSUE_TEMPLATE/bug_report.yml
vendored
3
.github/ISSUE_TEMPLATE/bug_report.yml
vendored
@ -7,7 +7,7 @@ body:
|
|||||||
attributes:
|
attributes:
|
||||||
value: |
|
value: |
|
||||||
Thanks for taking the time to fill out this bug report for PlotSquared! Fill out the following form to your best ability to help us fix the problem.
|
Thanks for taking the time to fill out this bug report for PlotSquared! Fill out the following form to your best ability to help us fix the problem.
|
||||||
Only use this if you're absolutely sure that you found a bug and can reproduce it. For anything else, use: [our Discord server](https://discord.gg/intellectualsites) or [the wiki](https://intellectualsites.github.io/plotsquared-documentation/).
|
Only use this if you're absolutely sure that you found a bug and can reproduce it. For anything else, use: [our Discord server](https://discord.gg/intellectualsites) or [the wiki](https://github.com/IntellectualSites/PlotSquared-Documentation/wiki).
|
||||||
Do NOT use the public issue tracker to report security vulnerabilities! They are disclosed using [this](https://forms.gle/btgdRn9yhGtzEiGW8) form!
|
Do NOT use the public issue tracker to report security vulnerabilities! They are disclosed using [this](https://forms.gle/btgdRn9yhGtzEiGW8) form!
|
||||||
|
|
||||||
- type: dropdown
|
- type: dropdown
|
||||||
@ -27,7 +27,6 @@ body:
|
|||||||
description: Which server version version you using? If your server version is not listed, it is not supported. Update to a supported version first.
|
description: Which server version version you using? If your server version is not listed, it is not supported. Update to a supported version first.
|
||||||
multiple: false
|
multiple: false
|
||||||
options:
|
options:
|
||||||
- '1.18.2'
|
|
||||||
- '1.18.1'
|
- '1.18.1'
|
||||||
- '1.18'
|
- '1.18'
|
||||||
- '1.17.1'
|
- '1.17.1'
|
||||||
|
|||||||
2
.github/ISSUE_TEMPLATE/config.yml
vendored
2
.github/ISSUE_TEMPLATE/config.yml
vendored
@ -4,5 +4,5 @@ contact_links:
|
|||||||
url: https://discord.gg/intellectualsites
|
url: https://discord.gg/intellectualsites
|
||||||
about: Our support Discord, please ask questions and seek support here.
|
about: Our support Discord, please ask questions and seek support here.
|
||||||
- name: PlotSquared Wiki
|
- name: PlotSquared Wiki
|
||||||
url: https://intellectualsites.github.io/plotsquared-documentation/
|
url: https://github.com/IntellectualSites/PlotSquared-Documentation/wiki
|
||||||
about: Take a look at the wiki page for instructions how to setup PlotSquared and use its commands.
|
about: Take a look at the wiki page for instructions how to setup PlotSquared and use its commands.
|
||||||
|
|||||||
2
.github/ISSUE_TEMPLATE/feature_request.yml
vendored
2
.github/ISSUE_TEMPLATE/feature_request.yml
vendored
@ -7,7 +7,7 @@ body:
|
|||||||
attributes:
|
attributes:
|
||||||
value: |
|
value: |
|
||||||
Thanks for taking the time to fill out this feature request for PlotSquared! Fill out the following form to your best ability to help us understand your feature request and greately improve the change of it getting added.
|
Thanks for taking the time to fill out this feature request for PlotSquared! Fill out the following form to your best ability to help us understand your feature request and greately improve the change of it getting added.
|
||||||
For anything else than a feature request, use: [our Discord server](https://discord.gg/intellectualsites) or [the wiki](https://intellectualsites.github.io/plotsquared-documentation/).
|
For anything else than a feature request, use: [our Discord server](https://discord.gg/intellectualsites) or [the wiki](https://github.com/IntellectualSites/PlotSquared-Documentation/wiki).
|
||||||
|
|
||||||
- type: textarea
|
- type: textarea
|
||||||
attributes:
|
attributes:
|
||||||
|
|||||||
7
.github/workflows/build.yml
vendored
7
.github/workflows/build.yml
vendored
@ -4,15 +4,14 @@ on: [ pull_request, push ]
|
|||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
build:
|
build:
|
||||||
if: ${{ github.event_name != 'pull_request' || github.repository != github.event.pull_request.head.repo.full_name }}
|
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout Repository
|
- name: Checkout Repository
|
||||||
uses: actions/checkout@v3
|
uses: actions/checkout@v2.4.0
|
||||||
- name: Validate Gradle Wrapper"
|
- name: Validate Gradle Wrapper"
|
||||||
uses: gradle/wrapper-validation-action@v1
|
uses: gradle/wrapper-validation-action@v1.0.4
|
||||||
- name: Setup Java
|
- name: Setup Java
|
||||||
uses: actions/setup-java@v3
|
uses: actions/setup-java@v2.5.0
|
||||||
with:
|
with:
|
||||||
distribution: temurin
|
distribution: temurin
|
||||||
java-version: 17
|
java-version: 17
|
||||||
|
|||||||
37
.github/workflows/codeql.yml
vendored
37
.github/workflows/codeql.yml
vendored
@ -1,37 +0,0 @@
|
|||||||
name: "CodeQL"
|
|
||||||
|
|
||||||
on:
|
|
||||||
push:
|
|
||||||
branches: [ v6 ]
|
|
||||||
pull_request:
|
|
||||||
# The branches below must be a subset of the branches above
|
|
||||||
branches: [ v6 ]
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
analyze:
|
|
||||||
name: Analyze
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
permissions:
|
|
||||||
actions: read
|
|
||||||
contents: read
|
|
||||||
security-events: write
|
|
||||||
|
|
||||||
strategy:
|
|
||||||
fail-fast: false
|
|
||||||
matrix:
|
|
||||||
language: [ 'java' ]
|
|
||||||
|
|
||||||
steps:
|
|
||||||
- name: Checkout repository
|
|
||||||
uses: actions/checkout@v3
|
|
||||||
|
|
||||||
- name: Initialize CodeQL
|
|
||||||
uses: github/codeql-action/init@v2
|
|
||||||
with:
|
|
||||||
languages: ${{ matrix.language }}
|
|
||||||
|
|
||||||
- name: Autobuild
|
|
||||||
uses: github/codeql-action/autobuild@v2
|
|
||||||
|
|
||||||
- name: Perform CodeQL Analysis
|
|
||||||
uses: github/codeql-action/analyze@v2
|
|
||||||
20
.github/workflows/rebase.yml
vendored
Normal file
20
.github/workflows/rebase.yml
vendored
Normal file
@ -0,0 +1,20 @@
|
|||||||
|
name: Rebase Pull Request
|
||||||
|
on:
|
||||||
|
issue_comment:
|
||||||
|
types: [created]
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
rebase:
|
||||||
|
name: Rebase
|
||||||
|
if: github.event.issue.pull_request != '' && contains(github.event.comment.body, '/rebase') && github.event.comment.author_association == 'MEMBER'
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
steps:
|
||||||
|
- name: Checkout Repository
|
||||||
|
uses: actions/checkout@v2.4.0
|
||||||
|
with:
|
||||||
|
token: ${{ secrets.REBASE_TOKEN }}
|
||||||
|
fetch-depth: 0
|
||||||
|
- name: Automatic Rebase
|
||||||
|
uses: cirrus-actions/rebase@1.5
|
||||||
|
env:
|
||||||
|
GITHUB_TOKEN: ${{ secrets.REBASE_TOKEN }}
|
||||||
3
.github/workflows/release-drafter.yml
vendored
3
.github/workflows/release-drafter.yml
vendored
@ -11,9 +11,8 @@ on:
|
|||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
update_release_draft:
|
update_release_draft:
|
||||||
if: ${{ github.event_name != 'pull_request' || github.repository != github.event.pull_request.head.repo.full_name }}
|
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: release-drafter/release-drafter@v5.19.0
|
- uses: release-drafter/release-drafter@v5.17.5
|
||||||
env:
|
env:
|
||||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
|
|||||||
6
.gitignore
vendored
6
.gitignore
vendored
@ -41,8 +41,7 @@ hs_err_pid*
|
|||||||
*.iml
|
*.iml
|
||||||
|
|
||||||
## Directory-based project format:
|
## Directory-based project format:
|
||||||
/.idea/*
|
.idea/
|
||||||
!/.idea/icon.svg
|
|
||||||
# if you remove the above rule, at least ignore the following:
|
# if you remove the above rule, at least ignore the following:
|
||||||
|
|
||||||
# User-specific stuff:
|
# User-specific stuff:
|
||||||
@ -75,6 +74,9 @@ hs_err_pid*
|
|||||||
# IntelliJ
|
# IntelliJ
|
||||||
/out/
|
/out/
|
||||||
|
|
||||||
|
# mpeltonen/sbt-idea plugin
|
||||||
|
.idea_modules/
|
||||||
|
|
||||||
# JIRA plugin
|
# JIRA plugin
|
||||||
atlassian-ide-plugin.xml
|
atlassian-ide-plugin.xml
|
||||||
|
|
||||||
|
|||||||
49
.idea/icon.svg
generated
49
.idea/icon.svg
generated
@ -1,49 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
|
||||||
<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 4000 3333.3333" height="3333.3333" width="4000" xml:space="preserve" id="svg2" version="1.1">
|
|
||||||
<metadata id="metadata8">
|
|
||||||
<rdf:RDF>
|
|
||||||
<cc:Work rdf:about="">
|
|
||||||
<dc:format>image/svg+xml</dc:format>
|
|
||||||
<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
|
|
||||||
</cc:Work>
|
|
||||||
</rdf:RDF>
|
|
||||||
</metadata>
|
|
||||||
<defs id="defs6">
|
|
||||||
<clipPath id="clipPath18" clipPathUnits="userSpaceOnUse">
|
|
||||||
<path id="path16" d="M 0,2500 H 3000 V 0 H 0 Z" />
|
|
||||||
</clipPath>
|
|
||||||
</defs>
|
|
||||||
<g transform="matrix(1.3333333,0,0,-1.3333333,0,3333.3333)" id="g10">
|
|
||||||
<g id="g12">
|
|
||||||
<g clip-path="url(#clipPath18)" id="g14">
|
|
||||||
<g transform="translate(1486.1511,2242.6453)" id="g20">
|
|
||||||
<path id="path22" style="fill:#2b3f56;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 16.533,10.846 33.211,21.453 50.104,31.699 78.972,-48.281 153.985,-102.704 227.269,-159.144 148.61,-115.422 287.884,-243.01 414.393,-382.333 111.39,-122.861 212.751,-255.152 298.898,-396.971 52.744,-87.322 100.544,-177.884 139.514,-272.214 -11.638,-3.551 -23.108,-7.655 -34.362,-12.286 l -0.24,0.288 c -11.135,12.982 -24.141,24.212 -34.915,37.506 -22.557,23.013 -45.425,45.737 -68.03,68.678 -19.725,20.253 -40.601,39.45 -58.958,60.974 -36.355,36.451 -72.517,73.093 -108.944,109.471 -22.628,26.013 -48.064,49.385 -71.965,74.197 -19.029,19.485 -38.706,38.346 -57.519,57.999 -12.166,14.998 -26.684,27.716 -39.93,41.658 -27.668,27.524 -54.903,55.479 -82.571,82.979 -23.924,27.956 -51.664,52.264 -76.692,79.164 -4.68,4.487 -8.855,10.774 -15.886,11.326 -22.34,34.027 -58.311,57.327 -97.377,67.502 -104.312,99.153 -215.487,191.202 -332.661,274.782 -117.942,-83.94 -229.476,-176.781 -334.484,-276.39 -26.684,-0.024 -53.368,0.024 -80.076,-0.024 0.024,-26.564 0.048,-53.104 0,-79.668 -72.229,-73.021 -139.491,-150.937 -202.385,-232.092 -63.758,-82.619 -121.973,-169.51 -173.541,-260.264 131.932,-69.061 257.864,-149.521 375.926,-240.275 0.096,-26.444 -0.12,-52.888 0.096,-79.332 l 0.744,-0.984 c 20.109,-24.14 43.409,-45.233 65.126,-67.861 15.118,-15.382 30.571,-30.404 45.569,-45.881 17.565,-20.733 37.698,-39.042 56.607,-58.503 19.917,-20.781 41.25,-40.218 59.967,-62.151 29.156,-29.299 58.167,-58.815 87.515,-87.922 29.155,-33.043 61.502,-63.111 92.169,-94.738 13.726,-12.67 25.124,-27.571 38.634,-40.457 25.029,-25.365 50.129,-50.657 75.325,-75.853 -37.914,-51.208 -73.741,-103.952 -107.192,-158.183 -167.83,273.317 -397.235,507.305 -662.37,687.158 -81.875,55.335 -167.23,105.584 -255.681,149.641 -52.815,26.276 -106.831,50.248 -162.239,70.381 99.393,233.628 242.795,446.715 410.289,636.79 93.562,106.088 194.634,205.433 301.466,298.13 C -217.335,-155.808 -111.439,-73.789 0,0" />
|
|
||||||
</g>
|
|
||||||
<g transform="translate(1201.7948,1741.5303)" id="g24">
|
|
||||||
<path id="path26" style="fill:#5693ce;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 105.008,99.609 216.543,192.45 334.485,276.39 451.659,192.81 562.833,100.76 667.146,1.608 c -34.987,8.83 -71.51,9.718 -107.264,6.431 -41.202,-4.296 -82.907,-19.077 -112.543,-48.953 -33.019,-32.155 -49.456,-77.604 -55.311,-122.501 -28.124,27.908 -56.104,55.983 -84.035,84.083 -2.976,2.976 -6.839,4.823 -10.391,6.911 -19.029,26.348 -45.953,46.673 -76.62,57.495 C 187.555,-2.472 151.513,-0.12 116.166,0 Z" />
|
|
||||||
</g>
|
|
||||||
<g transform="translate(919.3342,1429.7462)" id="g28">
|
|
||||||
<path id="path30" style="fill:#5693ce;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 62.894,81.156 130.156,159.072 202.385,232.092 0.048,-244.21 0.024,-488.421 0,-732.631 C 84.323,-409.785 -41.61,-329.325 -173.541,-260.264 -121.973,-169.51 -63.758,-82.619 0,0" />
|
|
||||||
</g>
|
|
||||||
<g transform="translate(1649.134,1700.6166)" id="g32">
|
|
||||||
<path id="path34" style="fill:#feeeef;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 29.635,29.875 71.341,44.657 112.543,48.952 35.754,3.288 72.277,2.4 107.263,-6.431 39.066,-10.174 75.037,-33.474 97.377,-67.501 11.879,-17.661 20.181,-37.411 26.42,-57.687 10.871,-38.802 11.95,-79.356 11.446,-119.358 -44.345,-0.072 -88.69,0.048 -133.035,-0.072 -1.032,30.907 3.263,63.686 -10.175,92.626 -9.526,20.325 -32.107,31.243 -53.751,32.131 -21.453,1.44 -45.065,-4.32 -59.175,-21.597 -12.79,-15.861 -15.382,-37.002 -16.558,-56.655 -1.295,-29.132 3.696,-59.031 17.518,-84.923 16.821,-30.619 39.378,-57.783 64.526,-81.9 31.387,-32.634 67.501,-60.374 97.857,-94.041 27.332,-28.988 51.256,-61.479 68.005,-97.785 20.541,-41.13 26.972,-87.827 25.82,-133.372 -0.912,-32.107 -5.231,-64.406 -16.149,-94.737 -11.59,-31.699 -31.123,-61.047 -58.335,-81.371 -25.124,-19.125 -55.696,-29.852 -86.651,-34.771 -49.552,-6.743 -101.888,-4.847 -148.465,14.854 -35.227,14.829 -64.238,42.689 -81.708,76.548 -20.996,40.242 -27.115,86.339 -27.259,131.212 0.048,17.829 0,35.658 0.048,53.463 44.345,0.048 88.69,-0.023 133.059,0.048 1.728,-35.538 -4.055,-72.06 5.663,-106.807 5.783,-22.173 26.204,-37.794 48.185,-41.754 20.733,-3.431 43.577,-2.015 61.622,9.791 15.502,9.43 23.949,26.78 26.78,44.225 5.903,35.922 1.872,74.293 -15.381,106.688 -16.918,30.595 -39.474,57.711 -64.55,81.899 -33.187,34.099 -71.173,63.254 -102.585,99.081 -26.756,28.867 -49.408,61.646 -65.486,97.641 -24.572,52.48 -26.731,112.422 -20.18,169.102 C -49.456,-77.604 -33.019,-32.155 0,0" />
|
|
||||||
</g>
|
|
||||||
<g transform="translate(1262.7214,1613.126)" id="g36">
|
|
||||||
<path id="path38" style="fill:#feeeef;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 v -301.13 c 23.204,0.024 46.409,-0.048 69.613,0.024 18.525,0.288 38.202,6.575 50.153,21.429 12.43,17.277 13.917,39.522 14.613,60.111 0.024,43.985 -0.048,87.994 0.024,131.979 -0.48,23.637 -0.983,50.369 -17.277,69.23 C 104.864,-5.711 86.867,-0.24 69.589,0 46.385,0.048 23.204,0.024 0,0 m -141.002,128.38 c 26.708,0.048 53.392,0 80.075,0.024 H 55.24 c 35.346,-0.12 71.389,-2.471 104.815,-14.925 30.668,-10.823 57.592,-31.148 76.621,-57.496 26.852,-39.09 36.69,-87.202 38.058,-133.947 0.024,-48.833 0.096,-97.689 -0.024,-146.521 -1.728,-47.993 -11.974,-97.953 -41.514,-136.971 -22.748,-30.644 -57.495,-50.801 -94.281,-59.583 -45.377,-11.878 -92.578,-6.791 -138.891,-7.847 -0.072,-111.799 0,-223.574 -0.024,-335.373 -13.942,0 -27.86,0.024 -41.778,-0.024 -32.802,0.072 -65.605,0 -98.384,0.048 l -0.744,0.984 c -0.216,26.444 0,52.888 -0.096,79.332 0.024,244.211 0.048,488.421 0,732.632 0.048,26.563 0.024,53.103 0,79.667" />
|
|
||||||
</g>
|
|
||||||
<g transform="translate(1966.3174,1675.6364)" id="g40">
|
|
||||||
<path id="path42" style="fill:#2a3746;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 7.031,-0.552 11.206,-6.839 15.885,-11.326 25.029,-26.9 52.768,-51.208 76.693,-79.164 27.667,-27.5 54.903,-55.456 82.571,-82.979 13.246,-13.942 27.764,-26.66 39.93,-41.658 18.813,-19.653 38.49,-38.514 57.519,-57.999 23.9,-24.812 49.337,-48.185 71.965,-74.197 36.427,-36.378 72.589,-73.02 108.943,-109.471 18.358,-21.524 39.234,-40.722 58.959,-60.974 22.605,-22.941 45.473,-45.665 68.03,-68.678 10.774,-13.294 23.78,-24.524 34.914,-37.506 -103.904,-41.97 -203.488,-94.114 -298.922,-152.761 -246.994,-152.28 -466.224,-350.298 -639.333,-583.398 -25.197,25.196 -50.297,50.488 -75.325,75.852 -13.51,12.886 -24.908,27.788 -38.634,40.458 -30.667,31.627 -63.014,61.695 -92.17,94.738 -29.347,29.107 -58.359,58.623 -87.514,87.922 -18.717,21.933 -40.05,41.37 -59.967,62.151 -18.909,19.461 -39.042,37.77 -56.607,58.503 -14.998,15.477 -30.452,30.499 -45.569,45.88 -21.717,22.629 -45.017,43.722 -65.126,67.862 32.779,-0.048 65.582,0.024 98.384,-0.048 114.391,-98.097 220.407,-205.984 315.384,-322.99 92.914,114.318 196.242,220.022 307.753,316.271 30.955,4.919 61.526,15.646 86.65,34.771 27.212,20.325 46.745,49.672 58.335,81.371 107.312,77.988 219.327,149.929 337.509,210.376 -35.299,64.67 -75.829,126.437 -118.254,186.643 C 176.253,-228.037 104.24,-140.115 26.42,-57.687 20.181,-37.41 11.878,-17.661 0,0" />
|
|
||||||
</g>
|
|
||||||
<g transform="translate(1499.3971,1669.1094)" id="g44">
|
|
||||||
<path id="path46" style="fill:#3378bc;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 3.551,-2.088 7.415,-3.935 10.39,-6.911 27.932,-28.1 55.912,-56.175 84.036,-84.083 -6.551,-56.679 -4.392,-116.622 20.18,-169.102 16.078,-35.994 38.73,-68.774 65.486,-97.641 31.412,-35.826 69.398,-64.982 102.585,-99.081 25.076,-24.188 47.632,-51.304 64.55,-81.899 17.253,-32.395 21.284,-70.765 15.381,-106.688 -2.831,-17.445 -11.278,-34.794 -26.78,-44.225 -18.045,-11.806 -40.889,-13.222 -61.622,-9.79 -21.981,3.959 -42.402,19.58 -48.185,41.753 -9.718,34.747 -3.935,71.269 -5.663,106.808 -44.369,-0.072 -88.714,0 -133.059,-0.048 -0.048,-17.806 0,-35.635 -0.048,-53.464 0.144,-44.873 6.263,-90.97 27.259,-131.212 17.47,-33.859 46.481,-61.718 81.708,-76.548 46.577,-19.701 98.913,-21.597 148.465,-14.854 -111.511,-96.249 -214.839,-201.953 -307.753,-316.271 -94.977,117.006 -200.993,224.893 -315.383,322.99 13.918,0.048 27.836,0.024 41.777,0.024 0.024,111.799 -0.048,223.574 0.024,335.372 46.313,1.056 93.514,-4.031 138.891,7.847 36.786,8.783 71.533,28.94 94.282,59.583 29.539,39.018 39.785,88.978 41.513,136.971 0.12,48.833 0.048,97.689 0.024,146.522 C 36.69,-87.203 26.852,-39.09 0,0" />
|
|
||||||
</g>
|
|
||||||
<g transform="translate(1748.0469,1601.6797)" id="g48">
|
|
||||||
<path id="path50" style="fill:#3378bc;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 14.11,17.277 37.722,23.036 59.175,21.597 80.82,20.709 103.4,9.791 112.927,-10.534 c 13.438,-28.94 9.142,-61.719 10.174,-92.626 44.345,0.12 88.691,0 133.036,0.072 0.504,40.002 -0.576,80.556 -11.447,119.358 77.82,-82.428 149.833,-170.35 215.583,-262.664 42.426,-60.207 82.956,-121.973 118.254,-186.643 -118.182,-60.447 -230.196,-132.388 -337.508,-210.376 10.918,30.331 15.238,62.63 16.149,94.737 1.152,45.545 -5.279,92.242 -25.82,133.372 -16.749,36.306 -40.673,68.797 -68.005,97.785 -30.355,33.667 -66.47,61.406 -97.857,94.041 -25.148,24.117 -47.705,51.28 -64.526,81.9 -13.822,25.892 -18.813,55.791 -17.517,84.923 C -15.382,-37.002 -12.79,-15.862 0,0" />
|
|
||||||
</g>
|
|
||||||
<g transform="translate(1262.7214,1613.126)" id="g52">
|
|
||||||
<path id="path54" style="fill:#3378bc;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 23.204,0.024 46.385,0.048 69.589,0 17.278,-0.24 35.275,-5.711 47.537,-18.357 16.294,-18.861 16.797,-45.593 17.277,-69.23 -0.072,-43.985 0,-87.994 -0.024,-131.979 -0.696,-20.589 -2.183,-42.834 -14.613,-60.111 -11.951,-14.854 -31.628,-21.141 -50.153,-21.429 -23.204,-0.072 -46.409,0 -69.613,-0.024 z" />
|
|
||||||
</g>
|
|
||||||
</g>
|
|
||||||
</g>
|
|
||||||
</g>
|
|
||||||
</svg>
|
|
||||||
|
Before Width: | Height: | Size: 10 KiB |
13
.whitesource
Normal file
13
.whitesource
Normal file
@ -0,0 +1,13 @@
|
|||||||
|
{
|
||||||
|
"scanSettings": {
|
||||||
|
"baseBranches": ["v6"]
|
||||||
|
},
|
||||||
|
"checkRunSettings": {
|
||||||
|
"vulnerableCheckRunConclusionLevel": "success",
|
||||||
|
"displayMode": "diff"
|
||||||
|
},
|
||||||
|
"issueSettings": {
|
||||||
|
"minSeverityLevel": "LOW"
|
||||||
|
},
|
||||||
|
"enableRenovate": "true"
|
||||||
|
}
|
||||||
@ -83,7 +83,7 @@ tasks.named<ShadowJar>("shadowJar") {
|
|||||||
relocate("org.jetbrains", "com.plotsquared.core.annotations")
|
relocate("org.jetbrains", "com.plotsquared.core.annotations")
|
||||||
relocate("org.intellij.lang", "com.plotsquared.core.intellij.annotations")
|
relocate("org.intellij.lang", "com.plotsquared.core.intellij.annotations")
|
||||||
relocate("javax.annotation", "com.plotsquared.core.annotation")
|
relocate("javax.annotation", "com.plotsquared.core.annotation")
|
||||||
relocate("com.github.spotbugs", "com.plotsquared.core.spotbugs")
|
relocate("com.google.code.findbugs", "com.plotsquared.core.findbugs")
|
||||||
relocate("javax.inject", "com.plotsquared.core.annotation.inject")
|
relocate("javax.inject", "com.plotsquared.core.annotation.inject")
|
||||||
|
|
||||||
// Get rid of all the libs which are 100% unused.
|
// Get rid of all the libs which are 100% unused.
|
||||||
@ -95,11 +95,11 @@ tasks.named<ShadowJar>("shadowJar") {
|
|||||||
tasks {
|
tasks {
|
||||||
withType<Javadoc> {
|
withType<Javadoc> {
|
||||||
val opt = options as StandardJavadocDocletOptions
|
val opt = options as StandardJavadocDocletOptions
|
||||||
opt.links("https://papermc.io/javadocs/paper/1.18/")
|
opt.links("https://papermc.io/javadocs/paper/1.17/")
|
||||||
opt.links("https://docs.enginehub.org/javadoc/com.sk89q.worldedit/worldedit-bukkit/" + libs.worldeditBukkit.get().versionConstraint.toString())
|
opt.links("https://docs.enginehub.org/javadoc/com.sk89q.worldedit/worldedit-core/7.2.7/")
|
||||||
opt.links("https://javadoc.io/doc/com.plotsquared/PlotSquared-Core/latest/")
|
opt.links("https://docs.enginehub.org/javadoc/com.sk89q.worldedit/worldedit-bukkit/7.2.7/")
|
||||||
opt.links("https://jd.adventure.kyori.net/api/" + libs.adventure.get().versionConstraint.toString())
|
opt.links("https://jd.adventure.kyori.net/api/4.9.3/")
|
||||||
opt.links("https://google.github.io/guice/api-docs/" + libs.guice.get().versionConstraint.toString() + "/javadoc/")
|
opt.links("https://google.github.io/guice/api-docs/5.0.1/javadoc/")
|
||||||
opt.links("https://checkerframework.org/api/")
|
opt.links("https://checkerframework.org/api/")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -238,16 +238,6 @@ public final class BukkitPlatform extends JavaPlugin implements Listener, PlotPl
|
|||||||
return this.version;
|
return this.version;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public int versionMinHeight() {
|
|
||||||
return serverVersion()[1] >= 18 ? -64 : 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public int versionMaxHeight() {
|
|
||||||
return serverVersion()[1] >= 18 ? 319 : 255;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public @NonNull String serverImplementation() {
|
public @NonNull String serverImplementation() {
|
||||||
return Bukkit.getVersion();
|
return Bukkit.getVersion();
|
||||||
@ -513,10 +503,8 @@ public final class BukkitPlatform extends JavaPlugin implements Listener, PlotPl
|
|||||||
this.backgroundPipeline.registerService(essentialsUUIDService);
|
this.backgroundPipeline.registerService(essentialsUUIDService);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (Settings.UUID.IMPROMPTU_SERVICE_MOJANG_API) {
|
final SquirrelIdUUIDService impromptuMojangService = new SquirrelIdUUIDService(Settings.UUID.IMPROMPTU_LIMIT);
|
||||||
final SquirrelIdUUIDService impromptuMojangService = new SquirrelIdUUIDService(Settings.UUID.IMPROMPTU_LIMIT);
|
this.impromptuPipeline.registerService(impromptuMojangService);
|
||||||
this.impromptuPipeline.registerService(impromptuMojangService);
|
|
||||||
}
|
|
||||||
final SquirrelIdUUIDService backgroundMojangService = new SquirrelIdUUIDService(Settings.UUID.BACKGROUND_LIMIT);
|
final SquirrelIdUUIDService backgroundMojangService = new SquirrelIdUUIDService(Settings.UUID.BACKGROUND_LIMIT);
|
||||||
this.backgroundPipeline.registerService(backgroundMojangService);
|
this.backgroundPipeline.registerService(backgroundMojangService);
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
@ -65,10 +65,7 @@ final class BlockStatePopulator extends BlockPopulator {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
final ChunkWrapper wrap = new ChunkWrapper(area.getWorldName(), source.getX(), source.getZ());
|
final ChunkWrapper wrap = new ChunkWrapper(area.getWorldName(), source.getX(), source.getZ());
|
||||||
final ScopedQueueCoordinator chunk = this.queue.getForChunk(wrap.x, wrap.z,
|
final ScopedQueueCoordinator chunk = this.queue.getForChunk(wrap.x, wrap.z);
|
||||||
com.plotsquared.bukkit.util.BukkitWorld.getMinWorldHeight(world),
|
|
||||||
com.plotsquared.bukkit.util.BukkitWorld.getMaxWorldHeight(world) - 1
|
|
||||||
);
|
|
||||||
if (this.plotGenerator.populateChunk(chunk, area)) {
|
if (this.plotGenerator.populateChunk(chunk, area)) {
|
||||||
this.queue.enqueue();
|
this.queue.enqueue();
|
||||||
}
|
}
|
||||||
|
|||||||
@ -27,7 +27,6 @@ package com.plotsquared.bukkit.generator;
|
|||||||
|
|
||||||
import com.plotsquared.bukkit.queue.GenChunk;
|
import com.plotsquared.bukkit.queue.GenChunk;
|
||||||
import com.plotsquared.bukkit.util.BukkitUtil;
|
import com.plotsquared.bukkit.util.BukkitUtil;
|
||||||
import com.plotsquared.bukkit.util.BukkitWorld;
|
|
||||||
import com.plotsquared.core.PlotSquared;
|
import com.plotsquared.core.PlotSquared;
|
||||||
import com.plotsquared.core.generator.GeneratorWrapper;
|
import com.plotsquared.core.generator.GeneratorWrapper;
|
||||||
import com.plotsquared.core.generator.IndependentPlotGenerator;
|
import com.plotsquared.core.generator.IndependentPlotGenerator;
|
||||||
@ -160,14 +159,12 @@ public class BukkitPlotGenerator extends ChunkGenerator
|
|||||||
@NonNull BiomeGrid biome
|
@NonNull BiomeGrid biome
|
||||||
) {
|
) {
|
||||||
|
|
||||||
int minY = BukkitWorld.getMinWorldHeight(world);
|
GenChunk result = new GenChunk();
|
||||||
int maxY = BukkitWorld.getMaxWorldHeight(world);
|
|
||||||
GenChunk result = new GenChunk(minY, maxY);
|
|
||||||
if (this.getPlotGenerator() instanceof SingleWorldGenerator) {
|
if (this.getPlotGenerator() instanceof SingleWorldGenerator) {
|
||||||
if (result.getChunkData() != null) {
|
if (result.getChunkData() != null) {
|
||||||
for (int chunkX = 0; chunkX < 16; chunkX++) {
|
for (int chunkX = 0; chunkX < 16; chunkX++) {
|
||||||
for (int chunkZ = 0; chunkZ < 16; chunkZ++) {
|
for (int chunkZ = 0; chunkZ < 16; chunkZ++) {
|
||||||
for (int y = minY; y < maxY; y++) {
|
for (int y = 0; y < world.getMaxHeight(); y++) {
|
||||||
biome.setBiome(chunkX, y, chunkZ, Biome.PLAINS);
|
biome.setBiome(chunkX, y, chunkZ, Biome.PLAINS);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -80,8 +80,7 @@ final class DelegatePlotGenerator extends IndependentPlotGenerator {
|
|||||||
result.setBiome(x, z, BukkitAdapter.adapt(biome));
|
result.setBiome(x, z, BukkitAdapter.adapt(biome));
|
||||||
}
|
}
|
||||||
|
|
||||||
//do not annotate with Override until we discontinue support for 1.4.4 (we no longer support 1.4.4)
|
//do not annotate with Override until we discontinue support for 1.4.4
|
||||||
@Override
|
|
||||||
public void setBiome(int x, int y, int z, @NonNull Biome biome) {
|
public void setBiome(int x, int y, int z, @NonNull Biome biome) {
|
||||||
result.setBiome(x, z, BukkitAdapter.adapt(biome));
|
result.setBiome(x, z, BukkitAdapter.adapt(biome));
|
||||||
|
|
||||||
|
|||||||
@ -68,15 +68,12 @@ import com.plotsquared.core.util.task.TaskTime;
|
|||||||
import com.sk89q.worldedit.WorldEdit;
|
import com.sk89q.worldedit.WorldEdit;
|
||||||
import com.sk89q.worldedit.bukkit.BukkitAdapter;
|
import com.sk89q.worldedit.bukkit.BukkitAdapter;
|
||||||
import com.sk89q.worldedit.world.block.BlockType;
|
import com.sk89q.worldedit.world.block.BlockType;
|
||||||
import net.kyori.adventure.text.Component;
|
import net.kyori.adventure.text.minimessage.Template;
|
||||||
import net.kyori.adventure.text.minimessage.tag.Tag;
|
|
||||||
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
|
|
||||||
import org.bukkit.Bukkit;
|
import org.bukkit.Bukkit;
|
||||||
import org.bukkit.GameMode;
|
import org.bukkit.GameMode;
|
||||||
import org.bukkit.Material;
|
import org.bukkit.Material;
|
||||||
import org.bukkit.block.Block;
|
import org.bukkit.block.Block;
|
||||||
import org.bukkit.block.BlockFace;
|
import org.bukkit.block.BlockFace;
|
||||||
import org.bukkit.block.BlockState;
|
|
||||||
import org.bukkit.block.data.BlockData;
|
import org.bukkit.block.data.BlockData;
|
||||||
import org.bukkit.entity.Entity;
|
import org.bukkit.entity.Entity;
|
||||||
import org.bukkit.entity.Fireball;
|
import org.bukkit.entity.Fireball;
|
||||||
@ -95,7 +92,6 @@ import org.bukkit.event.block.BlockFormEvent;
|
|||||||
import org.bukkit.event.block.BlockFromToEvent;
|
import org.bukkit.event.block.BlockFromToEvent;
|
||||||
import org.bukkit.event.block.BlockGrowEvent;
|
import org.bukkit.event.block.BlockGrowEvent;
|
||||||
import org.bukkit.event.block.BlockIgniteEvent;
|
import org.bukkit.event.block.BlockIgniteEvent;
|
||||||
import org.bukkit.event.block.BlockMultiPlaceEvent;
|
|
||||||
import org.bukkit.event.block.BlockPhysicsEvent;
|
import org.bukkit.event.block.BlockPhysicsEvent;
|
||||||
import org.bukkit.event.block.BlockPistonExtendEvent;
|
import org.bukkit.event.block.BlockPistonExtendEvent;
|
||||||
import org.bukkit.event.block.BlockPistonRetractEvent;
|
import org.bukkit.event.block.BlockPistonRetractEvent;
|
||||||
@ -170,7 +166,7 @@ public class BlockEventListener implements Listener {
|
|||||||
}
|
}
|
||||||
if (Settings.Redstone.DISABLE_OFFLINE) {
|
if (Settings.Redstone.DISABLE_OFFLINE) {
|
||||||
boolean disable = false;
|
boolean disable = false;
|
||||||
if (!DBFunc.SERVER.equals(plot.getOwner())) {
|
if (!plot.getOwner().equals(DBFunc.SERVER)) {
|
||||||
if (plot.isMerged()) {
|
if (plot.isMerged()) {
|
||||||
disable = true;
|
disable = true;
|
||||||
for (UUID owner : plot.getOwners()) {
|
for (UUID owner : plot.getOwners()) {
|
||||||
@ -281,26 +277,21 @@ public class BlockEventListener implements Listener {
|
|||||||
BukkitPlayer pp = BukkitUtil.adapt(player);
|
BukkitPlayer pp = BukkitUtil.adapt(player);
|
||||||
Plot plot = area.getPlot(location);
|
Plot plot = area.getPlot(location);
|
||||||
if (plot != null) {
|
if (plot != null) {
|
||||||
if ((location.getY() >= area.getMaxBuildHeight() || location.getY() < area
|
if ((location.getY() > area.getMaxBuildHeight() || location.getY() < area
|
||||||
.getMinBuildHeight()) && !Permissions
|
.getMinBuildHeight()) && !Permissions
|
||||||
.hasPermission(pp, Permission.PERMISSION_ADMIN_BUILD_HEIGHT_LIMIT)) {
|
.hasPermission(pp, Permission.PERMISSION_ADMIN_BUILD_HEIGHT_LIMIT)) {
|
||||||
event.setCancelled(true);
|
event.setCancelled(true);
|
||||||
pp.sendMessage(
|
pp.sendMessage(
|
||||||
TranslatableCaption.of("height.height_limit"),
|
TranslatableCaption.of("height.height_limit"),
|
||||||
TagResolver.builder()
|
Template.of("minHeight", String.valueOf(area.getMinBuildHeight())),
|
||||||
.tag("minheight", Tag.inserting(Component.text(area.getMinBuildHeight())))
|
Template.of("maxHeight", String.valueOf(area.getMaxBuildHeight()))
|
||||||
.tag("maxheight", Tag.inserting(Component.text(area.getMaxBuildHeight())))
|
|
||||||
.build()
|
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
if (!plot.hasOwner()) {
|
if (!plot.hasOwner()) {
|
||||||
if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_BUILD_UNOWNED)) {
|
if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_BUILD_UNOWNED)) {
|
||||||
pp.sendMessage(
|
pp.sendMessage(
|
||||||
TranslatableCaption.of("permission.no_permission_event"),
|
TranslatableCaption.of("permission.no_permission_event"),
|
||||||
TagResolver.resolver(
|
Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_BUILD_UNOWNED))
|
||||||
"node",
|
|
||||||
Tag.inserting(Permission.PERMISSION_ADMIN_BUILD_UNOWNED)
|
|
||||||
)
|
|
||||||
);
|
);
|
||||||
event.setCancelled(true);
|
event.setCancelled(true);
|
||||||
return;
|
return;
|
||||||
@ -317,10 +308,7 @@ public class BlockEventListener implements Listener {
|
|||||||
if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_BUILD_OTHER)) {
|
if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_BUILD_OTHER)) {
|
||||||
pp.sendMessage(
|
pp.sendMessage(
|
||||||
TranslatableCaption.of("permission.no_permission_event"),
|
TranslatableCaption.of("permission.no_permission_event"),
|
||||||
TagResolver.resolver(
|
Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_BUILD_OTHER))
|
||||||
"node",
|
|
||||||
Tag.inserting(Permission.PERMISSION_ADMIN_BUILD_OTHER)
|
|
||||||
)
|
|
||||||
);
|
);
|
||||||
event.setCancelled(true);
|
event.setCancelled(true);
|
||||||
plot.debug(player.getName() + " could not place " + event.getBlock().getType()
|
plot.debug(player.getName() + " could not place " + event.getBlock().getType()
|
||||||
@ -347,10 +335,7 @@ public class BlockEventListener implements Listener {
|
|||||||
} else if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_BUILD_ROAD)) {
|
} else if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_BUILD_ROAD)) {
|
||||||
pp.sendMessage(
|
pp.sendMessage(
|
||||||
TranslatableCaption.of("permission.no_permission_event"),
|
TranslatableCaption.of("permission.no_permission_event"),
|
||||||
TagResolver.resolver(
|
Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_BUILD_ROAD))
|
||||||
"node",
|
|
||||||
Tag.inserting(Permission.PERMISSION_ADMIN_BUILD_ROAD)
|
|
||||||
)
|
|
||||||
);
|
);
|
||||||
event.setCancelled(true);
|
event.setCancelled(true);
|
||||||
}
|
}
|
||||||
@ -367,30 +352,24 @@ public class BlockEventListener implements Listener {
|
|||||||
Plot plot = area.getPlot(location);
|
Plot plot = area.getPlot(location);
|
||||||
if (plot != null) {
|
if (plot != null) {
|
||||||
BukkitPlayer plotPlayer = BukkitUtil.adapt(player);
|
BukkitPlayer plotPlayer = BukkitUtil.adapt(player);
|
||||||
// == rather than <= as we only care about the "ground level" not being destroyed
|
if (event.getBlock().getY() == 0) {
|
||||||
if (event.getBlock().getY() == area.getMinGenHeight()) {
|
|
||||||
if (!Permissions
|
if (!Permissions
|
||||||
.hasPermission(plotPlayer, Permission.PERMISSION_ADMIN_DESTROY_GROUNDLEVEL)) {
|
.hasPermission(plotPlayer, Permission.PERMISSION_ADMIN_DESTROY_GROUNDLEVEL)) {
|
||||||
plotPlayer.sendMessage(
|
plotPlayer.sendMessage(
|
||||||
TranslatableCaption.of("permission.no_permission_event"),
|
TranslatableCaption.of("permission.no_permission_event"),
|
||||||
TagResolver.resolver(
|
Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_DESTROY_GROUNDLEVEL))
|
||||||
"node",
|
|
||||||
Tag.inserting(Permission.PERMISSION_ADMIN_DESTROY_GROUNDLEVEL)
|
|
||||||
)
|
|
||||||
);
|
);
|
||||||
event.setCancelled(true);
|
event.setCancelled(true);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
} else if ((location.getY() >= area.getMaxBuildHeight() || location.getY() < area
|
} else if ((location.getY() > area.getMaxBuildHeight() || location.getY() < area
|
||||||
.getMinBuildHeight()) && !Permissions
|
.getMinBuildHeight()) && !Permissions
|
||||||
.hasPermission(plotPlayer, Permission.PERMISSION_ADMIN_BUILD_HEIGHT_LIMIT)) {
|
.hasPermission(plotPlayer, Permission.PERMISSION_ADMIN_BUILD_HEIGHT_LIMIT)) {
|
||||||
event.setCancelled(true);
|
event.setCancelled(true);
|
||||||
plotPlayer.sendMessage(
|
plotPlayer.sendMessage(
|
||||||
TranslatableCaption.of("height.height_limit"),
|
TranslatableCaption.of("height.height_limit"),
|
||||||
TagResolver.builder()
|
Template.of("minHeight", String.valueOf(area.getMinBuildHeight())),
|
||||||
.tag("minheight", Tag.inserting(Component.text(area.getMinBuildHeight())))
|
Template.of("maxHeight", String.valueOf(area.getMaxBuildHeight()))
|
||||||
.tag("maxheight", Tag.inserting(Component.text(area.getMaxBuildHeight())))
|
|
||||||
.build()
|
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
if (!plot.hasOwner()) {
|
if (!plot.hasOwner()) {
|
||||||
@ -415,10 +394,7 @@ public class BlockEventListener implements Listener {
|
|||||||
}
|
}
|
||||||
plotPlayer.sendMessage(
|
plotPlayer.sendMessage(
|
||||||
TranslatableCaption.of("permission.no_permission_event"),
|
TranslatableCaption.of("permission.no_permission_event"),
|
||||||
TagResolver.resolver(
|
Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_DESTROY_OTHER))
|
||||||
"node",
|
|
||||||
Tag.inserting(Permission.PERMISSION_ADMIN_DESTROY_OTHER)
|
|
||||||
)
|
|
||||||
);
|
);
|
||||||
event.setCancelled(true);
|
event.setCancelled(true);
|
||||||
} else if (Settings.Done.RESTRICT_BUILDING && DoneFlag.isDone(plot)) {
|
} else if (Settings.Done.RESTRICT_BUILDING && DoneFlag.isDone(plot)) {
|
||||||
@ -444,10 +420,7 @@ public class BlockEventListener implements Listener {
|
|||||||
}
|
}
|
||||||
pp.sendMessage(
|
pp.sendMessage(
|
||||||
TranslatableCaption.of("permission.no_permission_event"),
|
TranslatableCaption.of("permission.no_permission_event"),
|
||||||
TagResolver.resolver(
|
Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_DESTROY_ROAD))
|
||||||
"node",
|
|
||||||
Tag.inserting(Permission.PERMISSION_ADMIN_DESTROY_ROAD)
|
|
||||||
)
|
|
||||||
);
|
);
|
||||||
event.setCancelled(true);
|
event.setCancelled(true);
|
||||||
}
|
}
|
||||||
@ -674,8 +647,7 @@ public class BlockEventListener implements Listener {
|
|||||||
event.getBlock().breakNaturally();
|
event.getBlock().breakNaturally();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// == rather than <= as we only care about the "ground level" not being destroyed
|
if (location.getY() == 0) {
|
||||||
if (location.getY() == area.getMinGenHeight()) {
|
|
||||||
event.setCancelled(true);
|
event.setCancelled(true);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@ -1123,10 +1095,7 @@ public class BlockEventListener implements Listener {
|
|||||||
if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_BUILD_ROAD)) {
|
if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_BUILD_ROAD)) {
|
||||||
pp.sendMessage(
|
pp.sendMessage(
|
||||||
TranslatableCaption.of("permission.no_permission_event"),
|
TranslatableCaption.of("permission.no_permission_event"),
|
||||||
TagResolver.resolver(
|
Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_BUILD_ROAD))
|
||||||
"node",
|
|
||||||
Tag.inserting(Permission.PERMISSION_ADMIN_BUILD_ROAD)
|
|
||||||
)
|
|
||||||
);
|
);
|
||||||
event.setCancelled(true);
|
event.setCancelled(true);
|
||||||
}
|
}
|
||||||
@ -1134,10 +1103,7 @@ public class BlockEventListener implements Listener {
|
|||||||
if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_BUILD_UNOWNED)) {
|
if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_BUILD_UNOWNED)) {
|
||||||
pp.sendMessage(
|
pp.sendMessage(
|
||||||
TranslatableCaption.of("permission.no_permission_event"),
|
TranslatableCaption.of("permission.no_permission_event"),
|
||||||
TagResolver.resolver(
|
Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_BUILD_UNOWNED))
|
||||||
"node",
|
|
||||||
Tag.inserting(Permission.PERMISSION_ADMIN_BUILD_UNOWNED)
|
|
||||||
)
|
|
||||||
);
|
);
|
||||||
event.setCancelled(true);
|
event.setCancelled(true);
|
||||||
}
|
}
|
||||||
@ -1145,10 +1111,7 @@ public class BlockEventListener implements Listener {
|
|||||||
if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_BUILD_OTHER)) {
|
if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_BUILD_OTHER)) {
|
||||||
pp.sendMessage(
|
pp.sendMessage(
|
||||||
TranslatableCaption.of("permission.no_permission_event"),
|
TranslatableCaption.of("permission.no_permission_event"),
|
||||||
TagResolver.resolver(
|
Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_BUILD_OTHER))
|
||||||
"node",
|
|
||||||
Tag.inserting(Permission.PERMISSION_ADMIN_BUILD_OTHER)
|
|
||||||
)
|
|
||||||
);
|
);
|
||||||
event.setCancelled(true);
|
event.setCancelled(true);
|
||||||
}
|
}
|
||||||
@ -1245,53 +1208,4 @@ public class BlockEventListener implements Listener {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
|
||||||
* BlockMultiPlaceEvent is called unrelated to the BlockPlaceEvent itself and therefore doesn't respect the cancellation.
|
|
||||||
*/
|
|
||||||
@EventHandler(ignoreCancelled = true, priority = EventPriority.HIGHEST)
|
|
||||||
public void onBlockMultiPlace(BlockMultiPlaceEvent event) {
|
|
||||||
// Check if the generic block place event would be cancelled
|
|
||||||
blockCreate(event);
|
|
||||||
if (event.isCancelled()) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
BukkitPlayer pp = BukkitUtil.adapt(event.getPlayer());
|
|
||||||
Location placedLocation = BukkitUtil.adapt(event.getBlockReplacedState().getLocation());
|
|
||||||
PlotArea area = placedLocation.getPlotArea();
|
|
||||||
if (area == null) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
Plot plot = placedLocation.getPlot();
|
|
||||||
|
|
||||||
for (final BlockState state : event.getReplacedBlockStates()) {
|
|
||||||
Location currentLocation = BukkitUtil.adapt(state.getLocation());
|
|
||||||
if (!Permissions.hasPermission(
|
|
||||||
pp,
|
|
||||||
Permission.PERMISSION_ADMIN_BUILD_ROAD
|
|
||||||
) && !(Objects.equals(currentLocation.getPlot(), plot))) {
|
|
||||||
pp.sendMessage(
|
|
||||||
TranslatableCaption.of("permission.no_permission_event"),
|
|
||||||
TagResolver.resolver("node", Tag.inserting(Permission.PERMISSION_ADMIN_BUILD_ROAD))
|
|
||||||
);
|
|
||||||
event.setCancelled(true);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
if (Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_BUILD_HEIGHT_LIMIT)) {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
if (currentLocation.getY() >= area.getMaxBuildHeight() || currentLocation.getY() < area.getMinBuildHeight()) {
|
|
||||||
pp.sendMessage(
|
|
||||||
TranslatableCaption.of("height.height_limit"),
|
|
||||||
TagResolver.builder()
|
|
||||||
.tag("minheight", Tag.inserting(Component.text(area.getMinBuildHeight())))
|
|
||||||
.tag("maxheight", Tag.inserting(Component.text(area.getMaxBuildHeight())))
|
|
||||||
.build()
|
|
||||||
);
|
|
||||||
event.setCancelled(true);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -36,7 +36,6 @@ import com.plotsquared.core.plot.flag.implementations.DoneFlag;
|
|||||||
import io.papermc.lib.PaperLib;
|
import io.papermc.lib.PaperLib;
|
||||||
import org.bukkit.Chunk;
|
import org.bukkit.Chunk;
|
||||||
import org.bukkit.World;
|
import org.bukkit.World;
|
||||||
import org.bukkit.block.Block;
|
|
||||||
import org.bukkit.entity.ArmorStand;
|
import org.bukkit.entity.ArmorStand;
|
||||||
import org.bukkit.entity.Entity;
|
import org.bukkit.entity.Entity;
|
||||||
import org.bukkit.entity.EntityType;
|
import org.bukkit.entity.EntityType;
|
||||||
@ -192,32 +191,8 @@ public class EntitySpawnListener implements Listener {
|
|||||||
|
|
||||||
@EventHandler
|
@EventHandler
|
||||||
public void onTeleport(EntityTeleportEvent event) {
|
public void onTeleport(EntityTeleportEvent event) {
|
||||||
Entity entity = event.getEntity();
|
Entity ent = event.getEntity();
|
||||||
Entity fromLocation = event.getEntity();
|
if (ent instanceof Vehicle || ent instanceof ArmorStand) {
|
||||||
Block toLocation = event.getTo().getBlock();
|
|
||||||
final Location fromLocLocation = BukkitUtil.adapt(fromLocation.getLocation());
|
|
||||||
final PlotArea fromArea = fromLocLocation.getPlotArea();
|
|
||||||
Location toLocLocation = BukkitUtil.adapt(toLocation.getLocation());
|
|
||||||
PlotArea toArea = toLocLocation.getPlotArea();
|
|
||||||
|
|
||||||
if (toArea == null) {
|
|
||||||
if (fromLocation.getType() == EntityType.SHULKER && fromArea != null) {
|
|
||||||
event.setCancelled(true);
|
|
||||||
}
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
Plot toPlot = toArea.getOwnedPlot(toLocLocation);
|
|
||||||
if (fromLocation.getType() == EntityType.SHULKER && fromArea != null) {
|
|
||||||
final Plot fromPlot = fromArea.getOwnedPlot(fromLocLocation);
|
|
||||||
|
|
||||||
if (fromPlot != null || toPlot != null) {
|
|
||||||
if ((fromPlot == null || !fromPlot.equals(toPlot)) && (toPlot == null || !toPlot.equals(fromPlot))) {
|
|
||||||
event.setCancelled(true);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (entity instanceof Vehicle || entity instanceof ArmorStand) {
|
|
||||||
testNether(event.getEntity());
|
testNether(event.getEntity());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -44,12 +44,9 @@ import com.plotsquared.core.player.PlotPlayer;
|
|||||||
import com.plotsquared.core.plot.Plot;
|
import com.plotsquared.core.plot.Plot;
|
||||||
import com.plotsquared.core.plot.PlotArea;
|
import com.plotsquared.core.plot.PlotArea;
|
||||||
import com.plotsquared.core.plot.flag.implementations.DoneFlag;
|
import com.plotsquared.core.plot.flag.implementations.DoneFlag;
|
||||||
import com.plotsquared.core.plot.flag.implementations.ProjectilesFlag;
|
|
||||||
import com.plotsquared.core.plot.world.PlotAreaManager;
|
import com.plotsquared.core.plot.world.PlotAreaManager;
|
||||||
import com.plotsquared.core.util.Permissions;
|
import com.plotsquared.core.util.Permissions;
|
||||||
import net.kyori.adventure.text.Component;
|
import net.kyori.adventure.text.minimessage.Template;
|
||||||
import net.kyori.adventure.text.minimessage.tag.Tag;
|
|
||||||
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
|
|
||||||
import org.bukkit.Chunk;
|
import org.bukkit.Chunk;
|
||||||
import org.bukkit.block.Block;
|
import org.bukkit.block.Block;
|
||||||
import org.bukkit.block.TileState;
|
import org.bukkit.block.TileState;
|
||||||
@ -306,7 +303,7 @@ public class PaperListener implements Listener {
|
|||||||
final PlotPlayer<?> plotPlayer = BukkitUtil.adapt(event.getPlayer());
|
final PlotPlayer<?> plotPlayer = BukkitUtil.adapt(event.getPlayer());
|
||||||
plotPlayer.sendMessage(
|
plotPlayer.sendMessage(
|
||||||
TranslatableCaption.of("errors.tile_entity_cap_reached"),
|
TranslatableCaption.of("errors.tile_entity_cap_reached"),
|
||||||
TagResolver.resolver("amount", Tag.inserting(Component.text(Settings.Chunk_Processor.MAX_TILES)))
|
Template.of("amount", String.valueOf(Settings.Chunk_Processor.MAX_TILES))
|
||||||
);
|
);
|
||||||
event.setCancelled(true);
|
event.setCancelled(true);
|
||||||
event.setBuild(false);
|
event.setBuild(false);
|
||||||
@ -340,10 +337,7 @@ public class PaperListener implements Listener {
|
|||||||
if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_PROJECTILE_ROAD)) {
|
if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_PROJECTILE_ROAD)) {
|
||||||
pp.sendMessage(
|
pp.sendMessage(
|
||||||
TranslatableCaption.of("permission.no_permission_event"),
|
TranslatableCaption.of("permission.no_permission_event"),
|
||||||
TagResolver.resolver(
|
Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_PROJECTILE_ROAD))
|
||||||
"node",
|
|
||||||
Tag.inserting(Permission.PERMISSION_ADMIN_PROJECTILE_ROAD)
|
|
||||||
)
|
|
||||||
);
|
);
|
||||||
entity.remove();
|
entity.remove();
|
||||||
event.setCancelled(true);
|
event.setCancelled(true);
|
||||||
@ -352,27 +346,19 @@ public class PaperListener implements Listener {
|
|||||||
if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_PROJECTILE_UNOWNED)) {
|
if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_PROJECTILE_UNOWNED)) {
|
||||||
pp.sendMessage(
|
pp.sendMessage(
|
||||||
TranslatableCaption.of("permission.no_permission_event"),
|
TranslatableCaption.of("permission.no_permission_event"),
|
||||||
TagResolver.resolver(
|
Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_PROJECTILE_UNOWNED))
|
||||||
"node",
|
|
||||||
Tag.inserting(Permission.PERMISSION_ADMIN_PROJECTILE_UNOWNED)
|
|
||||||
)
|
|
||||||
);
|
);
|
||||||
entity.remove();
|
entity.remove();
|
||||||
event.setCancelled(true);
|
event.setCancelled(true);
|
||||||
}
|
}
|
||||||
} else if (!plot.isAdded(pp.getUUID())) {
|
} else if (!plot.isAdded(pp.getUUID())) {
|
||||||
if (!plot.getFlag(ProjectilesFlag.class)) {
|
if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_PROJECTILE_OTHER)) {
|
||||||
if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_PROJECTILE_OTHER)) {
|
pp.sendMessage(
|
||||||
pp.sendMessage(
|
TranslatableCaption.of("permission.no_permission_event"),
|
||||||
TranslatableCaption.of("permission.no_permission_event"),
|
Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_PROJECTILE_OTHER))
|
||||||
TagResolver.resolver(
|
);
|
||||||
"node",
|
entity.remove();
|
||||||
Tag.inserting(Permission.PERMISSION_ADMIN_PROJECTILE_OTHER)
|
event.setCancelled(true);
|
||||||
)
|
|
||||||
);
|
|
||||||
entity.remove();
|
|
||||||
event.setCancelled(true);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -33,9 +33,7 @@ import com.plotsquared.core.location.Location;
|
|||||||
import com.plotsquared.core.player.PlotPlayer;
|
import com.plotsquared.core.player.PlotPlayer;
|
||||||
import com.plotsquared.core.plot.PlotArea;
|
import com.plotsquared.core.plot.PlotArea;
|
||||||
import com.plotsquared.core.plot.world.PlotAreaManager;
|
import com.plotsquared.core.plot.world.PlotAreaManager;
|
||||||
import net.kyori.adventure.text.Component;
|
import net.kyori.adventure.text.minimessage.Template;
|
||||||
import net.kyori.adventure.text.minimessage.tag.Tag;
|
|
||||||
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
|
|
||||||
import org.bukkit.block.Banner;
|
import org.bukkit.block.Banner;
|
||||||
import org.bukkit.block.Beacon;
|
import org.bukkit.block.Beacon;
|
||||||
import org.bukkit.block.BlockState;
|
import org.bukkit.block.BlockState;
|
||||||
@ -86,7 +84,7 @@ public class PaperListener113 extends PaperListener {
|
|||||||
final PlotPlayer<?> plotPlayer = BukkitUtil.adapt(event.getPlayer());
|
final PlotPlayer<?> plotPlayer = BukkitUtil.adapt(event.getPlayer());
|
||||||
plotPlayer.sendMessage(
|
plotPlayer.sendMessage(
|
||||||
TranslatableCaption.of("errors.tile_entity_cap_reached"),
|
TranslatableCaption.of("errors.tile_entity_cap_reached"),
|
||||||
TagResolver.resolver("amount", Tag.inserting(Component.text(Settings.Chunk_Processor.MAX_TILES)))
|
Template.of("amount", String.valueOf(Settings.Chunk_Processor.MAX_TILES))
|
||||||
);
|
);
|
||||||
event.setCancelled(true);
|
event.setCancelled(true);
|
||||||
event.setBuild(false);
|
event.setBuild(false);
|
||||||
|
|||||||
@ -76,6 +76,7 @@ import com.plotsquared.core.util.EventDispatcher;
|
|||||||
import com.plotsquared.core.util.MathMan;
|
import com.plotsquared.core.util.MathMan;
|
||||||
import com.plotsquared.core.util.Permissions;
|
import com.plotsquared.core.util.Permissions;
|
||||||
import com.plotsquared.core.util.PremiumVerification;
|
import com.plotsquared.core.util.PremiumVerification;
|
||||||
|
import com.plotsquared.core.util.RegExUtil;
|
||||||
import com.plotsquared.core.util.entity.EntityCategories;
|
import com.plotsquared.core.util.entity.EntityCategories;
|
||||||
import com.plotsquared.core.util.task.TaskManager;
|
import com.plotsquared.core.util.task.TaskManager;
|
||||||
import com.plotsquared.core.util.task.TaskTime;
|
import com.plotsquared.core.util.task.TaskTime;
|
||||||
@ -84,10 +85,7 @@ import com.sk89q.worldedit.bukkit.BukkitAdapter;
|
|||||||
import com.sk89q.worldedit.world.block.BlockType;
|
import com.sk89q.worldedit.world.block.BlockType;
|
||||||
import io.papermc.lib.PaperLib;
|
import io.papermc.lib.PaperLib;
|
||||||
import net.kyori.adventure.text.Component;
|
import net.kyori.adventure.text.Component;
|
||||||
import net.kyori.adventure.text.minimessage.MiniMessage;
|
import net.kyori.adventure.text.minimessage.Template;
|
||||||
import net.kyori.adventure.text.minimessage.tag.Tag;
|
|
||||||
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
|
|
||||||
import net.kyori.adventure.text.minimessage.tag.standard.StandardTags;
|
|
||||||
import org.bukkit.Bukkit;
|
import org.bukkit.Bukkit;
|
||||||
import org.bukkit.ChatColor;
|
import org.bukkit.ChatColor;
|
||||||
import org.bukkit.FluidCollisionMode;
|
import org.bukkit.FluidCollisionMode;
|
||||||
@ -155,11 +153,13 @@ import org.bukkit.util.Vector;
|
|||||||
import org.checkerframework.checker.nullness.qual.NonNull;
|
import org.checkerframework.checker.nullness.qual.NonNull;
|
||||||
|
|
||||||
import java.lang.reflect.Field;
|
import java.lang.reflect.Field;
|
||||||
|
import java.util.ArrayList;
|
||||||
import java.util.HashSet;
|
import java.util.HashSet;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Locale;
|
import java.util.Locale;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
import java.util.UUID;
|
import java.util.UUID;
|
||||||
|
import java.util.regex.Pattern;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Player Events involving plots.
|
* Player Events involving plots.
|
||||||
@ -223,9 +223,10 @@ public class PlayerEventListener extends PlotListener implements Listener {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@SuppressWarnings("StringSplitter")
|
||||||
@EventHandler(ignoreCancelled = true, priority = EventPriority.HIGHEST)
|
@EventHandler(ignoreCancelled = true, priority = EventPriority.HIGHEST)
|
||||||
public void playerCommand(PlayerCommandPreprocessEvent event) {
|
public void playerCommand(PlayerCommandPreprocessEvent event) {
|
||||||
String msg = event.getMessage().replace("/", "").toLowerCase(Locale.ROOT).trim();
|
String msg = event.getMessage().toLowerCase().replaceAll("/", "").trim();
|
||||||
if (msg.isEmpty()) {
|
if (msg.isEmpty()) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@ -239,9 +240,11 @@ public class PlayerEventListener extends PlotListener implements Listener {
|
|||||||
String[] parts = msg.split(" ");
|
String[] parts = msg.split(" ");
|
||||||
Plot plot = plotPlayer.getCurrentPlot();
|
Plot plot = plotPlayer.getCurrentPlot();
|
||||||
// Check WorldEdit
|
// Check WorldEdit
|
||||||
switch (parts[0]) {
|
switch (parts[0].toLowerCase()) {
|
||||||
case "up":
|
case "up":
|
||||||
|
case "/up":
|
||||||
case "worldedit:up":
|
case "worldedit:up":
|
||||||
|
case "worldedit:/up":
|
||||||
if (plot == null || (!plot.isAdded(plotPlayer.getUUID()) && !Permissions
|
if (plot == null || (!plot.isAdded(plotPlayer.getUUID()) && !Permissions
|
||||||
.hasPermission(plotPlayer, Permission.PERMISSION_ADMIN_BUILD_OTHER, true))) {
|
.hasPermission(plotPlayer, Permission.PERMISSION_ADMIN_BUILD_OTHER, true))) {
|
||||||
event.setCancelled(true);
|
event.setCancelled(true);
|
||||||
@ -255,67 +258,63 @@ public class PlayerEventListener extends PlotListener implements Listener {
|
|||||||
List<String> blockedCommands = plot != null ?
|
List<String> blockedCommands = plot != null ?
|
||||||
plot.getFlag(BlockedCmdsFlag.class) :
|
plot.getFlag(BlockedCmdsFlag.class) :
|
||||||
area.getFlag(BlockedCmdsFlag.class);
|
area.getFlag(BlockedCmdsFlag.class);
|
||||||
if (blockedCommands.isEmpty()) {
|
if (!blockedCommands.isEmpty() && !Permissions
|
||||||
return;
|
.hasPermission(plotPlayer, Permission.PERMISSION_ADMIN_INTERACT_BLOCKED_CMDS)) {
|
||||||
}
|
String part = parts[0];
|
||||||
if (Permissions.hasPermission(plotPlayer, Permission.PERMISSION_ADMIN_INTERACT_BLOCKED_CMDS)) {
|
if (parts[0].contains(":")) {
|
||||||
return;
|
part = parts[0].split(":")[1];
|
||||||
}
|
msg = msg.replace(parts[0].split(":")[0] + ':', "");
|
||||||
// When using namespaced commands, we're not interested in the namespace
|
}
|
||||||
String part = parts[0];
|
String s1 = part;
|
||||||
if (part.contains(":")) {
|
List<String> aliases = new ArrayList<>();
|
||||||
String[] namespaced = part.split(":");
|
for (HelpTopic cmdLabel : Bukkit.getServer().getHelpMap().getHelpTopics()) {
|
||||||
part = namespaced[1];
|
if (part.equals(cmdLabel.getName())) {
|
||||||
msg = msg.substring(namespaced[0].length() + 1);
|
break;
|
||||||
}
|
}
|
||||||
msg = replaceAliases(msg, part);
|
String label = cmdLabel.getName().replaceFirst("/", "");
|
||||||
for (String blocked : blockedCommands) {
|
if (aliases.contains(label)) {
|
||||||
if (blocked.equalsIgnoreCase(msg)) {
|
continue;
|
||||||
String perm;
|
}
|
||||||
if (plot != null && plot.isAdded(plotPlayer.getUUID())) {
|
PluginCommand p;
|
||||||
perm = "plots.admin.command.blocked-cmds.shared";
|
if ((p = Bukkit.getPluginCommand(label)) != null) {
|
||||||
|
for (String a : p.getAliases()) {
|
||||||
|
if (aliases.contains(a)) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
aliases.add(a);
|
||||||
|
a = a.replaceFirst("/", "");
|
||||||
|
if (!a.equals(label) && a.equals(part)) {
|
||||||
|
part = label;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (!s1.equals(part)) {
|
||||||
|
msg = msg.replace(s1, part);
|
||||||
|
}
|
||||||
|
for (String s : blockedCommands) {
|
||||||
|
Pattern pattern;
|
||||||
|
if (!RegExUtil.compiledPatterns.containsKey(s)) {
|
||||||
|
RegExUtil.compiledPatterns.put(s, pattern = Pattern.compile(s));
|
||||||
} else {
|
} else {
|
||||||
perm = "plots.admin.command.blocked-cmds.road";
|
pattern = RegExUtil.compiledPatterns.get(s);
|
||||||
}
|
}
|
||||||
if (!Permissions.hasPermission(plotPlayer, perm)) {
|
if (pattern.matcher(msg).matches()) {
|
||||||
plotPlayer.sendMessage(TranslatableCaption.of("blockedcmds.command_blocked"));
|
String perm;
|
||||||
event.setCancelled(true);
|
if (plot != null && plot.isAdded(plotPlayer.getUUID())) {
|
||||||
}
|
perm = "plots.admin.command.blocked-cmds.shared";
|
||||||
return;
|
} else {
|
||||||
}
|
perm = "plots.admin.command.blocked-cmds.road";
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private String replaceAliases(String msg, String part) {
|
|
||||||
String s1 = part;
|
|
||||||
Set<String> aliases = new HashSet<>();
|
|
||||||
for (HelpTopic cmdLabel : Bukkit.getServer().getHelpMap().getHelpTopics()) {
|
|
||||||
if (part.equals(cmdLabel.getName())) {
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
String label = cmdLabel.getName().replaceFirst("/", "");
|
|
||||||
if (aliases.contains(label)) {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
PluginCommand p = Bukkit.getPluginCommand(label);
|
|
||||||
if (p != null) {
|
|
||||||
for (String a : p.getAliases()) {
|
|
||||||
if (aliases.contains(a)) {
|
|
||||||
continue;
|
|
||||||
}
|
}
|
||||||
aliases.add(a);
|
if (!Permissions.hasPermission(plotPlayer, perm)) {
|
||||||
a = a.replaceFirst("/", "");
|
plotPlayer.sendMessage(TranslatableCaption.of("blockedcmds.command_blocked"));
|
||||||
if (!a.equals(label) && a.equals(part)) {
|
event.setCancelled(true);
|
||||||
part = label;
|
|
||||||
break;
|
|
||||||
}
|
}
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (!s1.equals(part)) {
|
|
||||||
msg = msg.replace(s1, part);
|
|
||||||
}
|
|
||||||
return msg;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
|
@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
|
||||||
@ -364,15 +363,11 @@ public class PlayerEventListener extends PlotListener implements Listener {
|
|||||||
&& PremiumVerification.isPremium() && UpdateUtility.hasUpdate) {
|
&& PremiumVerification.isPremium() && UpdateUtility.hasUpdate) {
|
||||||
Caption boundary = TranslatableCaption.of("update.update_boundary");
|
Caption boundary = TranslatableCaption.of("update.update_boundary");
|
||||||
Caption updateNotification = TranslatableCaption.of("update.update_notification");
|
Caption updateNotification = TranslatableCaption.of("update.update_notification");
|
||||||
|
Template internalVersion = Template.of("p2version", UpdateUtility.internalVersion.versionString());
|
||||||
|
Template spigotVersion = Template.of("spigotversion", UpdateUtility.spigotVersion);
|
||||||
|
Template downloadUrl = Template.of("downloadurl", "https://www.spigotmc.org/resources/77506/updates");
|
||||||
pp.sendMessage(boundary);
|
pp.sendMessage(boundary);
|
||||||
pp.sendMessage(
|
pp.sendMessage(updateNotification, internalVersion, spigotVersion, downloadUrl);
|
||||||
updateNotification,
|
|
||||||
TagResolver.builder()
|
|
||||||
.tag("p2version", Tag.inserting(Component.text(UpdateUtility.internalVersion.versionString())))
|
|
||||||
.tag("spigotversion", Tag.inserting(Component.text(UpdateUtility.spigotVersion)))
|
|
||||||
.tag("downloadurl", Tag.preProcessParsed("https://www.spigotmc.org/resources/77506/updates"))
|
|
||||||
.build()
|
|
||||||
);
|
|
||||||
pp.sendMessage(boundary);
|
pp.sendMessage(boundary);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -424,7 +419,7 @@ public class PlayerEventListener extends PlotListener implements Listener {
|
|||||||
.equals(BukkitUtil.adaptComplete(to)))) {
|
.equals(BukkitUtil.adaptComplete(to)))) {
|
||||||
pp.sendMessage(
|
pp.sendMessage(
|
||||||
TranslatableCaption.of("deny.no_enter"),
|
TranslatableCaption.of("deny.no_enter"),
|
||||||
TagResolver.resolver("plot", Tag.inserting(Component.text(plot.toString())))
|
Template.of("plot", plot.toString())
|
||||||
);
|
);
|
||||||
event.setCancelled(true);
|
event.setCancelled(true);
|
||||||
}
|
}
|
||||||
@ -540,10 +535,7 @@ public class PlayerEventListener extends PlotListener implements Listener {
|
|||||||
if (lastPlot != null && !plotExit(pp, lastPlot) && this.tmpTeleport && !kickAccess.get().orElse(false)) {
|
if (lastPlot != null && !plotExit(pp, lastPlot) && this.tmpTeleport && !kickAccess.get().orElse(false)) {
|
||||||
pp.sendMessage(
|
pp.sendMessage(
|
||||||
TranslatableCaption.of("permission.no_permission_event"),
|
TranslatableCaption.of("permission.no_permission_event"),
|
||||||
TagResolver.resolver(
|
Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_EXIT_DENIED))
|
||||||
"node",
|
|
||||||
Tag.inserting(Permission.PERMISSION_ADMIN_EXIT_DENIED)
|
|
||||||
)
|
|
||||||
);
|
);
|
||||||
this.tmpTeleport = false;
|
this.tmpTeleport = false;
|
||||||
if (lastPlot.equals(BukkitUtil.adapt(from).getPlot())) {
|
if (lastPlot.equals(BukkitUtil.adapt(from).getPlot())) {
|
||||||
@ -561,7 +553,7 @@ public class PlayerEventListener extends PlotListener implements Listener {
|
|||||||
} else if (!plotEntry(pp, now) && this.tmpTeleport) {
|
} else if (!plotEntry(pp, now) && this.tmpTeleport) {
|
||||||
pp.sendMessage(
|
pp.sendMessage(
|
||||||
TranslatableCaption.of("deny.no_enter"),
|
TranslatableCaption.of("deny.no_enter"),
|
||||||
TagResolver.resolver("plot", Tag.inserting(Component.text(now.toString())))
|
Template.of("plot", now.toString())
|
||||||
);
|
);
|
||||||
this.tmpTeleport = false;
|
this.tmpTeleport = false;
|
||||||
to.setX(from.getBlockX());
|
to.setX(from.getBlockX());
|
||||||
@ -633,10 +625,7 @@ public class PlayerEventListener extends PlotListener implements Listener {
|
|||||||
if (lastPlot != null && !plotExit(pp, lastPlot) && this.tmpTeleport && !kickAccess.get().orElse(false)) {
|
if (lastPlot != null && !plotExit(pp, lastPlot) && this.tmpTeleport && !kickAccess.get().orElse(false)) {
|
||||||
pp.sendMessage(
|
pp.sendMessage(
|
||||||
TranslatableCaption.of("permission.no_permission_event"),
|
TranslatableCaption.of("permission.no_permission_event"),
|
||||||
TagResolver.resolver(
|
Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_EXIT_DENIED))
|
||||||
"node",
|
|
||||||
Tag.inserting(Permission.PERMISSION_ADMIN_EXIT_DENIED)
|
|
||||||
)
|
|
||||||
);
|
);
|
||||||
this.tmpTeleport = false;
|
this.tmpTeleport = false;
|
||||||
if (lastPlot.equals(BukkitUtil.adapt(from).getPlot())) {
|
if (lastPlot.equals(BukkitUtil.adapt(from).getPlot())) {
|
||||||
@ -654,7 +643,7 @@ public class PlayerEventListener extends PlotListener implements Listener {
|
|||||||
} else if (!plotEntry(pp, plot) && this.tmpTeleport) {
|
} else if (!plotEntry(pp, plot) && this.tmpTeleport) {
|
||||||
pp.sendMessage(
|
pp.sendMessage(
|
||||||
TranslatableCaption.of("deny.no_enter"),
|
TranslatableCaption.of("deny.no_enter"),
|
||||||
TagResolver.resolver("plot", Tag.inserting(Component.text(plot.toString())))
|
Template.of("plot", plot.toString())
|
||||||
);
|
);
|
||||||
this.tmpTeleport = false;
|
this.tmpTeleport = false;
|
||||||
player.teleport(from);
|
player.teleport(from);
|
||||||
@ -739,34 +728,46 @@ public class PlayerEventListener extends PlotListener implements Listener {
|
|||||||
PlotId id = plot.getId();
|
PlotId id = plot.getId();
|
||||||
String worldName = plot.getWorldName();
|
String worldName = plot.getWorldName();
|
||||||
Caption msg = TranslatableCaption.of("chat.plot_chat_format");
|
Caption msg = TranslatableCaption.of("chat.plot_chat_format");
|
||||||
TagResolver.Builder builder = TagResolver.builder();
|
Template msgTemplate;
|
||||||
builder.tag("world", Tag.inserting(Component.text(worldName)));
|
Template worldNameTemplate = Template.of("world", worldName);
|
||||||
builder.tag("plot_id", Tag.inserting(Component.text(id.toString())));
|
Template plotTemplate = Template.of("plot_id", id.toString());
|
||||||
builder.tag("sender", Tag.inserting(Component.text(sender)));
|
Template senderTemplate = Template.of("sender", sender);
|
||||||
|
// If we do/don't want colour, we need to be careful about how to go about it, as players could attempt either <gold></gold> or &6 etc.
|
||||||
|
// In both cases, we want to use a Component Template to ensure that the player cannot use any placeholders in their message on purpose
|
||||||
|
// or accidentally, as component templates are done at the end. We also need to deserialize from legacy color codes to a Component if
|
||||||
|
// allowing colour.
|
||||||
if (plotPlayer.hasPermission("plots.chat.color")) {
|
if (plotPlayer.hasPermission("plots.chat.color")) {
|
||||||
builder.tag("msg", Tag.inserting(MiniMessage.miniMessage().deserialize(
|
msgTemplate = Template
|
||||||
message,
|
.of(
|
||||||
TagResolver.resolver(StandardTags.color(), StandardTags.gradient(),
|
"msg",
|
||||||
StandardTags.rainbow(), StandardTags.decorations()
|
BukkitUtil.LEGACY_COMPONENT_SERIALIZER.deserialize(ChatColor.translateAlternateColorCodes(
|
||||||
)
|
'&',
|
||||||
)));
|
message
|
||||||
|
))
|
||||||
|
);
|
||||||
} else {
|
} else {
|
||||||
builder.tag("msg", Tag.inserting(Component.text(message)));
|
msgTemplate = Template.of("msg", BukkitUtil.MINI_MESSAGE.deserialize(
|
||||||
|
ChatColor.stripColor(BukkitUtil.LEGACY_COMPONENT_SERIALIZER.serialize(Component.text(message)))));
|
||||||
}
|
}
|
||||||
for (PlotPlayer<?> receiver : plotRecipients) {
|
for (PlotPlayer<?> receiver : plotRecipients) {
|
||||||
receiver.sendMessage(msg, builder.build());
|
receiver.sendMessage(msg, worldNameTemplate, msgTemplate, plotTemplate, senderTemplate);
|
||||||
}
|
}
|
||||||
if (!spies.isEmpty()) {
|
if (!spies.isEmpty()) {
|
||||||
Caption spymsg = TranslatableCaption.of("chat.plot_chat_spy_format");
|
Caption spymsg = TranslatableCaption.of("chat.plot_chat_spy_format");
|
||||||
|
Template plotidTemplate = Template.of("plot_id", id.getX() + ";" + id.getY());
|
||||||
|
Template spysenderTemplate = Template.of("sender", sender);
|
||||||
|
Template spymessageTemplate = Template.of("msg", Component.text(message));
|
||||||
for (PlotPlayer<?> player : spies) {
|
for (PlotPlayer<?> player : spies) {
|
||||||
player.sendMessage(spymsg, builder.tag("message", Tag.inserting(Component.text(message))).build());
|
player.sendMessage(spymsg, worldNameTemplate, plotidTemplate, spysenderTemplate, spymessageTemplate);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (Settings.Chat.LOG_PLOTCHAT_TO_CONSOLE) {
|
if (Settings.Chat.LOG_PLOTCHAT_TO_CONSOLE) {
|
||||||
Caption spymsg = TranslatableCaption.of("chat.plot_chat_spy_format");
|
Caption spymsg = TranslatableCaption.of("chat.plot_chat_spy_format");
|
||||||
ConsolePlayer.getConsole().sendMessage(
|
Template plotidTemplate = Template.of("plot_id", id.getX() + ";" + id.getY());
|
||||||
spymsg,
|
Template spysenderTemplate = Template.of("sender", sender);
|
||||||
builder.tag("message", Tag.inserting(Component.text(message))).build()
|
Template spymessageTemplate = Template.of("msg", Component.text(message));
|
||||||
|
ConsolePlayer.getConsole().sendMessage(spymsg, worldNameTemplate, plotidTemplate, spysenderTemplate,
|
||||||
|
spymessageTemplate
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -920,10 +921,7 @@ public class PlayerEventListener extends PlotListener implements Listener {
|
|||||||
if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_INTERACT_ROAD)) {
|
if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_INTERACT_ROAD)) {
|
||||||
pp.sendMessage(
|
pp.sendMessage(
|
||||||
TranslatableCaption.of("permission.no_permission_event"),
|
TranslatableCaption.of("permission.no_permission_event"),
|
||||||
TagResolver.resolver(
|
Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_INTERACT_ROAD))
|
||||||
"node",
|
|
||||||
Tag.inserting(Permission.PERMISSION_ADMIN_INTERACT_ROAD)
|
|
||||||
)
|
|
||||||
);
|
);
|
||||||
cancelled = true;
|
cancelled = true;
|
||||||
}
|
}
|
||||||
@ -931,10 +929,7 @@ public class PlayerEventListener extends PlotListener implements Listener {
|
|||||||
if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_INTERACT_UNOWNED)) {
|
if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_INTERACT_UNOWNED)) {
|
||||||
pp.sendMessage(
|
pp.sendMessage(
|
||||||
TranslatableCaption.of("permission.no_permission_event"),
|
TranslatableCaption.of("permission.no_permission_event"),
|
||||||
TagResolver.resolver(
|
Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_INTERACT_UNOWNED))
|
||||||
"node",
|
|
||||||
Tag.inserting(Permission.PERMISSION_ADMIN_INTERACT_UNOWNED)
|
|
||||||
)
|
|
||||||
);
|
);
|
||||||
cancelled = true;
|
cancelled = true;
|
||||||
}
|
}
|
||||||
@ -944,10 +939,7 @@ public class PlayerEventListener extends PlotListener implements Listener {
|
|||||||
if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_INTERACT_OTHER)) {
|
if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_INTERACT_OTHER)) {
|
||||||
pp.sendMessage(
|
pp.sendMessage(
|
||||||
TranslatableCaption.of("permission.no_permission_event"),
|
TranslatableCaption.of("permission.no_permission_event"),
|
||||||
TagResolver.resolver(
|
Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_INTERACT_OTHER))
|
||||||
"node",
|
|
||||||
Tag.inserting(Permission.PERMISSION_ADMIN_INTERACT_OTHER)
|
|
||||||
)
|
|
||||||
);
|
);
|
||||||
cancelled = true;
|
cancelled = true;
|
||||||
}
|
}
|
||||||
@ -985,10 +977,7 @@ public class PlayerEventListener extends PlotListener implements Listener {
|
|||||||
.hasPermission(pp, Permission.PERMISSION_ADMIN_INTERACT_ROAD)) {
|
.hasPermission(pp, Permission.PERMISSION_ADMIN_INTERACT_ROAD)) {
|
||||||
pp.sendMessage(
|
pp.sendMessage(
|
||||||
TranslatableCaption.of("permission.no_permission_event"),
|
TranslatableCaption.of("permission.no_permission_event"),
|
||||||
TagResolver.resolver(
|
Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_INTERACT_ROAD))
|
||||||
"node",
|
|
||||||
Tag.inserting(Permission.PERMISSION_ADMIN_INTERACT_ROAD)
|
|
||||||
)
|
|
||||||
);
|
);
|
||||||
e.setCancelled(true);
|
e.setCancelled(true);
|
||||||
}
|
}
|
||||||
@ -1006,10 +995,7 @@ public class PlayerEventListener extends PlotListener implements Listener {
|
|||||||
if (!Permissions.hasPermission(pp, "plots.admin.interact.unowned")) {
|
if (!Permissions.hasPermission(pp, "plots.admin.interact.unowned")) {
|
||||||
pp.sendMessage(
|
pp.sendMessage(
|
||||||
TranslatableCaption.of("permission.no_permission_event"),
|
TranslatableCaption.of("permission.no_permission_event"),
|
||||||
TagResolver.resolver(
|
Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_INTERACT_UNOWNED))
|
||||||
"node",
|
|
||||||
Tag.inserting(Permission.PERMISSION_ADMIN_INTERACT_UNOWNED)
|
|
||||||
)
|
|
||||||
);
|
);
|
||||||
e.setCancelled(true);
|
e.setCancelled(true);
|
||||||
}
|
}
|
||||||
@ -1024,10 +1010,7 @@ public class PlayerEventListener extends PlotListener implements Listener {
|
|||||||
if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_INTERACT_OTHER)) {
|
if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_INTERACT_OTHER)) {
|
||||||
pp.sendMessage(
|
pp.sendMessage(
|
||||||
TranslatableCaption.of("permission.no_permission_event"),
|
TranslatableCaption.of("permission.no_permission_event"),
|
||||||
TagResolver.resolver(
|
Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_INTERACT_OTHER))
|
||||||
"node",
|
|
||||||
Tag.inserting(Permission.PERMISSION_ADMIN_INTERACT_OTHER)
|
|
||||||
)
|
|
||||||
);
|
);
|
||||||
e.setCancelled(true);
|
e.setCancelled(true);
|
||||||
plot.debug(pp.getName() + " could not interact with " + entity.getType()
|
plot.debug(pp.getName() + " could not interact with " + entity.getType()
|
||||||
@ -1151,8 +1134,7 @@ public class PlayerEventListener extends PlotListener implements Listener {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
switch (type) {
|
switch (type) {
|
||||||
case ACACIA_BOAT, BIRCH_BOAT, CHEST_MINECART, COMMAND_BLOCK_MINECART, DARK_OAK_BOAT, FURNACE_MINECART, HOPPER_MINECART, JUNGLE_BOAT, MINECART, OAK_BOAT, SPRUCE_BOAT, TNT_MINECART ->
|
case ACACIA_BOAT, BIRCH_BOAT, CHEST_MINECART, COMMAND_BLOCK_MINECART, DARK_OAK_BOAT, FURNACE_MINECART, HOPPER_MINECART, JUNGLE_BOAT, MINECART, OAK_BOAT, SPRUCE_BOAT, TNT_MINECART -> eventType = PlayerBlockEventType.PLACE_VEHICLE;
|
||||||
eventType = PlayerBlockEventType.PLACE_VEHICLE;
|
|
||||||
case FIREWORK_ROCKET, FIREWORK_STAR -> eventType = PlayerBlockEventType.SPAWN_MOB;
|
case FIREWORK_ROCKET, FIREWORK_STAR -> eventType = PlayerBlockEventType.SPAWN_MOB;
|
||||||
case BOOK, KNOWLEDGE_BOOK, WRITABLE_BOOK, WRITTEN_BOOK -> eventType = PlayerBlockEventType.READ;
|
case BOOK, KNOWLEDGE_BOOK, WRITABLE_BOOK, WRITTEN_BOOK -> eventType = PlayerBlockEventType.READ;
|
||||||
case ARMOR_STAND -> {
|
case ARMOR_STAND -> {
|
||||||
@ -1248,7 +1230,7 @@ public class PlayerEventListener extends PlotListener implements Listener {
|
|||||||
}
|
}
|
||||||
pp.sendMessage(
|
pp.sendMessage(
|
||||||
TranslatableCaption.of("permission.no_permission_event"),
|
TranslatableCaption.of("permission.no_permission_event"),
|
||||||
TagResolver.resolver("node", Tag.inserting(Permission.PERMISSION_ADMIN_BUILD_ROAD))
|
Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_BUILD_ROAD))
|
||||||
);
|
);
|
||||||
event.setCancelled(true);
|
event.setCancelled(true);
|
||||||
} else if (!plot.hasOwner()) {
|
} else if (!plot.hasOwner()) {
|
||||||
@ -1257,10 +1239,7 @@ public class PlayerEventListener extends PlotListener implements Listener {
|
|||||||
}
|
}
|
||||||
pp.sendMessage(
|
pp.sendMessage(
|
||||||
TranslatableCaption.of("permission.no_permission_event"),
|
TranslatableCaption.of("permission.no_permission_event"),
|
||||||
TagResolver.resolver(
|
Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_BUILD_UNOWNED))
|
||||||
"node",
|
|
||||||
Tag.inserting(Permission.PERMISSION_ADMIN_BUILD_UNOWNED)
|
|
||||||
)
|
|
||||||
);
|
);
|
||||||
event.setCancelled(true);
|
event.setCancelled(true);
|
||||||
} else if (!plot.isAdded(pp.getUUID())) {
|
} else if (!plot.isAdded(pp.getUUID())) {
|
||||||
@ -1269,10 +1248,7 @@ public class PlayerEventListener extends PlotListener implements Listener {
|
|||||||
}
|
}
|
||||||
pp.sendMessage(
|
pp.sendMessage(
|
||||||
TranslatableCaption.of("permission.no_permission_event"),
|
TranslatableCaption.of("permission.no_permission_event"),
|
||||||
TagResolver.resolver(
|
Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_BUILD_OTHER))
|
||||||
"node",
|
|
||||||
Tag.inserting(Permission.PERMISSION_ADMIN_BUILD_OTHER)
|
|
||||||
)
|
|
||||||
);
|
);
|
||||||
event.setCancelled(true);
|
event.setCancelled(true);
|
||||||
} else if (Settings.Done.RESTRICT_BUILDING && DoneFlag.isDone(plot)) {
|
} else if (Settings.Done.RESTRICT_BUILDING && DoneFlag.isDone(plot)) {
|
||||||
@ -1319,7 +1295,7 @@ public class PlayerEventListener extends PlotListener implements Listener {
|
|||||||
}
|
}
|
||||||
plotPlayer.sendMessage(
|
plotPlayer.sendMessage(
|
||||||
TranslatableCaption.of("permission.no_permission_event"),
|
TranslatableCaption.of("permission.no_permission_event"),
|
||||||
TagResolver.resolver("node", Tag.inserting(Permission.PERMISSION_ADMIN_BUILD_ROAD))
|
Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_BUILD_ROAD))
|
||||||
);
|
);
|
||||||
event.setCancelled(true);
|
event.setCancelled(true);
|
||||||
} else if (!plot.hasOwner()) {
|
} else if (!plot.hasOwner()) {
|
||||||
@ -1328,10 +1304,7 @@ public class PlayerEventListener extends PlotListener implements Listener {
|
|||||||
}
|
}
|
||||||
plotPlayer.sendMessage(
|
plotPlayer.sendMessage(
|
||||||
TranslatableCaption.of("permission.no_permission_event"),
|
TranslatableCaption.of("permission.no_permission_event"),
|
||||||
TagResolver.resolver(
|
Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_BUILD_UNOWNED))
|
||||||
"node",
|
|
||||||
Tag.inserting(Permission.PERMISSION_ADMIN_BUILD_UNOWNED)
|
|
||||||
)
|
|
||||||
);
|
);
|
||||||
event.setCancelled(true);
|
event.setCancelled(true);
|
||||||
} else if (!plot.isAdded(plotPlayer.getUUID())) {
|
} else if (!plot.isAdded(plotPlayer.getUUID())) {
|
||||||
@ -1340,10 +1313,7 @@ public class PlayerEventListener extends PlotListener implements Listener {
|
|||||||
}
|
}
|
||||||
plotPlayer.sendMessage(
|
plotPlayer.sendMessage(
|
||||||
TranslatableCaption.of("permission.no_permission_event"),
|
TranslatableCaption.of("permission.no_permission_event"),
|
||||||
TagResolver.resolver(
|
Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_BUILD_OTHER))
|
||||||
"node",
|
|
||||||
Tag.inserting(Permission.PERMISSION_ADMIN_BUILD_OTHER)
|
|
||||||
)
|
|
||||||
);
|
);
|
||||||
event.setCancelled(true);
|
event.setCancelled(true);
|
||||||
} else if (Settings.Done.RESTRICT_BUILDING && DoneFlag.isDone(plot)) {
|
} else if (Settings.Done.RESTRICT_BUILDING && DoneFlag.isDone(plot)) {
|
||||||
@ -1375,10 +1345,7 @@ public class PlayerEventListener extends PlotListener implements Listener {
|
|||||||
if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_BUILD_ROAD)) {
|
if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_BUILD_ROAD)) {
|
||||||
pp.sendMessage(
|
pp.sendMessage(
|
||||||
TranslatableCaption.of("permission.no_permission_event"),
|
TranslatableCaption.of("permission.no_permission_event"),
|
||||||
TagResolver.resolver(
|
Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_BUILD_ROAD))
|
||||||
"node",
|
|
||||||
Tag.inserting(Permission.PERMISSION_ADMIN_BUILD_ROAD)
|
|
||||||
)
|
|
||||||
);
|
);
|
||||||
event.setCancelled(true);
|
event.setCancelled(true);
|
||||||
}
|
}
|
||||||
@ -1387,10 +1354,7 @@ public class PlayerEventListener extends PlotListener implements Listener {
|
|||||||
if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_BUILD_UNOWNED)) {
|
if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_BUILD_UNOWNED)) {
|
||||||
pp.sendMessage(
|
pp.sendMessage(
|
||||||
TranslatableCaption.of("permission.no_permission_event"),
|
TranslatableCaption.of("permission.no_permission_event"),
|
||||||
TagResolver.resolver(
|
Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_BUILD_UNOWNED))
|
||||||
"node",
|
|
||||||
Tag.inserting(Permission.PERMISSION_ADMIN_BUILD_UNOWNED)
|
|
||||||
)
|
|
||||||
);
|
);
|
||||||
event.setCancelled(true);
|
event.setCancelled(true);
|
||||||
}
|
}
|
||||||
@ -1401,10 +1365,7 @@ public class PlayerEventListener extends PlotListener implements Listener {
|
|||||||
if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_BUILD_OTHER)) {
|
if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_BUILD_OTHER)) {
|
||||||
pp.sendMessage(
|
pp.sendMessage(
|
||||||
TranslatableCaption.of("permission.no_permission_event"),
|
TranslatableCaption.of("permission.no_permission_event"),
|
||||||
TagResolver.resolver(
|
Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_BUILD_OTHER))
|
||||||
"node",
|
|
||||||
Tag.inserting(Permission.PERMISSION_ADMIN_BUILD_OTHER)
|
|
||||||
)
|
|
||||||
);
|
);
|
||||||
event.setCancelled(true);
|
event.setCancelled(true);
|
||||||
}
|
}
|
||||||
@ -1433,10 +1394,7 @@ public class PlayerEventListener extends PlotListener implements Listener {
|
|||||||
if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_DESTROY_ROAD)) {
|
if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_DESTROY_ROAD)) {
|
||||||
pp.sendMessage(
|
pp.sendMessage(
|
||||||
TranslatableCaption.of("permission.no_permission_event"),
|
TranslatableCaption.of("permission.no_permission_event"),
|
||||||
TagResolver.resolver(
|
Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_DESTROY_ROAD))
|
||||||
"node",
|
|
||||||
Tag.inserting(Permission.PERMISSION_ADMIN_DESTROY_ROAD)
|
|
||||||
)
|
|
||||||
);
|
);
|
||||||
event.setCancelled(true);
|
event.setCancelled(true);
|
||||||
}
|
}
|
||||||
@ -1444,10 +1402,7 @@ public class PlayerEventListener extends PlotListener implements Listener {
|
|||||||
if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_DESTROY_UNOWNED)) {
|
if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_DESTROY_UNOWNED)) {
|
||||||
pp.sendMessage(
|
pp.sendMessage(
|
||||||
TranslatableCaption.of("permission.no_permission_event"),
|
TranslatableCaption.of("permission.no_permission_event"),
|
||||||
TagResolver.resolver(
|
Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_DESTROY_UNOWNED))
|
||||||
"node",
|
|
||||||
Tag.inserting(Permission.PERMISSION_ADMIN_DESTROY_UNOWNED)
|
|
||||||
)
|
|
||||||
);
|
);
|
||||||
event.setCancelled(true);
|
event.setCancelled(true);
|
||||||
}
|
}
|
||||||
@ -1458,10 +1413,7 @@ public class PlayerEventListener extends PlotListener implements Listener {
|
|||||||
if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_DESTROY_OTHER)) {
|
if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_DESTROY_OTHER)) {
|
||||||
pp.sendMessage(
|
pp.sendMessage(
|
||||||
TranslatableCaption.of("permission.no_permission_event"),
|
TranslatableCaption.of("permission.no_permission_event"),
|
||||||
TagResolver.resolver(
|
Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_DESTROY_OTHER))
|
||||||
"node",
|
|
||||||
Tag.inserting(Permission.PERMISSION_ADMIN_DESTROY_OTHER)
|
|
||||||
)
|
|
||||||
);
|
);
|
||||||
event.setCancelled(true);
|
event.setCancelled(true);
|
||||||
plot.debug(p.getName()
|
plot.debug(p.getName()
|
||||||
@ -1483,10 +1435,7 @@ public class PlayerEventListener extends PlotListener implements Listener {
|
|||||||
.hasPermission(player, Permission.PERMISSION_ADMIN_DESTROY_UNOWNED)) {
|
.hasPermission(player, Permission.PERMISSION_ADMIN_DESTROY_UNOWNED)) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("permission.no_permission_event"),
|
TranslatableCaption.of("permission.no_permission_event"),
|
||||||
TagResolver.resolver(
|
Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_DESTROY_UNOWNED))
|
||||||
"node",
|
|
||||||
Tag.inserting(Permission.PERMISSION_ADMIN_DESTROY_UNOWNED)
|
|
||||||
)
|
|
||||||
);
|
);
|
||||||
event.setCancelled(true);
|
event.setCancelled(true);
|
||||||
}
|
}
|
||||||
@ -1496,10 +1445,7 @@ public class PlayerEventListener extends PlotListener implements Listener {
|
|||||||
.hasPermission(player, Permission.PERMISSION_ADMIN_DESTROY_OTHER)) {
|
.hasPermission(player, Permission.PERMISSION_ADMIN_DESTROY_OTHER)) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("permission.no_permission_event"),
|
TranslatableCaption.of("permission.no_permission_event"),
|
||||||
TagResolver.resolver(
|
Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_DESTROY_OTHER))
|
||||||
"node",
|
|
||||||
Tag.inserting(Permission.PERMISSION_ADMIN_DESTROY_OTHER)
|
|
||||||
)
|
|
||||||
);
|
);
|
||||||
event.setCancelled(true);
|
event.setCancelled(true);
|
||||||
plot.debug(player.getName()
|
plot.debug(player.getName()
|
||||||
@ -1531,10 +1477,7 @@ public class PlayerEventListener extends PlotListener implements Listener {
|
|||||||
if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_INTERACT_ROAD)) {
|
if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_INTERACT_ROAD)) {
|
||||||
pp.sendMessage(
|
pp.sendMessage(
|
||||||
TranslatableCaption.of("permission.no_permission_event"),
|
TranslatableCaption.of("permission.no_permission_event"),
|
||||||
TagResolver.resolver(
|
Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_INTERACT_ROAD))
|
||||||
"node",
|
|
||||||
Tag.inserting(Permission.PERMISSION_ADMIN_INTERACT_ROAD)
|
|
||||||
)
|
|
||||||
);
|
);
|
||||||
event.setCancelled(true);
|
event.setCancelled(true);
|
||||||
}
|
}
|
||||||
@ -1542,10 +1485,7 @@ public class PlayerEventListener extends PlotListener implements Listener {
|
|||||||
if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_INTERACT_UNOWNED)) {
|
if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_INTERACT_UNOWNED)) {
|
||||||
pp.sendMessage(
|
pp.sendMessage(
|
||||||
TranslatableCaption.of("permission.no_permission_event"),
|
TranslatableCaption.of("permission.no_permission_event"),
|
||||||
TagResolver.resolver(
|
Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_INTERACT_UNOWNED))
|
||||||
"node",
|
|
||||||
Tag.inserting(Permission.PERMISSION_ADMIN_INTERACT_UNOWNED)
|
|
||||||
)
|
|
||||||
);
|
);
|
||||||
event.setCancelled(true);
|
event.setCancelled(true);
|
||||||
}
|
}
|
||||||
@ -1603,10 +1543,7 @@ public class PlayerEventListener extends PlotListener implements Listener {
|
|||||||
if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_INTERACT_OTHER)) {
|
if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_INTERACT_OTHER)) {
|
||||||
pp.sendMessage(
|
pp.sendMessage(
|
||||||
TranslatableCaption.of("permission.no_permission_event"),
|
TranslatableCaption.of("permission.no_permission_event"),
|
||||||
TagResolver.resolver(
|
Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_INTERACT_OTHER))
|
||||||
"node",
|
|
||||||
Tag.inserting(Permission.PERMISSION_ADMIN_INTERACT_OTHER)
|
|
||||||
)
|
|
||||||
);
|
);
|
||||||
event.setCancelled(true);
|
event.setCancelled(true);
|
||||||
}
|
}
|
||||||
@ -1628,10 +1565,7 @@ public class PlayerEventListener extends PlotListener implements Listener {
|
|||||||
if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_DESTROY_VEHICLE_ROAD)) {
|
if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_DESTROY_VEHICLE_ROAD)) {
|
||||||
pp.sendMessage(
|
pp.sendMessage(
|
||||||
TranslatableCaption.of("permission.no_permission_event"),
|
TranslatableCaption.of("permission.no_permission_event"),
|
||||||
TagResolver.resolver(
|
Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_DESTROY_VEHICLE_ROAD))
|
||||||
"node",
|
|
||||||
Tag.inserting(Permission.PERMISSION_ADMIN_DESTROY_VEHICLE_ROAD)
|
|
||||||
)
|
|
||||||
);
|
);
|
||||||
event.setCancelled(true);
|
event.setCancelled(true);
|
||||||
}
|
}
|
||||||
@ -1640,10 +1574,7 @@ public class PlayerEventListener extends PlotListener implements Listener {
|
|||||||
if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_DESTROY_VEHICLE_UNOWNED)) {
|
if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_DESTROY_VEHICLE_UNOWNED)) {
|
||||||
pp.sendMessage(
|
pp.sendMessage(
|
||||||
TranslatableCaption.of("permission.no_permission_event"),
|
TranslatableCaption.of("permission.no_permission_event"),
|
||||||
TagResolver.resolver(
|
Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_DESTROY_VEHICLE_UNOWNED))
|
||||||
"node",
|
|
||||||
Tag.inserting(Permission.PERMISSION_ADMIN_DESTROY_VEHICLE_UNOWNED)
|
|
||||||
)
|
|
||||||
);
|
);
|
||||||
event.setCancelled(true);
|
event.setCancelled(true);
|
||||||
return;
|
return;
|
||||||
@ -1657,10 +1588,7 @@ public class PlayerEventListener extends PlotListener implements Listener {
|
|||||||
if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_DESTROY_VEHICLE_OTHER)) {
|
if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_DESTROY_VEHICLE_OTHER)) {
|
||||||
pp.sendMessage(
|
pp.sendMessage(
|
||||||
TranslatableCaption.of("permission.no_permission_event"),
|
TranslatableCaption.of("permission.no_permission_event"),
|
||||||
TagResolver.resolver(
|
Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_DESTROY_VEHICLE_OTHER))
|
||||||
"node",
|
|
||||||
Tag.inserting(Permission.PERMISSION_ADMIN_DESTROY_VEHICLE_OTHER)
|
|
||||||
)
|
|
||||||
);
|
);
|
||||||
event.setCancelled(true);
|
event.setCancelled(true);
|
||||||
plot.debug(pp.getName()
|
plot.debug(pp.getName()
|
||||||
|
|||||||
@ -35,12 +35,9 @@ import com.plotsquared.core.player.PlotPlayer;
|
|||||||
import com.plotsquared.core.plot.Plot;
|
import com.plotsquared.core.plot.Plot;
|
||||||
import com.plotsquared.core.plot.PlotArea;
|
import com.plotsquared.core.plot.PlotArea;
|
||||||
import com.plotsquared.core.plot.PlotHandler;
|
import com.plotsquared.core.plot.PlotHandler;
|
||||||
import com.plotsquared.core.plot.flag.implementations.ProjectilesFlag;
|
|
||||||
import com.plotsquared.core.plot.world.PlotAreaManager;
|
import com.plotsquared.core.plot.world.PlotAreaManager;
|
||||||
import com.plotsquared.core.util.Permissions;
|
import com.plotsquared.core.util.Permissions;
|
||||||
import net.kyori.adventure.text.Component;
|
import net.kyori.adventure.text.minimessage.Template;
|
||||||
import net.kyori.adventure.text.minimessage.tag.Tag;
|
|
||||||
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
|
|
||||||
import org.bukkit.entity.Entity;
|
import org.bukkit.entity.Entity;
|
||||||
import org.bukkit.entity.LivingEntity;
|
import org.bukkit.entity.LivingEntity;
|
||||||
import org.bukkit.entity.Player;
|
import org.bukkit.entity.Player;
|
||||||
@ -116,10 +113,7 @@ public class ProjectileEventListener implements Listener {
|
|||||||
if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_PROJECTILE_ROAD)) {
|
if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_PROJECTILE_ROAD)) {
|
||||||
pp.sendMessage(
|
pp.sendMessage(
|
||||||
TranslatableCaption.of("permission.no_permission_event"),
|
TranslatableCaption.of("permission.no_permission_event"),
|
||||||
TagResolver.resolver(
|
Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_PROJECTILE_ROAD))
|
||||||
"node",
|
|
||||||
Tag.inserting(Permission.PERMISSION_ADMIN_PROJECTILE_ROAD)
|
|
||||||
)
|
|
||||||
);
|
);
|
||||||
entity.remove();
|
entity.remove();
|
||||||
event.setCancelled(true);
|
event.setCancelled(true);
|
||||||
@ -128,27 +122,19 @@ public class ProjectileEventListener implements Listener {
|
|||||||
if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_PROJECTILE_UNOWNED)) {
|
if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_PROJECTILE_UNOWNED)) {
|
||||||
pp.sendMessage(
|
pp.sendMessage(
|
||||||
TranslatableCaption.of("permission.no_permission_event"),
|
TranslatableCaption.of("permission.no_permission_event"),
|
||||||
TagResolver.resolver(
|
Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_PROJECTILE_UNOWNED))
|
||||||
"node",
|
|
||||||
Tag.inserting(Permission.PERMISSION_ADMIN_PROJECTILE_UNOWNED)
|
|
||||||
)
|
|
||||||
);
|
);
|
||||||
entity.remove();
|
entity.remove();
|
||||||
event.setCancelled(true);
|
event.setCancelled(true);
|
||||||
}
|
}
|
||||||
} else if (!plot.isAdded(pp.getUUID())) {
|
} else if (!plot.isAdded(pp.getUUID())) {
|
||||||
if (!plot.getFlag(ProjectilesFlag.class)) {
|
if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_PROJECTILE_OTHER)) {
|
||||||
if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_PROJECTILE_OTHER)) {
|
pp.sendMessage(
|
||||||
pp.sendMessage(
|
TranslatableCaption.of("permission.no_permission_event"),
|
||||||
TranslatableCaption.of("permission.no_permission_event"),
|
Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_PROJECTILE_OTHER))
|
||||||
TagResolver.resolver(
|
);
|
||||||
"node",
|
entity.remove();
|
||||||
Tag.inserting(Permission.PERMISSION_ADMIN_PROJECTILE_OTHER)
|
event.setCancelled(true);
|
||||||
)
|
|
||||||
);
|
|
||||||
entity.remove();
|
|
||||||
event.setCancelled(true);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -176,7 +162,7 @@ public class ProjectileEventListener implements Listener {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (plot.isAdded(pp.getUUID()) || Permissions
|
if (plot.isAdded(pp.getUUID()) || Permissions
|
||||||
.hasPermission(pp, Permission.PERMISSION_ADMIN_PROJECTILE_OTHER) || plot.getFlag(ProjectilesFlag.class)) {
|
.hasPermission(pp, Permission.PERMISSION_ADMIN_PROJECTILE_OTHER)) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
entity.remove();
|
entity.remove();
|
||||||
|
|||||||
@ -46,7 +46,7 @@ import static com.plotsquared.core.util.ReflectionUtils.getRefClass;
|
|||||||
public class SingleWorldListener implements Listener {
|
public class SingleWorldListener implements Listener {
|
||||||
|
|
||||||
private final Method methodGetHandleChunk;
|
private final Method methodGetHandleChunk;
|
||||||
private Field shouldSave = null;
|
private Field shouldSave;
|
||||||
|
|
||||||
public SingleWorldListener() throws Exception {
|
public SingleWorldListener() throws Exception {
|
||||||
ReflectionUtils.RefClass classCraftChunk = getRefClass("{cb}.CraftChunk");
|
ReflectionUtils.RefClass classCraftChunk = getRefClass("{cb}.CraftChunk");
|
||||||
@ -59,12 +59,9 @@ public class SingleWorldListener implements Listener {
|
|||||||
} else {
|
} else {
|
||||||
this.shouldSave = classChunk.getField("s").getRealField();
|
this.shouldSave = classChunk.getField("s").getRealField();
|
||||||
}
|
}
|
||||||
} else if (PlotSquared.platform().serverVersion()[1] == 17) {
|
} else {
|
||||||
ReflectionUtils.RefClass classChunk = getRefClass("net.minecraft.world.level.chunk.Chunk");
|
ReflectionUtils.RefClass classChunk = getRefClass("net.minecraft.world.level.chunk.Chunk");
|
||||||
this.shouldSave = classChunk.getField("r").getRealField();
|
this.shouldSave = classChunk.getField("r").getRealField();
|
||||||
} else if (PlotSquared.platform().serverVersion()[1] == 18) {
|
|
||||||
ReflectionUtils.RefClass classChunk = getRefClass("net.minecraft.world.level.chunk.IChunkAccess");
|
|
||||||
this.shouldSave = classChunk.getField("b").getRealField();
|
|
||||||
}
|
}
|
||||||
} catch (NoSuchFieldException e) {
|
} catch (NoSuchFieldException e) {
|
||||||
e.printStackTrace();
|
e.printStackTrace();
|
||||||
|
|||||||
@ -38,7 +38,7 @@ import org.checkerframework.checker.nullness.qual.Nullable;
|
|||||||
* @deprecated Deprecated and scheduled for removal without replacement
|
* @deprecated Deprecated and scheduled for removal without replacement
|
||||||
* in favor of the build in setup wizard.
|
* in favor of the build in setup wizard.
|
||||||
*/
|
*/
|
||||||
@Deprecated(forRemoval = true, since = "6.0.0")
|
@Deprecated(forRemoval = true)
|
||||||
@Singleton
|
@Singleton
|
||||||
public class MultiverseWorldManager extends BukkitWorldManager {
|
public class MultiverseWorldManager extends BukkitWorldManager {
|
||||||
|
|
||||||
|
|||||||
@ -74,9 +74,8 @@ public final class BukkitChunkCoordinator extends ChunkCoordinator {
|
|||||||
private final Consumer<Throwable> throwableConsumer;
|
private final Consumer<Throwable> throwableConsumer;
|
||||||
private final boolean unloadAfter;
|
private final boolean unloadAfter;
|
||||||
private final int totalSize;
|
private final int totalSize;
|
||||||
private final AtomicInteger expectedSize;
|
|
||||||
private final AtomicInteger loadingChunks = new AtomicInteger();
|
|
||||||
|
|
||||||
|
private final AtomicInteger expectedSize;
|
||||||
private int batchSize;
|
private int batchSize;
|
||||||
private PlotSquaredTask task;
|
private PlotSquaredTask task;
|
||||||
private boolean shouldCancel;
|
private boolean shouldCancel;
|
||||||
@ -151,13 +150,6 @@ public final class BukkitChunkCoordinator extends ChunkCoordinator {
|
|||||||
|
|
||||||
Chunk chunk = this.availableChunks.poll();
|
Chunk chunk = this.availableChunks.poll();
|
||||||
if (chunk == null) {
|
if (chunk == null) {
|
||||||
if (this.availableChunks.isEmpty()) {
|
|
||||||
if (this.requestedChunks.isEmpty() && loadingChunks.get() == 0) {
|
|
||||||
finish();
|
|
||||||
} else {
|
|
||||||
requestBatch();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
long[] iterationTime = new long[2];
|
long[] iterationTime = new long[2];
|
||||||
@ -205,11 +197,9 @@ public final class BukkitChunkCoordinator extends ChunkCoordinator {
|
|||||||
BlockVector2 chunk;
|
BlockVector2 chunk;
|
||||||
for (int i = 0; i < this.batchSize && (chunk = this.requestedChunks.poll()) != null; i++) {
|
for (int i = 0; i < this.batchSize && (chunk = this.requestedChunks.poll()) != null; i++) {
|
||||||
// This required PaperLib to be bumped to version 1.0.4 to mark the request as urgent
|
// This required PaperLib to be bumped to version 1.0.4 to mark the request as urgent
|
||||||
loadingChunks.incrementAndGet();
|
|
||||||
PaperLib
|
PaperLib
|
||||||
.getChunkAtAsync(this.bukkitWorld, chunk.getX(), chunk.getZ(), true, true)
|
.getChunkAtAsync(this.bukkitWorld, chunk.getX(), chunk.getZ(), true, true)
|
||||||
.whenComplete((chunkObject, throwable) -> {
|
.whenComplete((chunkObject, throwable) -> {
|
||||||
loadingChunks.decrementAndGet();
|
|
||||||
if (throwable != null) {
|
if (throwable != null) {
|
||||||
throwable.printStackTrace();
|
throwable.printStackTrace();
|
||||||
// We want one less because this couldn't be processed
|
// We want one less because this couldn't be processed
|
||||||
|
|||||||
@ -51,7 +51,6 @@ import com.sk89q.worldedit.world.biome.BiomeType;
|
|||||||
import com.sk89q.worldedit.world.block.BaseBlock;
|
import com.sk89q.worldedit.world.block.BaseBlock;
|
||||||
import com.sk89q.worldedit.world.block.BlockState;
|
import com.sk89q.worldedit.world.block.BlockState;
|
||||||
import org.bukkit.Bukkit;
|
import org.bukkit.Bukkit;
|
||||||
import org.bukkit.Chunk;
|
|
||||||
import org.bukkit.block.Block;
|
import org.bukkit.block.Block;
|
||||||
import org.bukkit.block.Container;
|
import org.bukkit.block.Container;
|
||||||
import org.bukkit.block.data.BlockData;
|
import org.bukkit.block.data.BlockData;
|
||||||
@ -112,8 +111,8 @@ public class BukkitQueueCoordinator extends BasicQueueCoordinator {
|
|||||||
public boolean enqueue() {
|
public boolean enqueue() {
|
||||||
final Clipboard regenClipboard;
|
final Clipboard regenClipboard;
|
||||||
if (isRegen()) {
|
if (isRegen()) {
|
||||||
BlockVector3 start = BlockVector3.at(getRegenStart()[0] << 4, getMinY(), getRegenStart()[1] << 4);
|
BlockVector3 start = BlockVector3.at(getRegenStart()[0] << 4, 0, getRegenStart()[1] << 4);
|
||||||
BlockVector3 end = BlockVector3.at((getRegenEnd()[0] << 4) + 15, getMaxY(), (getRegenEnd()[1] << 4) + 15);
|
BlockVector3 end = BlockVector3.at((getRegenEnd()[0] << 4) + 15, 255, (getRegenEnd()[1] << 4) + 15);
|
||||||
Region region = new CuboidRegion(start, end);
|
Region region = new CuboidRegion(start, end);
|
||||||
regenClipboard = new BlockArrayClipboard(region);
|
regenClipboard = new BlockArrayClipboard(region);
|
||||||
regenClipboard.setOrigin(start);
|
regenClipboard.setOrigin(start);
|
||||||
@ -135,7 +134,7 @@ public class BukkitQueueCoordinator extends BasicQueueCoordinator {
|
|||||||
int sx = blockVector2.getX() << 4;
|
int sx = blockVector2.getX() << 4;
|
||||||
int sz = blockVector2.getZ() << 4;
|
int sz = blockVector2.getZ() << 4;
|
||||||
if (isRegenChunk) {
|
if (isRegenChunk) {
|
||||||
for (int layer = getMinLayer(); layer <= getMaxLayer(); layer++) {
|
for (int layer = 0; layer < 16; layer++) {
|
||||||
for (int y = 0; y < 16; y++) {
|
for (int y = 0; y < 16; y++) {
|
||||||
for (int x = 0; x < 16; x++) {
|
for (int x = 0; x < 16; x++) {
|
||||||
for (int z = 0; z < 16; z++) {
|
for (int z = 0; z < 16; z++) {
|
||||||
@ -171,7 +170,7 @@ public class BukkitQueueCoordinator extends BasicQueueCoordinator {
|
|||||||
int lx = ChunkUtil.getX(j);
|
int lx = ChunkUtil.getX(j);
|
||||||
int lz = ChunkUtil.getZ(j);
|
int lz = ChunkUtil.getZ(j);
|
||||||
int x = sx + lx;
|
int x = sx + lx;
|
||||||
int y = ChunkUtil.getY(layer + localChunk.getMinSection(), j);
|
int y = ChunkUtil.getY(layer, j);
|
||||||
int z = sz + lz;
|
int z = sz + lz;
|
||||||
boolean edge = Settings.QUEUE.UPDATE_EDGES && isEdge(y >> 4, lx, y & 15, lz, blockVector2,
|
boolean edge = Settings.QUEUE.UPDATE_EDGES && isEdge(y >> 4, lx, y & 15, lz, blockVector2,
|
||||||
localChunk
|
localChunk
|
||||||
@ -180,7 +179,7 @@ public class BukkitQueueCoordinator extends BasicQueueCoordinator {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
for (int layer = 0; layer < localChunk.getBiomes().length; layer++) {
|
for (int layer = 0; layer < localChunk.getBaseblocks().length; layer++) {
|
||||||
BiomeType[] biomesLayer = localChunk.getBiomes()[layer];
|
BiomeType[] biomesLayer = localChunk.getBiomes()[layer];
|
||||||
if (biomesLayer == null) {
|
if (biomesLayer == null) {
|
||||||
continue;
|
continue;
|
||||||
@ -267,13 +266,7 @@ public class BukkitQueueCoordinator extends BasicQueueCoordinator {
|
|||||||
} catch (WorldEditException ignored) {
|
} catch (WorldEditException ignored) {
|
||||||
// Fallback to not so nice method
|
// Fallback to not so nice method
|
||||||
BlockData blockData = BukkitAdapter.adapt(block);
|
BlockData blockData = BukkitAdapter.adapt(block);
|
||||||
Block existing;
|
Block existing = getBukkitWorld().getBlockAt(x, y, z);
|
||||||
// Assume a chunk object has been given only when it should have been.
|
|
||||||
if (getChunkObject() instanceof Chunk chunkObject) {
|
|
||||||
existing = chunkObject.getBlock(x & 15, y, z & 15);
|
|
||||||
} else {
|
|
||||||
existing = getBukkitWorld().getBlockAt(x, y, z);
|
|
||||||
}
|
|
||||||
final BlockState existingBaseBlock = BukkitAdapter.adapt(existing.getBlockData());
|
final BlockState existingBaseBlock = BukkitAdapter.adapt(existing.getBlockData());
|
||||||
if (BukkitBlockUtil.get(existing).equals(existingBaseBlock) && existing.getBlockData().matches(blockData)) {
|
if (BukkitBlockUtil.get(existing).equals(existingBaseBlock) && existing.getBlockData().matches(blockData)) {
|
||||||
return;
|
return;
|
||||||
@ -289,7 +282,7 @@ public class BukkitQueueCoordinator extends BasicQueueCoordinator {
|
|||||||
CompoundTag tag = block.getNbtData();
|
CompoundTag tag = block.getNbtData();
|
||||||
StateWrapper sw = new StateWrapper(tag);
|
StateWrapper sw = new StateWrapper(tag);
|
||||||
|
|
||||||
sw.restoreTag(existing);
|
sw.restoreTag(getWorld().getName(), existing.getX(), existing.getY(), existing.getZ());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -302,48 +295,47 @@ public class BukkitQueueCoordinator extends BasicQueueCoordinator {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private boolean isEdge(int layer, int x, int y, int z, BlockVector2 blockVector2, LocalChunk localChunk) {
|
private boolean isEdge(int layer, int x, int y, int z, BlockVector2 blockVector2, LocalChunk localChunk) {
|
||||||
int layerIndex = (layer - localChunk.getMinSection());
|
if (layer == 0 || layer == localChunk.getBaseblocks().length - 1) {
|
||||||
if (layer == localChunk.getMinSection() || layerIndex == localChunk.getBaseblocks().length - 1) {
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
if (x == 0) {
|
if (x == 0) {
|
||||||
LocalChunk localChunkX = getBlockChunks().get(blockVector2.withX(blockVector2.getX() - 1));
|
LocalChunk localChunkX = getBlockChunks().get(blockVector2.withX(blockVector2.getX() - 1));
|
||||||
if (localChunkX == null || localChunkX.getBaseblocks()[layerIndex] == null ||
|
if (localChunkX == null || localChunkX.getBaseblocks()[layer] == null ||
|
||||||
localChunkX.getBaseblocks()[layerIndex][ChunkUtil.getJ(15, y, z)] != null) {
|
localChunkX.getBaseblocks()[layer][ChunkUtil.getJ(15, y, z)] != null) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
} else if (x == 15) {
|
} else if (x == 15) {
|
||||||
LocalChunk localChunkX = getBlockChunks().get(blockVector2.withX(blockVector2.getX() + 1));
|
LocalChunk localChunkX = getBlockChunks().get(blockVector2.withX(blockVector2.getX() + 1));
|
||||||
if (localChunkX == null || localChunkX.getBaseblocks()[layerIndex] == null ||
|
if (localChunkX == null || localChunkX.getBaseblocks()[layer] == null ||
|
||||||
localChunkX.getBaseblocks()[layerIndex][ChunkUtil.getJ(0, y, z)] != null) {
|
localChunkX.getBaseblocks()[layer][ChunkUtil.getJ(0, y, z)] != null) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (z == 0) {
|
if (z == 0) {
|
||||||
LocalChunk localChunkZ = getBlockChunks().get(blockVector2.withZ(blockVector2.getZ() - 1));
|
LocalChunk localChunkZ = getBlockChunks().get(blockVector2.withZ(blockVector2.getZ() - 1));
|
||||||
if (localChunkZ == null || localChunkZ.getBaseblocks()[layerIndex] == null ||
|
if (localChunkZ == null || localChunkZ.getBaseblocks()[layer] == null ||
|
||||||
localChunkZ.getBaseblocks()[layerIndex][ChunkUtil.getJ(x, y, 15)] != null) {
|
localChunkZ.getBaseblocks()[layer][ChunkUtil.getJ(x, y, 15)] != null) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
} else if (z == 15) {
|
} else if (z == 15) {
|
||||||
LocalChunk localChunkZ = getBlockChunks().get(blockVector2.withZ(blockVector2.getZ() + 1));
|
LocalChunk localChunkZ = getBlockChunks().get(blockVector2.withZ(blockVector2.getZ() + 1));
|
||||||
if (localChunkZ == null || localChunkZ.getBaseblocks()[layerIndex] == null ||
|
if (localChunkZ == null || localChunkZ.getBaseblocks()[layer] == null ||
|
||||||
localChunkZ.getBaseblocks()[layerIndex][ChunkUtil.getJ(x, y, 0)] != null) {
|
localChunkZ.getBaseblocks()[layer][ChunkUtil.getJ(x, y, 0)] != null) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (y == 0) {
|
if (y == 0) {
|
||||||
if (localChunk.getBaseblocks()[layerIndex - 1] == null ||
|
if (localChunk.getBaseblocks()[layer - 1] == null ||
|
||||||
localChunk.getBaseblocks()[layerIndex][ChunkUtil.getJ(x, 15, z)] != null) {
|
localChunk.getBaseblocks()[layer][ChunkUtil.getJ(x, 15, z)] != null) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
} else if (y == 15) {
|
} else if (y == 15) {
|
||||||
if (localChunk.getBaseblocks()[layerIndex + 1] == null ||
|
if (localChunk.getBaseblocks()[layer + 1] == null ||
|
||||||
localChunk.getBaseblocks()[layerIndex][ChunkUtil.getJ(x, 0, z)] != null) {
|
localChunk.getBaseblocks()[layer][ChunkUtil.getJ(x, 0, z)] != null) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
BaseBlock[] baseBlocks = localChunk.getBaseblocks()[layerIndex];
|
BaseBlock[] baseBlocks = localChunk.getBaseblocks()[layer];
|
||||||
if (x > 0 && baseBlocks[ChunkUtil.getJ(x - 1, y, z)] == null) {
|
if (x > 0 && baseBlocks[ChunkUtil.getJ(x - 1, y, z)] == null) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -31,7 +31,6 @@ import com.plotsquared.bukkit.util.BukkitUtil;
|
|||||||
import com.plotsquared.core.location.ChunkWrapper;
|
import com.plotsquared.core.location.ChunkWrapper;
|
||||||
import com.plotsquared.core.location.Location;
|
import com.plotsquared.core.location.Location;
|
||||||
import com.plotsquared.core.queue.ScopedQueueCoordinator;
|
import com.plotsquared.core.queue.ScopedQueueCoordinator;
|
||||||
import com.plotsquared.core.util.AnnotationHelper;
|
|
||||||
import com.plotsquared.core.util.ChunkUtil;
|
import com.plotsquared.core.util.ChunkUtil;
|
||||||
import com.plotsquared.core.util.PatternUtil;
|
import com.plotsquared.core.util.PatternUtil;
|
||||||
import com.sk89q.worldedit.bukkit.BukkitAdapter;
|
import com.sk89q.worldedit.bukkit.BukkitAdapter;
|
||||||
@ -51,7 +50,6 @@ import org.checkerframework.checker.nullness.qual.Nullable;
|
|||||||
|
|
||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
|
|
||||||
@AnnotationHelper.ApiDescription(info = "Internal use only. Subject to changes at any time.")
|
|
||||||
public class GenChunk extends ScopedQueueCoordinator {
|
public class GenChunk extends ScopedQueueCoordinator {
|
||||||
|
|
||||||
public final Biome[] biomes;
|
public final Biome[] biomes;
|
||||||
@ -63,14 +61,8 @@ public class GenChunk extends ScopedQueueCoordinator {
|
|||||||
public int chunkZ;
|
public int chunkZ;
|
||||||
private ChunkData chunkData = null;
|
private ChunkData chunkData = null;
|
||||||
|
|
||||||
/**
|
public GenChunk() {
|
||||||
* @param minY minimum world Y, inclusive
|
super(null, Location.at("", 0, 0, 0), Location.at("", 15, 255, 15));
|
||||||
* @param maxY maximum world Y, inclusive
|
|
||||||
*
|
|
||||||
* @since 6.6.0
|
|
||||||
*/
|
|
||||||
public GenChunk(int minY, int maxY) {
|
|
||||||
super(null, Location.at("", 0, minY, 0), Location.at("", 15, maxY, 15));
|
|
||||||
this.biomes = Biome.values();
|
this.biomes = Biome.values();
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -125,7 +117,7 @@ public class GenChunk extends ScopedQueueCoordinator {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
Biome biome = BukkitAdapter.adapt(biomeType);
|
Biome biome = BukkitAdapter.adapt(biomeType);
|
||||||
for (int y = getMin().getY(); y <= getMax().getY(); y++) {
|
for (int y = 0; y < 256; y++) {
|
||||||
for (int x = 0; x < 16; x++) {
|
for (int x = 0; x < 16; x++) {
|
||||||
for (int z = 0; z < 16; z++) {
|
for (int z = 0; z < 16; z++) {
|
||||||
this.biomeGrid.setBiome(x, y, z, biome);
|
this.biomeGrid.setBiome(x, y, z, biome);
|
||||||
@ -138,7 +130,7 @@ public class GenChunk extends ScopedQueueCoordinator {
|
|||||||
public void setCuboid(@NonNull Location pos1, @NonNull Location pos2, @NonNull BlockState block) {
|
public void setCuboid(@NonNull Location pos1, @NonNull Location pos2, @NonNull BlockState block) {
|
||||||
if (result != null && pos1.getX() == 0 && pos1.getZ() == 0 && pos2.getX() == 15 && pos2.getZ() == 15) {
|
if (result != null && pos1.getX() == 0 && pos1.getZ() == 0 && pos2.getX() == 15 && pos2.getZ() == 15) {
|
||||||
for (int y = pos1.getY(); y <= pos2.getY(); y++) {
|
for (int y = pos1.getY(); y <= pos2.getY(); y++) {
|
||||||
int layer = getLayerIndex(y);
|
int layer = y >> 4;
|
||||||
BlockState[] data = result[layer];
|
BlockState[] data = result[layer];
|
||||||
if (data == null) {
|
if (data == null) {
|
||||||
result[layer] = data = new BlockState[4096];
|
result[layer] = data = new BlockState[4096];
|
||||||
@ -172,7 +164,7 @@ public class GenChunk extends ScopedQueueCoordinator {
|
|||||||
*/
|
*/
|
||||||
public boolean setBiome(int x, int z, @NonNull Biome biome) {
|
public boolean setBiome(int x, int z, @NonNull Biome biome) {
|
||||||
if (this.biomeGrid != null) {
|
if (this.biomeGrid != null) {
|
||||||
for (int y = getMin().getY(); y <= getMax().getY(); y++) {
|
for (int y = 0; y < 256; y++) {
|
||||||
this.setBiome(x, y, z, biome);
|
this.setBiome(x, y, z, biome);
|
||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
@ -205,7 +197,7 @@ public class GenChunk extends ScopedQueueCoordinator {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private void storeCache(final int x, final int y, final int z, final @NonNull BlockState id) {
|
private void storeCache(final int x, final int y, final int z, final @NonNull BlockState id) {
|
||||||
int i = getLayerIndex(y);
|
int i = y >> 4;
|
||||||
BlockState[] v = this.result[i];
|
BlockState[] v = this.result[i];
|
||||||
if (v == null) {
|
if (v == null) {
|
||||||
this.result[i] = v = new BlockState[4096];
|
this.result[i] = v = new BlockState[4096];
|
||||||
@ -227,7 +219,7 @@ public class GenChunk extends ScopedQueueCoordinator {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public @Nullable BlockState getBlock(int x, int y, int z) {
|
public @Nullable BlockState getBlock(int x, int y, int z) {
|
||||||
int i = getLayerIndex(y);
|
int i = y >> 4;
|
||||||
if (result == null) {
|
if (result == null) {
|
||||||
return BukkitBlockUtil.get(chunkData.getType(x, y, z));
|
return BukkitBlockUtil.get(chunkData.getType(x, y, z));
|
||||||
}
|
}
|
||||||
@ -254,16 +246,16 @@ public class GenChunk extends ScopedQueueCoordinator {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public @NonNull Location getMax() {
|
public @NonNull Location getMax() {
|
||||||
return Location.at(getWorld().getName(), 15 + (getX() << 4), super.getMax().getY(), 15 + (getZ() << 4));
|
return Location.at(getWorld().getName(), 15 + (getX() << 4), 255, 15 + (getZ() << 4));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public @NonNull Location getMin() {
|
public @NonNull Location getMin() {
|
||||||
return Location.at(getWorld().getName(), getX() << 4, super.getMin().getY(), getZ() << 4);
|
return Location.at(getWorld().getName(), getX() << 4, 0, getZ() << 4);
|
||||||
}
|
}
|
||||||
|
|
||||||
public @NonNull GenChunk clone() {
|
public @NonNull GenChunk clone() {
|
||||||
GenChunk toReturn = new GenChunk(getMin().getY(), getMax().getY());
|
GenChunk toReturn = new GenChunk();
|
||||||
if (this.result != null) {
|
if (this.result != null) {
|
||||||
for (int i = 0; i < this.result.length; i++) {
|
for (int i = 0; i < this.result.length; i++) {
|
||||||
BlockState[] matrix = this.result[i];
|
BlockState[] matrix = this.result[i];
|
||||||
@ -277,8 +269,4 @@ public class GenChunk extends ScopedQueueCoordinator {
|
|||||||
return toReturn;
|
return toReturn;
|
||||||
}
|
}
|
||||||
|
|
||||||
private int getLayerIndex(int y) {
|
|
||||||
return (y - getMin().getY()) >> 4;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -44,7 +44,6 @@ import org.bukkit.enchantments.Enchantment;
|
|||||||
import org.bukkit.inventory.Inventory;
|
import org.bukkit.inventory.Inventory;
|
||||||
import org.bukkit.inventory.InventoryHolder;
|
import org.bukkit.inventory.InventoryHolder;
|
||||||
import org.bukkit.inventory.ItemStack;
|
import org.bukkit.inventory.ItemStack;
|
||||||
import org.checkerframework.checker.nullness.qual.NonNull;
|
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
@ -167,32 +166,14 @@ public class StateWrapper {
|
|||||||
return str;
|
return str;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
@SuppressWarnings("deprecation") // #setLine is needed for Spigot compatibility
|
||||||
* Restore the TileEntity data to the given world at the given coordinates.
|
|
||||||
*
|
|
||||||
* @param worldName World name
|
|
||||||
* @param x x position
|
|
||||||
* @param y y position
|
|
||||||
* @param z z position
|
|
||||||
* @return true if successful
|
|
||||||
*/
|
|
||||||
public boolean restoreTag(String worldName, int x, int y, int z) {
|
public boolean restoreTag(String worldName, int x, int y, int z) {
|
||||||
World world = BukkitUtil.getWorld(worldName);
|
if (this.tag == null) {
|
||||||
if (world == null) {
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
return restoreTag(world.getBlockAt(x, y, z));
|
World world = BukkitUtil.getWorld(worldName);
|
||||||
}
|
Block block = world.getBlockAt(x, y, z);
|
||||||
|
if (block == null) {
|
||||||
/**
|
|
||||||
* Restore the TileEntity data to the given block
|
|
||||||
*
|
|
||||||
* @param block Block to restore to
|
|
||||||
* @return true if successful
|
|
||||||
*/
|
|
||||||
@SuppressWarnings("deprecation") // #setLine is needed for Spigot compatibility
|
|
||||||
public boolean restoreTag(@NonNull Block block) {
|
|
||||||
if (this.tag == null) {
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
org.bukkit.block.BlockState state = block.getState();
|
org.bukkit.block.BlockState state = block.getState();
|
||||||
|
|||||||
@ -50,9 +50,7 @@ import com.plotsquared.core.util.EntityUtil;
|
|||||||
import com.plotsquared.core.util.Permissions;
|
import com.plotsquared.core.util.Permissions;
|
||||||
import com.plotsquared.core.util.entity.EntityCategories;
|
import com.plotsquared.core.util.entity.EntityCategories;
|
||||||
import com.sk89q.worldedit.bukkit.BukkitAdapter;
|
import com.sk89q.worldedit.bukkit.BukkitAdapter;
|
||||||
import net.kyori.adventure.text.Component;
|
import net.kyori.adventure.text.minimessage.Template;
|
||||||
import net.kyori.adventure.text.minimessage.tag.Tag;
|
|
||||||
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
|
|
||||||
import org.bukkit.entity.Arrow;
|
import org.bukkit.entity.Arrow;
|
||||||
import org.bukkit.entity.Creature;
|
import org.bukkit.entity.Creature;
|
||||||
import org.bukkit.entity.Entity;
|
import org.bukkit.entity.Entity;
|
||||||
@ -190,10 +188,7 @@ public class BukkitEntityUtil {
|
|||||||
if (!Permissions.hasPermission(plotPlayer, Permission.PERMISSION_ADMIN_DESTROY + "." + stub)) {
|
if (!Permissions.hasPermission(plotPlayer, Permission.PERMISSION_ADMIN_DESTROY + "." + stub)) {
|
||||||
plotPlayer.sendMessage(
|
plotPlayer.sendMessage(
|
||||||
TranslatableCaption.of("permission.no_permission_event"),
|
TranslatableCaption.of("permission.no_permission_event"),
|
||||||
TagResolver.resolver(
|
Template.of("node", Permission.PERMISSION_ADMIN_DESTROY + "." + stub)
|
||||||
"node",
|
|
||||||
Tag.inserting(Component.text(Permission.PERMISSION_ADMIN_DESTROY + "." + stub))
|
|
||||||
)
|
|
||||||
);
|
);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@ -205,10 +200,7 @@ public class BukkitEntityUtil {
|
|||||||
if (!Permissions.hasPermission(plotPlayer, Permission.PERMISSION_ADMIN_DESTROY + "." + stub)) {
|
if (!Permissions.hasPermission(plotPlayer, Permission.PERMISSION_ADMIN_DESTROY + "." + stub)) {
|
||||||
plotPlayer.sendMessage(
|
plotPlayer.sendMessage(
|
||||||
TranslatableCaption.of("permission.no_permission_event"),
|
TranslatableCaption.of("permission.no_permission_event"),
|
||||||
TagResolver.resolver(
|
Template.of("node", Permission.PERMISSION_ADMIN_DESTROY + "." + stub)
|
||||||
"node",
|
|
||||||
Tag.inserting(Component.text(Permission.PERMISSION_ADMIN_DESTROY + "." + stub))
|
|
||||||
)
|
|
||||||
);
|
);
|
||||||
if (plot != null) {
|
if (plot != null) {
|
||||||
plot.debug(player.getName()
|
plot.debug(player.getName()
|
||||||
@ -229,10 +221,7 @@ public class BukkitEntityUtil {
|
|||||||
if (!Permissions.hasPermission(plotPlayer, Permission.PERMISSION_ADMIN_PVE + "." + stub)) {
|
if (!Permissions.hasPermission(plotPlayer, Permission.PERMISSION_ADMIN_PVE + "." + stub)) {
|
||||||
plotPlayer.sendMessage(
|
plotPlayer.sendMessage(
|
||||||
TranslatableCaption.of("permission.no_permission_event"),
|
TranslatableCaption.of("permission.no_permission_event"),
|
||||||
TagResolver.resolver(
|
Template.of("node", Permission.PERMISSION_ADMIN_PVE + "." + stub)
|
||||||
"node",
|
|
||||||
Tag.inserting(Component.text(Permission.PERMISSION_ADMIN_PVE + "." + stub))
|
|
||||||
)
|
|
||||||
);
|
);
|
||||||
if (plot != null) {
|
if (plot != null) {
|
||||||
plot.debug(player.getName() + " could not attack " + entityType
|
plot.debug(player.getName() + " could not attack " + entityType
|
||||||
@ -253,10 +242,7 @@ public class BukkitEntityUtil {
|
|||||||
if (!Permissions.hasPermission(plotPlayer, Permission.PERMISSION_ADMIN_PVE + "." + stub)) {
|
if (!Permissions.hasPermission(plotPlayer, Permission.PERMISSION_ADMIN_PVE + "." + stub)) {
|
||||||
plotPlayer.sendMessage(
|
plotPlayer.sendMessage(
|
||||||
TranslatableCaption.of("permission.no_permission_event"),
|
TranslatableCaption.of("permission.no_permission_event"),
|
||||||
TagResolver.resolver(
|
Template.of("node", Permission.PERMISSION_ADMIN_PVE + "." + stub)
|
||||||
"node",
|
|
||||||
Tag.inserting(Component.text(Permission.PERMISSION_ADMIN_PVE + "." + stub))
|
|
||||||
)
|
|
||||||
);
|
);
|
||||||
if (plot != null) {
|
if (plot != null) {
|
||||||
plot.debug(player.getName() + " could not attack " + entityType
|
plot.debug(player.getName() + " could not attack " + entityType
|
||||||
@ -270,10 +256,7 @@ public class BukkitEntityUtil {
|
|||||||
.hasPermission(plotPlayer, Permission.PERMISSION_ADMIN_PVP + "." + stub)) {
|
.hasPermission(plotPlayer, Permission.PERMISSION_ADMIN_PVP + "." + stub)) {
|
||||||
plotPlayer.sendMessage(
|
plotPlayer.sendMessage(
|
||||||
TranslatableCaption.of("permission.no_permission_event"),
|
TranslatableCaption.of("permission.no_permission_event"),
|
||||||
TagResolver.resolver(
|
Template.of("node", Permission.PERMISSION_ADMIN_PVP + "." + stub)
|
||||||
"node",
|
|
||||||
Tag.inserting(Component.text(Permission.PERMISSION_ADMIN_PVP + "." + stub))
|
|
||||||
)
|
|
||||||
);
|
);
|
||||||
plot.debug(player.getName() + " could not attack " + entityType
|
plot.debug(player.getName() + " could not attack " + entityType
|
||||||
+ " because pve = false");
|
+ " because pve = false");
|
||||||
@ -287,10 +270,7 @@ public class BukkitEntityUtil {
|
|||||||
if (!Permissions.hasPermission(plotPlayer, Permission.PERMISSION_ADMIN_PVP + "." + stub)) {
|
if (!Permissions.hasPermission(plotPlayer, Permission.PERMISSION_ADMIN_PVP + "." + stub)) {
|
||||||
plotPlayer.sendMessage(
|
plotPlayer.sendMessage(
|
||||||
TranslatableCaption.of("permission.no_permission_event"),
|
TranslatableCaption.of("permission.no_permission_event"),
|
||||||
TagResolver.resolver(
|
Template.of("node", Permission.PERMISSION_ADMIN_PVP + "." + stub)
|
||||||
"node",
|
|
||||||
Tag.inserting(Component.text(Permission.PERMISSION_ADMIN_PVP + "." + stub))
|
|
||||||
)
|
|
||||||
);
|
);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@ -307,10 +287,7 @@ public class BukkitEntityUtil {
|
|||||||
if (!Permissions.hasPermission(plotPlayer, Permission.PERMISSION_ADMIN_PVE + "." + stub)) {
|
if (!Permissions.hasPermission(plotPlayer, Permission.PERMISSION_ADMIN_PVE + "." + stub)) {
|
||||||
plotPlayer.sendMessage(
|
plotPlayer.sendMessage(
|
||||||
TranslatableCaption.of("permission.no_permission_event"),
|
TranslatableCaption.of("permission.no_permission_event"),
|
||||||
TagResolver.resolver(
|
Template.of("node", Permission.PERMISSION_ADMIN_PVE + "." + stub)
|
||||||
"node",
|
|
||||||
Tag.inserting(Component.text(Permission.PERMISSION_ADMIN_PVE + "." + stub))
|
|
||||||
)
|
|
||||||
);
|
);
|
||||||
if (plot != null) {
|
if (plot != null) {
|
||||||
plot.debug(player.getName() + " could not attack " + entityType
|
plot.debug(player.getName() + " could not attack " + entityType
|
||||||
@ -332,10 +309,7 @@ public class BukkitEntityUtil {
|
|||||||
if (!Permissions.hasPermission(plotPlayer, Permission.PERMISSION_ADMIN_PVE + "." + stub)) {
|
if (!Permissions.hasPermission(plotPlayer, Permission.PERMISSION_ADMIN_PVE + "." + stub)) {
|
||||||
plotPlayer.sendMessage(
|
plotPlayer.sendMessage(
|
||||||
TranslatableCaption.of("permission.no_permission_event"),
|
TranslatableCaption.of("permission.no_permission_event"),
|
||||||
TagResolver.resolver(
|
Template.of("node", Permission.PERMISSION_ADMIN_PVE + "." + stub)
|
||||||
"node",
|
|
||||||
Tag.inserting(Component.text(Permission.PERMISSION_ADMIN_PVE + "." + stub))
|
|
||||||
)
|
|
||||||
);
|
);
|
||||||
if (plot != null) {
|
if (plot != null) {
|
||||||
plot.debug(player.getName() + " could not attack " + entityType
|
plot.debug(player.getName() + " could not attack " + entityType
|
||||||
|
|||||||
@ -42,7 +42,6 @@ import org.bukkit.inventory.InventoryView;
|
|||||||
import org.bukkit.inventory.ItemStack;
|
import org.bukkit.inventory.ItemStack;
|
||||||
import org.bukkit.inventory.PlayerInventory;
|
import org.bukkit.inventory.PlayerInventory;
|
||||||
import org.bukkit.inventory.meta.ItemMeta;
|
import org.bukkit.inventory.meta.ItemMeta;
|
||||||
import org.checkerframework.checker.nullness.qual.Nullable;
|
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
@ -51,19 +50,15 @@ import java.util.stream.IntStream;
|
|||||||
@Singleton
|
@Singleton
|
||||||
public class BukkitInventoryUtil extends InventoryUtil {
|
public class BukkitInventoryUtil extends InventoryUtil {
|
||||||
|
|
||||||
private static @Nullable ItemStack getItem(PlotItemStack item) {
|
private static ItemStack getItem(PlotItemStack item) {
|
||||||
if (item == null) {
|
if (item == null) {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
Material material = BukkitAdapter.adapt(item.getType());
|
ItemStack stack = new ItemStack(BukkitAdapter.adapt(item.getType()), item.getAmount());
|
||||||
if (material == null) {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
ItemStack stack = new ItemStack(material, item.getAmount());
|
|
||||||
ItemMeta meta = null;
|
ItemMeta meta = null;
|
||||||
if (item.getName() != null) {
|
if (item.getName() != null) {
|
||||||
meta = stack.getItemMeta();
|
meta = stack.getItemMeta();
|
||||||
Component nameComponent = BukkitUtil.MINI_MESSAGE.deserialize(item.getName());
|
Component nameComponent = BukkitUtil.MINI_MESSAGE.parse(item.getName());
|
||||||
meta.setDisplayName(BukkitUtil.LEGACY_COMPONENT_SERIALIZER.serialize(nameComponent));
|
meta.setDisplayName(BukkitUtil.LEGACY_COMPONENT_SERIALIZER.serialize(nameComponent));
|
||||||
}
|
}
|
||||||
if (item.getLore() != null) {
|
if (item.getLore() != null) {
|
||||||
@ -109,19 +104,14 @@ public class BukkitInventoryUtil extends InventoryUtil {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean setItemChecked(PlotInventory inv, int index, PlotItemStack item) {
|
public void setItem(PlotInventory inv, int index, PlotItemStack item) {
|
||||||
BukkitPlayer bp = (BukkitPlayer) inv.getPlayer();
|
BukkitPlayer bp = (BukkitPlayer) inv.getPlayer();
|
||||||
InventoryView opened = bp.player.getOpenInventory();
|
InventoryView opened = bp.player.getOpenInventory();
|
||||||
ItemStack stack = getItem(item);
|
|
||||||
if (stack == null) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
if (!inv.isOpen()) {
|
if (!inv.isOpen()) {
|
||||||
return true;
|
return;
|
||||||
}
|
}
|
||||||
opened.setItem(index, stack);
|
opened.setItem(index, getItem(item));
|
||||||
bp.player.updateInventory();
|
bp.player.updateInventory();
|
||||||
return true;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@SuppressWarnings("deprecation") // Paper deprecation
|
@SuppressWarnings("deprecation") // Paper deprecation
|
||||||
|
|||||||
@ -40,6 +40,7 @@ import com.plotsquared.core.queue.QueueCoordinator;
|
|||||||
import com.plotsquared.core.queue.ScopedQueueCoordinator;
|
import com.plotsquared.core.queue.ScopedQueueCoordinator;
|
||||||
import com.plotsquared.core.util.ChunkManager;
|
import com.plotsquared.core.util.ChunkManager;
|
||||||
import com.plotsquared.core.util.RegionManager;
|
import com.plotsquared.core.util.RegionManager;
|
||||||
|
import com.plotsquared.core.util.RegionUtil;
|
||||||
import com.plotsquared.core.util.WorldUtil;
|
import com.plotsquared.core.util.WorldUtil;
|
||||||
import com.plotsquared.core.util.entity.EntityCategories;
|
import com.plotsquared.core.util.entity.EntityCategories;
|
||||||
import com.plotsquared.core.util.task.RunnableVal;
|
import com.plotsquared.core.util.task.RunnableVal;
|
||||||
@ -260,7 +261,7 @@ public class BukkitRegionManager extends RegionManager {
|
|||||||
if (checkX2 && checkZ2) {
|
if (checkX2 && checkZ2) {
|
||||||
map.saveRegion(world, xxt2, xxt, zzt2, zzt); //
|
map.saveRegion(world, xxt2, xxt, zzt2, zzt); //
|
||||||
}
|
}
|
||||||
CuboidRegion currentPlotClear = new CuboidRegion(pos1.getBlockVector3(), pos2.getBlockVector3());
|
CuboidRegion currentPlotClear = RegionUtil.createRegion(pos1.getX(), pos2.getX(), pos1.getZ(), pos2.getZ());
|
||||||
map.saveEntitiesOut(Bukkit.getWorld(world.getName()).getChunkAt(x, z), currentPlotClear);
|
map.saveEntitiesOut(Bukkit.getWorld(world.getName()).getChunkAt(x, z), currentPlotClear);
|
||||||
AugmentedUtils.bypass(
|
AugmentedUtils.bypass(
|
||||||
ignoreAugment,
|
ignoreAugment,
|
||||||
@ -275,9 +276,7 @@ public class BukkitRegionManager extends RegionManager {
|
|||||||
PlotLoc plotLoc = new PlotLoc(bx + x1, bz + z1);
|
PlotLoc plotLoc = new PlotLoc(bx + x1, bz + z1);
|
||||||
BaseBlock[] ids = map.allBlocks.get(plotLoc);
|
BaseBlock[] ids = map.allBlocks.get(plotLoc);
|
||||||
if (ids != null) {
|
if (ids != null) {
|
||||||
int minY = value.getMin().getY();
|
for (int y = 0; y < Math.min(128, ids.length); y++) {
|
||||||
for (int yIndex = 0; yIndex < ids.length; yIndex++) {
|
|
||||||
int y = yIndex + minY;
|
|
||||||
BaseBlock id = ids[y];
|
BaseBlock id = ids[y];
|
||||||
if (id != null) {
|
if (id != null) {
|
||||||
value.setBlock(x1, y, z1, id);
|
value.setBlock(x1, y, z1, id);
|
||||||
@ -285,6 +284,12 @@ public class BukkitRegionManager extends RegionManager {
|
|||||||
value.setBlock(x1, y, z1, BlockTypes.AIR.getDefaultState());
|
value.setBlock(x1, y, z1, BlockTypes.AIR.getDefaultState());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
for (int y = Math.min(128, ids.length); y < ids.length; y++) {
|
||||||
|
BaseBlock id = ids[y];
|
||||||
|
if (id != null) {
|
||||||
|
value.setBlock(x1, y, z1, id);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -292,7 +297,7 @@ public class BukkitRegionManager extends RegionManager {
|
|||||||
}, world.getName(), chunk)
|
}, world.getName(), chunk)
|
||||||
);
|
);
|
||||||
//map.restoreBlocks(worldObj, 0, 0);
|
//map.restoreBlocks(worldObj, 0, 0);
|
||||||
map.restoreEntities(Bukkit.getWorld(world.getName()));
|
map.restoreEntities(Bukkit.getWorld(world.getName()), 0, 0);
|
||||||
});
|
});
|
||||||
regenQueue.setCompleteTask(whenDone);
|
regenQueue.setCompleteTask(whenDone);
|
||||||
queue.setCompleteTask(regenQueue::enqueue);
|
queue.setCompleteTask(regenQueue::enqueue);
|
||||||
|
|||||||
@ -44,6 +44,7 @@ import com.plotsquared.core.util.task.TaskManager;
|
|||||||
import com.sk89q.worldedit.bukkit.BukkitAdapter;
|
import com.sk89q.worldedit.bukkit.BukkitAdapter;
|
||||||
import com.sk89q.worldedit.bukkit.BukkitWorld;
|
import com.sk89q.worldedit.bukkit.BukkitWorld;
|
||||||
import com.sk89q.worldedit.math.BlockVector2;
|
import com.sk89q.worldedit.math.BlockVector2;
|
||||||
|
import com.sk89q.worldedit.regions.CuboidRegion;
|
||||||
import com.sk89q.worldedit.world.biome.BiomeType;
|
import com.sk89q.worldedit.world.biome.BiomeType;
|
||||||
import com.sk89q.worldedit.world.block.BlockCategories;
|
import com.sk89q.worldedit.world.block.BlockCategories;
|
||||||
import com.sk89q.worldedit.world.block.BlockState;
|
import com.sk89q.worldedit.world.block.BlockState;
|
||||||
@ -52,7 +53,7 @@ import com.sk89q.worldedit.world.block.BlockTypes;
|
|||||||
import io.papermc.lib.PaperLib;
|
import io.papermc.lib.PaperLib;
|
||||||
import net.kyori.adventure.platform.bukkit.BukkitAudiences;
|
import net.kyori.adventure.platform.bukkit.BukkitAudiences;
|
||||||
import net.kyori.adventure.text.minimessage.MiniMessage;
|
import net.kyori.adventure.text.minimessage.MiniMessage;
|
||||||
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
|
import net.kyori.adventure.text.minimessage.Template;
|
||||||
import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
|
import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
|
||||||
import org.apache.logging.log4j.LogManager;
|
import org.apache.logging.log4j.LogManager;
|
||||||
import org.apache.logging.log4j.Logger;
|
import org.apache.logging.log4j.Logger;
|
||||||
@ -60,6 +61,7 @@ import org.bukkit.Bukkit;
|
|||||||
import org.bukkit.Chunk;
|
import org.bukkit.Chunk;
|
||||||
import org.bukkit.Material;
|
import org.bukkit.Material;
|
||||||
import org.bukkit.World;
|
import org.bukkit.World;
|
||||||
|
import org.bukkit.block.Biome;
|
||||||
import org.bukkit.block.Block;
|
import org.bukkit.block.Block;
|
||||||
import org.bukkit.block.BlockFace;
|
import org.bukkit.block.BlockFace;
|
||||||
import org.bukkit.block.Sign;
|
import org.bukkit.block.Sign;
|
||||||
@ -244,9 +246,7 @@ public class BukkitUtil extends WorldUtil {
|
|||||||
final World bukkitWorld = Objects.requireNonNull(getWorld(world));
|
final World bukkitWorld = Objects.requireNonNull(getWorld(world));
|
||||||
// Skip top and bottom block
|
// Skip top and bottom block
|
||||||
int air = 1;
|
int air = 1;
|
||||||
int maxY = com.plotsquared.bukkit.util.BukkitWorld.getMaxWorldHeight(bukkitWorld);
|
for (int y = bukkitWorld.getMaxHeight() - 1; y >= 0; y--) {
|
||||||
int minY = com.plotsquared.bukkit.util.BukkitWorld.getMinWorldHeight(bukkitWorld);
|
|
||||||
for (int y = maxY - 1; y >= minY; y--) {
|
|
||||||
Block block = bukkitWorld.getBlockAt(x, y, z);
|
Block block = bukkitWorld.getBlockAt(x, y, z);
|
||||||
Material type = block.getType();
|
Material type = block.getType();
|
||||||
if (type.isSolid()) {
|
if (type.isSolid()) {
|
||||||
@ -273,9 +273,7 @@ public class BukkitUtil extends WorldUtil {
|
|||||||
final World bukkitWorld = Objects.requireNonNull(getWorld(world));
|
final World bukkitWorld = Objects.requireNonNull(getWorld(world));
|
||||||
// Skip top and bottom block
|
// Skip top and bottom block
|
||||||
int air = 1;
|
int air = 1;
|
||||||
int maxY = com.plotsquared.bukkit.util.BukkitWorld.getMaxWorldHeight(bukkitWorld);
|
for (int y = bukkitWorld.getMaxHeight() - 1; y >= 0; y--) {
|
||||||
int minY = com.plotsquared.bukkit.util.BukkitWorld.getMinWorldHeight(bukkitWorld);
|
|
||||||
for (int y = maxY - 1; y >= minY; y--) {
|
|
||||||
Block block = bukkitWorld.getBlockAt(x, y, z);
|
Block block = bukkitWorld.getBlockAt(x, y, z);
|
||||||
Material type = block.getType();
|
Material type = block.getType();
|
||||||
if (type.isSolid()) {
|
if (type.isSolid()) {
|
||||||
@ -339,7 +337,7 @@ public class BukkitUtil extends WorldUtil {
|
|||||||
@SuppressWarnings("deprecation")
|
@SuppressWarnings("deprecation")
|
||||||
public void setSign(
|
public void setSign(
|
||||||
final @NonNull Location location, final @NonNull Caption[] lines,
|
final @NonNull Location location, final @NonNull Caption[] lines,
|
||||||
final @NonNull TagResolver... replacements
|
final @NonNull Template... replacements
|
||||||
) {
|
) {
|
||||||
ensureLoaded(location.getWorldName(), location.getX(), location.getZ(), chunk -> {
|
ensureLoaded(location.getWorldName(), location.getX(), location.getZ(), chunk -> {
|
||||||
PlotArea area = location.getPlotArea();
|
PlotArea area = location.getPlotArea();
|
||||||
@ -347,15 +345,13 @@ public class BukkitUtil extends WorldUtil {
|
|||||||
final Block block = world.getBlockAt(location.getX(), location.getY(), location.getZ());
|
final Block block = world.getBlockAt(location.getX(), location.getY(), location.getZ());
|
||||||
final Material type = block.getType();
|
final Material type = block.getType();
|
||||||
if (type != Material.LEGACY_SIGN && type != Material.LEGACY_WALL_SIGN) {
|
if (type != Material.LEGACY_SIGN && type != Material.LEGACY_WALL_SIGN) {
|
||||||
BlockFace facing = BlockFace.NORTH;
|
BlockFace facing = BlockFace.EAST;
|
||||||
if (!world.getBlockAt(location.getX(), location.getY(), location.getZ() + 1).getType().isSolid()) {
|
if (world.getBlockAt(location.getX(), location.getY(), location.getZ() + 1).getType().isSolid()) {
|
||||||
if (world.getBlockAt(location.getX() - 1, location.getY(), location.getZ()).getType().isSolid()) {
|
facing = BlockFace.NORTH;
|
||||||
facing = BlockFace.EAST;
|
} else if (world.getBlockAt(location.getX() + 1, location.getY(), location.getZ()).getType().isSolid()) {
|
||||||
} else if (world.getBlockAt(location.getX() + 1, location.getY(), location.getZ()).getType().isSolid()) {
|
facing = BlockFace.WEST;
|
||||||
facing = BlockFace.WEST;
|
} else if (world.getBlockAt(location.getX(), location.getY(), location.getZ() - 1).getType().isSolid()) {
|
||||||
} else if (world.getBlockAt(location.getX(), location.getY(), location.getZ() - 1).getType().isSolid()) {
|
facing = BlockFace.SOUTH;
|
||||||
facing = BlockFace.SOUTH;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
if (PlotSquared.platform().serverVersion()[1] == 13) {
|
if (PlotSquared.platform().serverVersion()[1] == 13) {
|
||||||
block.setType(Material.valueOf(area.legacySignMaterial()), false);
|
block.setType(Material.valueOf(area.legacySignMaterial()), false);
|
||||||
@ -372,11 +368,10 @@ public class BukkitUtil extends WorldUtil {
|
|||||||
final org.bukkit.block.BlockState blockstate = block.getState();
|
final org.bukkit.block.BlockState blockstate = block.getState();
|
||||||
if (blockstate instanceof final Sign sign) {
|
if (blockstate instanceof final Sign sign) {
|
||||||
for (int i = 0; i < lines.length; i++) {
|
for (int i = 0; i < lines.length; i++) {
|
||||||
sign.setLine(i, LEGACY_COMPONENT_SERIALIZER.serialize(
|
sign.setLine(i, LEGACY_COMPONENT_SERIALIZER
|
||||||
MINI_MESSAGE.deserialize(lines[i].getComponent(LocaleHolder.console()), replacements)
|
.serialize(MINI_MESSAGE.parse(lines[i].getComponent(LocaleHolder.console()), replacements)));
|
||||||
));
|
|
||||||
}
|
}
|
||||||
sign.update(true, false);
|
sign.update(true);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
@ -387,6 +382,27 @@ public class BukkitUtil extends WorldUtil {
|
|||||||
return new StringComparison<BlockState>().new ComparisonResult(1, state);
|
return new StringComparison<BlockState>().new ComparisonResult(1, state);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void setBiomes(
|
||||||
|
final @NonNull String worldName,
|
||||||
|
final @NonNull CuboidRegion region,
|
||||||
|
final @NonNull BiomeType biomeType
|
||||||
|
) {
|
||||||
|
final World world = getWorld(worldName);
|
||||||
|
if (world == null) {
|
||||||
|
LOGGER.warn("An error occurred while setting the biome because the world was null", new RuntimeException());
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
final Biome biome = BukkitAdapter.adapt(biomeType);
|
||||||
|
for (int x = region.getMinimumPoint().getX(); x <= region.getMaximumPoint().getX(); x++) {
|
||||||
|
for (int z = region.getMinimumPoint().getZ(); z <= region.getMaximumPoint().getZ(); z++) {
|
||||||
|
if (world.getBiome(x, z) != biome) {
|
||||||
|
world.setBiome(x, z, biome);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public com.sk89q.worldedit.world.@NonNull World getWeWorld(final @NonNull String world) {
|
public com.sk89q.worldedit.world.@NonNull World getWeWorld(final @NonNull String world) {
|
||||||
return new BukkitWorld(Bukkit.getWorld(world));
|
return new BukkitWorld(Bukkit.getWorld(world));
|
||||||
|
|||||||
@ -36,18 +36,6 @@ import java.util.Objects;
|
|||||||
public class BukkitWorld implements World<org.bukkit.World> {
|
public class BukkitWorld implements World<org.bukkit.World> {
|
||||||
|
|
||||||
private static final Map<String, BukkitWorld> worldMap = Maps.newHashMap();
|
private static final Map<String, BukkitWorld> worldMap = Maps.newHashMap();
|
||||||
private static final boolean HAS_MIN_Y;
|
|
||||||
|
|
||||||
static {
|
|
||||||
boolean temp;
|
|
||||||
try {
|
|
||||||
org.bukkit.World.class.getMethod("getMinHeight");
|
|
||||||
temp = true;
|
|
||||||
} catch (NoSuchMethodException e) {
|
|
||||||
temp = false;
|
|
||||||
}
|
|
||||||
HAS_MIN_Y = temp;
|
|
||||||
}
|
|
||||||
|
|
||||||
private final org.bukkit.World world;
|
private final org.bukkit.World world;
|
||||||
|
|
||||||
@ -85,24 +73,6 @@ public class BukkitWorld implements World<org.bukkit.World> {
|
|||||||
return bukkitWorld;
|
return bukkitWorld;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Get the min world height from a Bukkit {@link org.bukkit.World}. Inclusive
|
|
||||||
*
|
|
||||||
* @since 6.6.0
|
|
||||||
*/
|
|
||||||
public static int getMinWorldHeight(org.bukkit.World world) {
|
|
||||||
return HAS_MIN_Y ? world.getMinHeight() : 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Get the max world height from a Bukkit {@link org.bukkit.World}. Exclusive
|
|
||||||
*
|
|
||||||
* @since 6.6.0
|
|
||||||
*/
|
|
||||||
public static int getMaxWorldHeight(org.bukkit.World world) {
|
|
||||||
return HAS_MIN_Y ? world.getMaxHeight() : 256;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public org.bukkit.World getPlatformWorld() {
|
public org.bukkit.World getPlatformWorld() {
|
||||||
return this.world;
|
return this.world;
|
||||||
@ -113,41 +83,34 @@ public class BukkitWorld implements World<org.bukkit.World> {
|
|||||||
return this.world.getName();
|
return this.world.getName();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public int getMinHeight() {
|
|
||||||
return getMinWorldHeight(world);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public int getMaxHeight() {
|
|
||||||
return getMaxWorldHeight(world) - 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean equals(final Object o) {
|
public boolean equals(final Object o) {
|
||||||
if (this == o) {
|
if (o == this) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
if (o == null || getClass() != o.getClass()) {
|
if (!(o instanceof final BukkitWorld other)) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
final BukkitWorld that = (BukkitWorld) o;
|
if (!other.canEqual(this)) {
|
||||||
return world.equals(that.world);
|
return false;
|
||||||
|
}
|
||||||
|
if (!Objects.equals(this.world, other.world)) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public int hashCode() {
|
|
||||||
return world.hashCode();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @deprecated This method is not meant to be invoked or overridden, with no replacement.
|
|
||||||
*/
|
|
||||||
@Deprecated(forRemoval = true, since = "6.6.0")
|
|
||||||
protected boolean canEqual(final Object other) {
|
protected boolean canEqual(final Object other) {
|
||||||
return other instanceof BukkitWorld;
|
return other instanceof BukkitWorld;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public int hashCode() {
|
||||||
|
final int PRIME = 59;
|
||||||
|
int result = 1;
|
||||||
|
final Object $world = this.world;
|
||||||
|
result = result * PRIME + ($world == null ? 43 : $world.hashCode());
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
public String toString() {
|
public String toString() {
|
||||||
return "BukkitWorld(world=" + this.world + ")";
|
return "BukkitWorld(world=" + this.world + ")";
|
||||||
}
|
}
|
||||||
|
|||||||
@ -70,7 +70,7 @@ public class ContentMap {
|
|||||||
}
|
}
|
||||||
for (int x = x1; x <= x2; x++) {
|
for (int x = x1; x <= x2; x++) {
|
||||||
for (int z = z1; z <= z2; z++) {
|
for (int z = z1; z <= z2; z++) {
|
||||||
saveBlocks(world, x, z);
|
saveBlocks(world, 256, x, z, 0, 0);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -92,7 +92,14 @@ public class ContentMap {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void saveEntitiesIn(Chunk chunk, CuboidRegion region, boolean delete) {
|
void saveEntitiesIn(Chunk chunk, CuboidRegion region) {
|
||||||
|
saveEntitiesIn(chunk, region, 0, 0, false);
|
||||||
|
}
|
||||||
|
|
||||||
|
void saveEntitiesIn(
|
||||||
|
Chunk chunk, CuboidRegion region, int offsetX, int offsetZ,
|
||||||
|
boolean delete
|
||||||
|
) {
|
||||||
for (Entity entity : chunk.getEntities()) {
|
for (Entity entity : chunk.getEntities()) {
|
||||||
Location location = BukkitUtil.adapt(entity.getLocation());
|
Location location = BukkitUtil.adapt(entity.getLocation());
|
||||||
int x = location.getX();
|
int x = location.getX();
|
||||||
@ -104,6 +111,8 @@ public class ContentMap {
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
EntityWrapper wrap = new ReplicatingEntityWrapper(entity, (short) 2);
|
EntityWrapper wrap = new ReplicatingEntityWrapper(entity, (short) 2);
|
||||||
|
wrap.x += offsetX;
|
||||||
|
wrap.z += offsetZ;
|
||||||
wrap.saveEntity();
|
wrap.saveEntity();
|
||||||
this.entities.add(wrap);
|
this.entities.add(wrap);
|
||||||
if (delete) {
|
if (delete) {
|
||||||
@ -114,10 +123,10 @@ public class ContentMap {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void restoreEntities(World world) {
|
void restoreEntities(World world, int xOffset, int zOffset) {
|
||||||
for (EntityWrapper entity : this.entities) {
|
for (EntityWrapper entity : this.entities) {
|
||||||
try {
|
try {
|
||||||
entity.spawn(world, 0, 0);
|
entity.spawn(world, xOffset, zOffset);
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
LOGGER.error("Failed to restore entity", e);
|
LOGGER.error("Failed to restore entity", e);
|
||||||
}
|
}
|
||||||
@ -125,13 +134,15 @@ public class ContentMap {
|
|||||||
this.entities.clear();
|
this.entities.clear();
|
||||||
}
|
}
|
||||||
|
|
||||||
private void saveBlocks(BukkitWorld world, int x, int z) {
|
//todo optimize maxY
|
||||||
BaseBlock[] ids = new BaseBlock[world.getMaxY() - world.getMinY() + 1];
|
void saveBlocks(BukkitWorld world, int maxY, int x, int z, int offsetX, int offsetZ) {
|
||||||
for (short yIndex = 0; yIndex <= world.getMaxY() - world.getMinY(); yIndex++) {
|
maxY = Math.min(255, maxY);
|
||||||
BaseBlock block = world.getFullBlock(BlockVector3.at(x, yIndex + world.getMinY(), z));
|
BaseBlock[] ids = new BaseBlock[maxY + 1];
|
||||||
ids[yIndex] = block;
|
for (short y = 0; y <= maxY; y++) {
|
||||||
|
BaseBlock block = world.getFullBlock(BlockVector3.at(x, y, z));
|
||||||
|
ids[y] = block;
|
||||||
}
|
}
|
||||||
PlotLoc loc = new PlotLoc(x, z);
|
PlotLoc loc = new PlotLoc(x + offsetX, z + offsetZ);
|
||||||
this.allBlocks.put(loc, ids);
|
this.allBlocks.put(loc, ids);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -110,11 +110,6 @@ public class FaweRegionManager extends BukkitRegionManager {
|
|||||||
delegate.setBiome(region, extendBiome, biome, world, whenDone);
|
delegate.setBiome(region, extendBiome, biome, world, whenDone);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public void setBiome(CuboidRegion region, int extendBiome, BiomeType biome, PlotArea area, Runnable whenDone) {
|
|
||||||
delegate.setBiome(region, extendBiome, biome, area.getWorldName(), whenDone);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean copyRegion(
|
public boolean copyRegion(
|
||||||
final @NonNull Location pos1,
|
final @NonNull Location pos1,
|
||||||
|
|||||||
@ -67,7 +67,7 @@ public class FaweSchematicHandler extends SchematicHandler {
|
|||||||
final PlotPlayer<?> actor,
|
final PlotPlayer<?> actor,
|
||||||
final RunnableVal<Boolean> whenDone
|
final RunnableVal<Boolean> whenDone
|
||||||
) {
|
) {
|
||||||
delegate.paste(schematic, plot, xOffset, yOffset, zOffset, autoHeight, actor, whenDone);
|
delegate.paste(schematic, plot, xOffset, yOffset, zOffset, autoHeight, whenDone);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@ -22,7 +22,7 @@ dependencies {
|
|||||||
api(libs.guiceassistedinject) {
|
api(libs.guiceassistedinject) {
|
||||||
exclude("com.google.inject", "guice")
|
exclude("com.google.inject", "guice")
|
||||||
}
|
}
|
||||||
api(libs.spotbugs)
|
api(libs.findbugs)
|
||||||
|
|
||||||
// Plugins
|
// Plugins
|
||||||
compileOnly(libs.worldeditCore) {
|
compileOnly(libs.worldeditCore) {
|
||||||
@ -54,13 +54,3 @@ tasks.processResources {
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
tasks {
|
|
||||||
withType<Javadoc> {
|
|
||||||
val opt = options as StandardJavadocDocletOptions
|
|
||||||
opt.links("https://docs.enginehub.org/javadoc/com.sk89q.worldedit/worldedit-core/" + libs.worldeditCore.get().versionConstraint.toString())
|
|
||||||
opt.links("https://jd.adventure.kyori.net/api/" + libs.adventure.get().versionConstraint.toString())
|
|
||||||
opt.links("https://google.github.io/guice/api-docs/" + libs.guice.get().versionConstraint.toString() + "/javadoc/")
|
|
||||||
opt.links("https://checkerframework.org/api/")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|||||||
@ -37,7 +37,7 @@ import com.plotsquared.core.util.ChunkManager;
|
|||||||
import com.plotsquared.core.util.EventDispatcher;
|
import com.plotsquared.core.util.EventDispatcher;
|
||||||
import com.plotsquared.core.util.SchematicHandler;
|
import com.plotsquared.core.util.SchematicHandler;
|
||||||
import com.plotsquared.core.util.query.PlotQuery;
|
import com.plotsquared.core.util.query.PlotQuery;
|
||||||
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
|
import net.kyori.adventure.text.minimessage.Template;
|
||||||
import org.checkerframework.checker.nullness.qual.NonNull;
|
import org.checkerframework.checker.nullness.qual.NonNull;
|
||||||
import org.checkerframework.checker.nullness.qual.Nullable;
|
import org.checkerframework.checker.nullness.qual.Nullable;
|
||||||
|
|
||||||
@ -152,7 +152,7 @@ public class PlotAPI {
|
|||||||
*/
|
*/
|
||||||
public void sendConsoleMessage(
|
public void sendConsoleMessage(
|
||||||
final @NonNull String message,
|
final @NonNull String message,
|
||||||
final @NonNull TagResolver @NonNull ... replacements
|
final @NonNull Template @NonNull ... replacements
|
||||||
) {
|
) {
|
||||||
ConsolePlayer.getConsole().sendMessage(StaticCaption.of(message), replacements);
|
ConsolePlayer.getConsole().sendMessage(StaticCaption.of(message), replacements);
|
||||||
}
|
}
|
||||||
@ -165,7 +165,7 @@ public class PlotAPI {
|
|||||||
*/
|
*/
|
||||||
public void sendConsoleMessage(
|
public void sendConsoleMessage(
|
||||||
final @NonNull Caption caption,
|
final @NonNull Caption caption,
|
||||||
final @NonNull TagResolver @NonNull ... replacements
|
final @NonNull Template @NonNull ... replacements
|
||||||
) {
|
) {
|
||||||
ConsolePlayer.getConsole().sendMessage(caption, replacements);
|
ConsolePlayer.getConsole().sendMessage(caption, replacements);
|
||||||
}
|
}
|
||||||
|
|||||||
@ -98,22 +98,6 @@ public interface PlotPlatform<P> extends LocaleHolder {
|
|||||||
*/
|
*/
|
||||||
int[] serverVersion();
|
int[] serverVersion();
|
||||||
|
|
||||||
/**
|
|
||||||
* Gets the default minimum world height for the version of Minecraft that the server is running.
|
|
||||||
*
|
|
||||||
* @return minimum world height
|
|
||||||
* @since 6.6.0
|
|
||||||
*/
|
|
||||||
int versionMinHeight();
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Gets the default maximum world height for the version of Minecraft that the server is running.
|
|
||||||
*
|
|
||||||
* @return maximum world height (inclusive)
|
|
||||||
* @since 6.6.0
|
|
||||||
*/
|
|
||||||
int versionMaxHeight();
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Gets the server implementation name and version
|
* Gets the server implementation name and version
|
||||||
*
|
*
|
||||||
@ -290,7 +274,6 @@ public interface PlotPlatform<P> extends LocaleHolder {
|
|||||||
* Get the {@link PlotAreaManager} implementation.
|
* Get the {@link PlotAreaManager} implementation.
|
||||||
*
|
*
|
||||||
* @return the PlotAreaManager
|
* @return the PlotAreaManager
|
||||||
* @since 6.1.4
|
|
||||||
*/
|
*/
|
||||||
@NonNull PlotAreaManager plotAreaManager();
|
@NonNull PlotAreaManager plotAreaManager();
|
||||||
|
|
||||||
|
|||||||
@ -306,7 +306,7 @@ public class PlotSquared {
|
|||||||
*
|
*
|
||||||
* @param version First version
|
* @param version First version
|
||||||
* @param version2 Second version
|
* @param version2 Second version
|
||||||
* @return {@code true} if `version` is >= `version2`
|
* @return true if `version` is >= `version2`
|
||||||
*/
|
*/
|
||||||
public boolean checkVersion(
|
public boolean checkVersion(
|
||||||
final int[] version,
|
final int[] version,
|
||||||
@ -338,11 +338,9 @@ public class PlotSquared {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Add a global reference to a plot world.
|
* Add a global reference to a plot world.
|
||||||
* <p>
|
|
||||||
* You can remove the reference by calling {@link #removePlotArea(PlotArea)}
|
|
||||||
* </p>
|
|
||||||
*
|
*
|
||||||
* @param plotArea the {@link PlotArea} to add.
|
* @param plotArea the {@link PlotArea} to add.
|
||||||
|
* @see #removePlotArea(PlotArea) To remove the reference
|
||||||
*/
|
*/
|
||||||
@SuppressWarnings("unchecked")
|
@SuppressWarnings("unchecked")
|
||||||
public void addPlotArea(final @NonNull PlotArea plotArea) {
|
public void addPlotArea(final @NonNull PlotArea plotArea) {
|
||||||
@ -735,7 +733,7 @@ public class PlotSquared {
|
|||||||
*
|
*
|
||||||
* @param plot the plot to remove
|
* @param plot the plot to remove
|
||||||
* @param callEvent If to call an event about the plot being removed
|
* @param callEvent If to call an event about the plot being removed
|
||||||
* @return {@code true} if plot existed | {@code false} if it didn't
|
* @return true if plot existed | false if it didn't
|
||||||
*/
|
*/
|
||||||
public boolean removePlot(
|
public boolean removePlot(
|
||||||
final @NonNull Plot plot,
|
final @NonNull Plot plot,
|
||||||
@ -889,8 +887,8 @@ public class PlotSquared {
|
|||||||
e.printStackTrace();
|
e.printStackTrace();
|
||||||
}
|
}
|
||||||
LOGGER.info("| generator: {}>{}", baseGenerator, areaGen);
|
LOGGER.info("| generator: {}>{}", baseGenerator, areaGen);
|
||||||
LOGGER.info("| plot world: {}", pa.getClass().getCanonicalName());
|
LOGGER.info("| plot world: {}", pa);
|
||||||
LOGGER.info("| manager: {}", pa.getPlotManager().getClass().getCanonicalName());
|
LOGGER.info("| manager: {}", pa);
|
||||||
LOGGER.info("Note: Area created for cluster '{}' (invalid or old configuration?)", name);
|
LOGGER.info("Note: Area created for cluster '{}' (invalid or old configuration?)", name);
|
||||||
areaGen.getPlotGenerator().initialize(pa);
|
areaGen.getPlotGenerator().initialize(pa);
|
||||||
areaGen.augment(pa);
|
areaGen.augment(pa);
|
||||||
@ -906,13 +904,6 @@ public class PlotSquared {
|
|||||||
throw new IllegalArgumentException("Invalid Generator: " + gen_string);
|
throw new IllegalArgumentException("Invalid Generator: " + gen_string);
|
||||||
}
|
}
|
||||||
PlotArea pa = areaGen.getPlotGenerator().getNewPlotArea(world, null, null, null);
|
PlotArea pa = areaGen.getPlotGenerator().getNewPlotArea(world, null, null, null);
|
||||||
LOGGER.info("- generator: {}>{}", baseGenerator, areaGen);
|
|
||||||
LOGGER.info("- plot world: {}", pa.getClass().getCanonicalName());
|
|
||||||
LOGGER.info("- plot area manager: {}", pa.getPlotManager().getClass().getCanonicalName());
|
|
||||||
if (!this.worldConfiguration.contains(path)) {
|
|
||||||
this.worldConfiguration.createSection(path);
|
|
||||||
worldSection = this.worldConfiguration.getConfigurationSection(path);
|
|
||||||
}
|
|
||||||
pa.saveConfiguration(worldSection);
|
pa.saveConfiguration(worldSection);
|
||||||
pa.loadDefaultConfiguration(worldSection);
|
pa.loadDefaultConfiguration(worldSection);
|
||||||
try {
|
try {
|
||||||
@ -920,6 +911,9 @@ public class PlotSquared {
|
|||||||
} catch (IOException e) {
|
} catch (IOException e) {
|
||||||
e.printStackTrace();
|
e.printStackTrace();
|
||||||
}
|
}
|
||||||
|
LOGGER.info("- generator: {}>{}", baseGenerator, areaGen);
|
||||||
|
LOGGER.info("- plot world: {}", pa);
|
||||||
|
LOGGER.info("- plot area manager: {}", pa.getPlotManager());
|
||||||
areaGen.getPlotGenerator().initialize(pa);
|
areaGen.getPlotGenerator().initialize(pa);
|
||||||
areaGen.augment(pa);
|
areaGen.augment(pa);
|
||||||
addPlotArea(pa);
|
addPlotArea(pa);
|
||||||
@ -1024,8 +1018,8 @@ public class PlotSquared {
|
|||||||
// save configuration
|
// save configuration
|
||||||
|
|
||||||
final List<String> validArguments = Arrays
|
final List<String> validArguments = Arrays
|
||||||
.asList("s=", "size=", "g=", "gap=", "h=", "height=", "minh=", "minheight=", "maxh=", "maxheight=",
|
.asList("s=", "size=", "g=", "gap=", "h=", "height=", "f=", "floor=", "m=", "main=",
|
||||||
"f=", "floor=", "m=", "main=", "w=", "wall=", "b=", "border="
|
"w=", "wall=", "b=", "border="
|
||||||
);
|
);
|
||||||
|
|
||||||
// Calculate the number of expected arguments
|
// Calculate the number of expected arguments
|
||||||
@ -1104,14 +1098,6 @@ public class PlotSquared {
|
|||||||
ConfigurationUtil.INTEGER.parseString(value).shortValue()
|
ConfigurationUtil.INTEGER.parseString(value).shortValue()
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
case "minh", "minheight" -> this.worldConfiguration.set(
|
|
||||||
base + "world.min_gen_height",
|
|
||||||
ConfigurationUtil.INTEGER.parseString(value).shortValue()
|
|
||||||
);
|
|
||||||
case "maxh", "maxheight" -> this.worldConfiguration.set(
|
|
||||||
base + "world.max_gen_height",
|
|
||||||
ConfigurationUtil.INTEGER.parseString(value).shortValue()
|
|
||||||
);
|
|
||||||
case "f", "floor" -> this.worldConfiguration.set(
|
case "f", "floor" -> this.worldConfiguration.set(
|
||||||
base + "plot.floor",
|
base + "plot.floor",
|
||||||
ConfigurationUtil.BLOCK_BUCKET.parseString(value).toString()
|
ConfigurationUtil.BLOCK_BUCKET.parseString(value).toString()
|
||||||
@ -1490,7 +1476,7 @@ public class PlotSquared {
|
|||||||
*
|
*
|
||||||
* @param world World name
|
* @param world World name
|
||||||
* @param chunkCoordinates Chunk coordinates
|
* @param chunkCoordinates Chunk coordinates
|
||||||
* @return {@code true} if the chunk uses non-standard generation, {@code false} if not
|
* @return True if the chunk uses non-standard generation, false if not
|
||||||
*/
|
*/
|
||||||
public boolean isNonStandardGeneration(
|
public boolean isNonStandardGeneration(
|
||||||
final @NonNull String world,
|
final @NonNull String world,
|
||||||
@ -1535,12 +1521,10 @@ public class PlotSquared {
|
|||||||
/**
|
/**
|
||||||
* Get the caption map belonging to a namespace. If none exists, a dummy
|
* Get the caption map belonging to a namespace. If none exists, a dummy
|
||||||
* caption map will be returned.
|
* caption map will be returned.
|
||||||
* <p>
|
|
||||||
* You can register a caption map by calling {@link #registerCaptionMap(String, CaptionMap)}
|
|
||||||
* </p>
|
|
||||||
*
|
*
|
||||||
* @param namespace Namespace
|
* @param namespace Namespace
|
||||||
* @return Map instance
|
* @return Map instance
|
||||||
|
* @see #registerCaptionMap(String, CaptionMap) To register a caption map
|
||||||
*/
|
*/
|
||||||
public @NonNull CaptionMap getCaptionMap(final @NonNull String namespace) {
|
public @NonNull CaptionMap getCaptionMap(final @NonNull String namespace) {
|
||||||
return this.captionMaps.computeIfAbsent(
|
return this.captionMaps.computeIfAbsent(
|
||||||
|
|||||||
@ -122,7 +122,7 @@ public final class PlotVersion {
|
|||||||
* Compare a given version string with the one cached here.
|
* Compare a given version string with the one cached here.
|
||||||
*
|
*
|
||||||
* @param versionString the version to compare
|
* @param versionString the version to compare
|
||||||
* @return {@code true} if the given version is a "later" version
|
* @return true if the given version is a "later" version
|
||||||
*/
|
*/
|
||||||
public boolean isLaterVersion(final @NonNull String versionString) {
|
public boolean isLaterVersion(final @NonNull String versionString) {
|
||||||
int dash = versionString.indexOf('-');
|
int dash = versionString.indexOf('-');
|
||||||
@ -144,7 +144,7 @@ public final class PlotVersion {
|
|||||||
* Compare a given version with the one cached here.
|
* Compare a given version with the one cached here.
|
||||||
*
|
*
|
||||||
* @param verArray the version to compare
|
* @param verArray the version to compare
|
||||||
* @return {@code true} if the given version is a "later" version
|
* @return true if the given version is a "later" version
|
||||||
*/
|
*/
|
||||||
public boolean isLaterVersion(int[] verArray) {
|
public boolean isLaterVersion(int[] verArray) {
|
||||||
if (verArray[0] > version[0]) {
|
if (verArray[0] > version[0]) {
|
||||||
|
|||||||
@ -88,7 +88,7 @@ public interface BackupManager {
|
|||||||
* Returns true if (potentially) destructive actions should cause
|
* Returns true if (potentially) destructive actions should cause
|
||||||
* PlotSquared to create automatic plot backups
|
* PlotSquared to create automatic plot backups
|
||||||
*
|
*
|
||||||
* @return {@code true} if automatic backups are enabled
|
* @return True if automatic backups are enabled
|
||||||
*/
|
*/
|
||||||
boolean shouldAutomaticallyBackup();
|
boolean shouldAutomaticallyBackup();
|
||||||
|
|
||||||
|
|||||||
@ -207,7 +207,7 @@ public class PlayerBackupProfile implements BackupProfile {
|
|||||||
if (value) {
|
if (value) {
|
||||||
future.complete(null);
|
future.complete(null);
|
||||||
} else {
|
} else {
|
||||||
future.completeExceptionally(new RuntimeException(MINI_MESSAGE.escapeTags(
|
future.completeExceptionally(new RuntimeException(MINI_MESSAGE.stripTokens(
|
||||||
TranslatableCaption
|
TranslatableCaption
|
||||||
.of("schematics.schematic_paste_failed")
|
.of("schematics.schematic_paste_failed")
|
||||||
.getComponent(ConsolePlayer.getConsole()))));
|
.getComponent(ConsolePlayer.getConsole()))));
|
||||||
|
|||||||
@ -31,14 +31,13 @@ import com.google.inject.Inject;
|
|||||||
import com.google.inject.Singleton;
|
import com.google.inject.Singleton;
|
||||||
import com.plotsquared.core.PlotSquared;
|
import com.plotsquared.core.PlotSquared;
|
||||||
import com.plotsquared.core.configuration.Settings;
|
import com.plotsquared.core.configuration.Settings;
|
||||||
|
import com.plotsquared.core.configuration.caption.Templates;
|
||||||
import com.plotsquared.core.configuration.caption.TranslatableCaption;
|
import com.plotsquared.core.configuration.caption.TranslatableCaption;
|
||||||
import com.plotsquared.core.inject.factory.PlayerBackupProfileFactory;
|
import com.plotsquared.core.inject.factory.PlayerBackupProfileFactory;
|
||||||
import com.plotsquared.core.player.PlotPlayer;
|
import com.plotsquared.core.player.PlotPlayer;
|
||||||
import com.plotsquared.core.plot.Plot;
|
import com.plotsquared.core.plot.Plot;
|
||||||
import com.plotsquared.core.util.task.TaskManager;
|
import com.plotsquared.core.util.task.TaskManager;
|
||||||
import net.kyori.adventure.text.Component;
|
import net.kyori.adventure.text.minimessage.Template;
|
||||||
import net.kyori.adventure.text.minimessage.tag.Tag;
|
|
||||||
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
|
|
||||||
import org.checkerframework.checker.nullness.qual.NonNull;
|
import org.checkerframework.checker.nullness.qual.NonNull;
|
||||||
import org.checkerframework.checker.nullness.qual.Nullable;
|
import org.checkerframework.checker.nullness.qual.Nullable;
|
||||||
|
|
||||||
@ -108,7 +107,7 @@ public class SimpleBackupManager implements BackupManager {
|
|||||||
if (player != null) {
|
if (player != null) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("backups.backup_automatic_started"),
|
TranslatableCaption.of("backups.backup_automatic_started"),
|
||||||
TagResolver.resolver("plot", Tag.inserting(Component.text(plot.getId().toString())))
|
Template.of("plot", plot.getId().toString())
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
profile.createBackup().whenComplete((backup, throwable) -> {
|
profile.createBackup().whenComplete((backup, throwable) -> {
|
||||||
@ -116,7 +115,7 @@ public class SimpleBackupManager implements BackupManager {
|
|||||||
if (player != null) {
|
if (player != null) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("backups.backup_automatic_failure"),
|
TranslatableCaption.of("backups.backup_automatic_failure"),
|
||||||
TagResolver.resolver("reason", Tag.inserting(Component.text(throwable.getMessage())))
|
Templates.of("reason", throwable.getMessage())
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
throwable.printStackTrace();
|
throwable.printStackTrace();
|
||||||
|
|||||||
@ -38,9 +38,7 @@ import com.plotsquared.core.util.PlayerManager;
|
|||||||
import com.plotsquared.core.util.TabCompletions;
|
import com.plotsquared.core.util.TabCompletions;
|
||||||
import com.plotsquared.core.util.task.RunnableVal2;
|
import com.plotsquared.core.util.task.RunnableVal2;
|
||||||
import com.plotsquared.core.util.task.RunnableVal3;
|
import com.plotsquared.core.util.task.RunnableVal3;
|
||||||
import net.kyori.adventure.text.Component;
|
import net.kyori.adventure.text.minimessage.Template;
|
||||||
import net.kyori.adventure.text.minimessage.tag.Tag;
|
|
||||||
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
|
|
||||||
import org.checkerframework.checker.nullness.qual.NonNull;
|
import org.checkerframework.checker.nullness.qual.NonNull;
|
||||||
|
|
||||||
import java.util.Collection;
|
import java.util.Collection;
|
||||||
@ -79,7 +77,7 @@ public class Add extends Command {
|
|||||||
TranslatableCaption.of("permission.no_plot_perms")
|
TranslatableCaption.of("permission.no_plot_perms")
|
||||||
);
|
);
|
||||||
checkTrue(args.length == 1, TranslatableCaption.of("commandconfig.command_syntax"),
|
checkTrue(args.length == 1, TranslatableCaption.of("commandconfig.command_syntax"),
|
||||||
TagResolver.resolver("value", Tag.inserting(Component.text("/plot add <player | *>")))
|
Template.of("value", "/plot add <player | *>")
|
||||||
);
|
);
|
||||||
final CompletableFuture<Boolean> future = new CompletableFuture<>();
|
final CompletableFuture<Boolean> future = new CompletableFuture<>();
|
||||||
PlayerManager.getUUIDsFromString(args[0], (uuids, throwable) -> {
|
PlayerManager.getUUIDsFromString(args[0], (uuids, throwable) -> {
|
||||||
@ -89,7 +87,7 @@ public class Add extends Command {
|
|||||||
} else {
|
} else {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("errors.invalid_player"),
|
TranslatableCaption.of("errors.invalid_player"),
|
||||||
TagResolver.resolver("value", Tag.inserting(Component.text(args[0])))
|
Template.of("value", args[0])
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
future.completeExceptionally(throwable);
|
future.completeExceptionally(throwable);
|
||||||
@ -97,7 +95,7 @@ public class Add extends Command {
|
|||||||
} else {
|
} else {
|
||||||
try {
|
try {
|
||||||
checkTrue(!uuids.isEmpty(), TranslatableCaption.of("errors.invalid_player"),
|
checkTrue(!uuids.isEmpty(), TranslatableCaption.of("errors.invalid_player"),
|
||||||
TagResolver.resolver("value", Tag.inserting(Component.text(args[0])))
|
Template.of("value", args[0])
|
||||||
);
|
);
|
||||||
Iterator<UUID> iterator = uuids.iterator();
|
Iterator<UUID> iterator = uuids.iterator();
|
||||||
int size = plot.getTrusted().size() + plot.getMembers().size();
|
int size = plot.getTrusted().size() + plot.getMembers().size();
|
||||||
@ -108,9 +106,7 @@ public class Add extends Command {
|
|||||||
.hasPermission(player, Permission.PERMISSION_ADMIN_COMMAND_TRUST))) {
|
.hasPermission(player, Permission.PERMISSION_ADMIN_COMMAND_TRUST))) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("errors.invalid_player"),
|
TranslatableCaption.of("errors.invalid_player"),
|
||||||
TagResolver.resolver("value", Tag.inserting(
|
Template.of("value", PlayerManager.resolveName(uuid).getComponent(player))
|
||||||
PlayerManager.resolveName(uuid).toComponent(player)
|
|
||||||
))
|
|
||||||
);
|
);
|
||||||
iterator.remove();
|
iterator.remove();
|
||||||
continue;
|
continue;
|
||||||
@ -118,9 +114,7 @@ public class Add extends Command {
|
|||||||
if (plot.isOwner(uuid)) {
|
if (plot.isOwner(uuid)) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("member.already_added"),
|
TranslatableCaption.of("member.already_added"),
|
||||||
TagResolver.resolver("player", Tag.inserting(
|
Template.of("player", PlayerManager.resolveName(uuid).getComponent(player))
|
||||||
PlayerManager.resolveName(uuid).toComponent(player)
|
|
||||||
))
|
|
||||||
);
|
);
|
||||||
iterator.remove();
|
iterator.remove();
|
||||||
continue;
|
continue;
|
||||||
@ -128,9 +122,7 @@ public class Add extends Command {
|
|||||||
if (plot.getMembers().contains(uuid)) {
|
if (plot.getMembers().contains(uuid)) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("member.already_added"),
|
TranslatableCaption.of("member.already_added"),
|
||||||
TagResolver.resolver("player", Tag.inserting(
|
Template.of("player", PlayerManager.resolveName(uuid).getComponent(player))
|
||||||
PlayerManager.resolveName(uuid).toComponent(player)
|
|
||||||
))
|
|
||||||
);
|
);
|
||||||
iterator.remove();
|
iterator.remove();
|
||||||
continue;
|
continue;
|
||||||
@ -143,7 +135,7 @@ public class Add extends Command {
|
|||||||
if (localAddSize >= maxAddSize) {
|
if (localAddSize >= maxAddSize) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("members.plot_max_members_added"),
|
TranslatableCaption.of("members.plot_max_members_added"),
|
||||||
TagResolver.resolver("amount", Tag.inserting(Component.text(localAddSize)))
|
Template.of("amount", String.valueOf(localAddSize))
|
||||||
);
|
);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -35,9 +35,7 @@ import com.plotsquared.core.plot.Plot;
|
|||||||
import com.plotsquared.core.util.MathMan;
|
import com.plotsquared.core.util.MathMan;
|
||||||
import com.plotsquared.core.util.Permissions;
|
import com.plotsquared.core.util.Permissions;
|
||||||
import com.plotsquared.core.util.query.PlotQuery;
|
import com.plotsquared.core.util.query.PlotQuery;
|
||||||
import net.kyori.adventure.text.Component;
|
import net.kyori.adventure.text.minimessage.Template;
|
||||||
import net.kyori.adventure.text.minimessage.tag.Tag;
|
|
||||||
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
|
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.Collection;
|
import java.util.Collection;
|
||||||
@ -101,10 +99,7 @@ public class Alias extends SubCommand {
|
|||||||
} else {
|
} else {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("permission.no_permission"),
|
TranslatableCaption.of("permission.no_permission"),
|
||||||
TagResolver.resolver(
|
Template.of("node", String.valueOf(Permission.PERMISSION_ALIAS_SET))
|
||||||
"node",
|
|
||||||
Tag.inserting(Permission.PERMISSION_ALIAS_SET)
|
|
||||||
)
|
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -120,10 +115,7 @@ public class Alias extends SubCommand {
|
|||||||
} else {
|
} else {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("permission.no_permission"),
|
TranslatableCaption.of("permission.no_permission"),
|
||||||
TagResolver.resolver(
|
Template.of("node", String.valueOf(Permission.PERMISSION_ALIAS_REMOVE))
|
||||||
"node",
|
|
||||||
Tag.inserting(Permission.PERMISSION_ALIAS_REMOVE)
|
|
||||||
)
|
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -164,16 +156,13 @@ public class Alias extends SubCommand {
|
|||||||
.anyMatch()) {
|
.anyMatch()) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("alias.alias_is_taken"),
|
TranslatableCaption.of("alias.alias_is_taken"),
|
||||||
TagResolver.resolver("alias", Tag.inserting(Component.text(alias)))
|
Template.of("alias", alias)
|
||||||
);
|
);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (Settings.UUID.OFFLINE) {
|
if (Settings.UUID.OFFLINE) {
|
||||||
plot.setAlias(alias);
|
plot.setAlias(alias);
|
||||||
player.sendMessage(
|
player.sendMessage(TranslatableCaption.of("alias.alias_set_to"), Template.of("alias", alias));
|
||||||
TranslatableCaption.of("alias.alias_set_to"),
|
|
||||||
TagResolver.resolver("alias", Tag.inserting(Component.text(alias)))
|
|
||||||
);
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
PlotSquared.get().getImpromptuUUIDPipeline().getSingle(alias, ((uuid, throwable) -> {
|
PlotSquared.get().getImpromptuUUIDPipeline().getSingle(alias, ((uuid, throwable) -> {
|
||||||
@ -182,13 +171,13 @@ public class Alias extends SubCommand {
|
|||||||
} else if (uuid != null) {
|
} else if (uuid != null) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("alias.alias_is_taken"),
|
TranslatableCaption.of("alias.alias_is_taken"),
|
||||||
TagResolver.resolver("alias", Tag.inserting(Component.text(alias)))
|
Template.of("alias", alias)
|
||||||
);
|
);
|
||||||
} else {
|
} else {
|
||||||
plot.setAlias(alias);
|
plot.setAlias(alias);
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("alias.alias_set_to"),
|
TranslatableCaption.of("alias.alias_set_to"),
|
||||||
TagResolver.resolver("alias", Tag.inserting(Component.text(alias)))
|
Template.of("alias", alias)
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}));
|
}));
|
||||||
@ -200,7 +189,7 @@ public class Alias extends SubCommand {
|
|||||||
if (!plot.getAlias().isEmpty()) {
|
if (!plot.getAlias().isEmpty()) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("alias.alias_removed"),
|
TranslatableCaption.of("alias.alias_removed"),
|
||||||
TagResolver.resolver("alias", Tag.inserting(Component.text(alias)))
|
Template.of("alias", alias)
|
||||||
);
|
);
|
||||||
} else {
|
} else {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
|
|||||||
@ -31,6 +31,7 @@ import com.plotsquared.core.configuration.ConfigurationSection;
|
|||||||
import com.plotsquared.core.configuration.ConfigurationUtil;
|
import com.plotsquared.core.configuration.ConfigurationUtil;
|
||||||
import com.plotsquared.core.configuration.Settings;
|
import com.plotsquared.core.configuration.Settings;
|
||||||
import com.plotsquared.core.configuration.caption.CaptionHolder;
|
import com.plotsquared.core.configuration.caption.CaptionHolder;
|
||||||
|
import com.plotsquared.core.configuration.caption.Templates;
|
||||||
import com.plotsquared.core.configuration.caption.TranslatableCaption;
|
import com.plotsquared.core.configuration.caption.TranslatableCaption;
|
||||||
import com.plotsquared.core.configuration.file.YamlConfiguration;
|
import com.plotsquared.core.configuration.file.YamlConfiguration;
|
||||||
import com.plotsquared.core.events.TeleportCause;
|
import com.plotsquared.core.events.TeleportCause;
|
||||||
@ -74,10 +75,7 @@ import com.sk89q.worldedit.function.operation.Operations;
|
|||||||
import com.sk89q.worldedit.math.BlockVector3;
|
import com.sk89q.worldedit.math.BlockVector3;
|
||||||
import com.sk89q.worldedit.regions.CuboidRegion;
|
import com.sk89q.worldedit.regions.CuboidRegion;
|
||||||
import com.sk89q.worldedit.regions.Region;
|
import com.sk89q.worldedit.regions.Region;
|
||||||
import com.sk89q.worldedit.world.World;
|
import net.kyori.adventure.text.minimessage.Template;
|
||||||
import net.kyori.adventure.text.Component;
|
|
||||||
import net.kyori.adventure.text.minimessage.tag.Tag;
|
|
||||||
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
|
|
||||||
import org.checkerframework.checker.nullness.qual.NonNull;
|
import org.checkerframework.checker.nullness.qual.NonNull;
|
||||||
|
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
@ -149,17 +147,14 @@ public class Area extends SubCommand {
|
|||||||
if (!Permissions.hasPermission(player, Permission.PERMISSION_AREA_CREATE)) {
|
if (!Permissions.hasPermission(player, Permission.PERMISSION_AREA_CREATE)) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("permission.no_permission"),
|
TranslatableCaption.of("permission.no_permission"),
|
||||||
TagResolver.resolver(
|
Template.of("node", String.valueOf(Permission.PERMISSION_AREA_CREATE))
|
||||||
"node",
|
|
||||||
Tag.inserting(Permission.PERMISSION_AREA_CREATE)
|
|
||||||
)
|
|
||||||
);
|
);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
if (args.length < 2) {
|
if (args.length < 2) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("single.single_area_needs_name"),
|
TranslatableCaption.of("single.single_area_needs_name"),
|
||||||
TagResolver.resolver("command", Tag.inserting(Component.text("/plot area single <name>")))
|
Template.of("command", "/plot area single <name>")
|
||||||
);
|
);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@ -196,12 +191,11 @@ public class Area extends SubCommand {
|
|||||||
final BlockVector3 playerSelectionMin = playerSelectedRegion.getMinimumPoint();
|
final BlockVector3 playerSelectionMin = playerSelectedRegion.getMinimumPoint();
|
||||||
final BlockVector3 playerSelectionMax = playerSelectedRegion.getMaximumPoint();
|
final BlockVector3 playerSelectionMax = playerSelectedRegion.getMaximumPoint();
|
||||||
// Create a new selection that spans the entire vertical range of the world
|
// Create a new selection that spans the entire vertical range of the world
|
||||||
World world = playerSelectedRegion.getWorld();
|
|
||||||
final CuboidRegion selectedRegion =
|
final CuboidRegion selectedRegion =
|
||||||
new CuboidRegion(
|
new CuboidRegion(
|
||||||
playerSelectedRegion.getWorld(),
|
playerSelectedRegion.getWorld(),
|
||||||
BlockVector3.at(playerSelectionMin.getX(), world.getMinY(), playerSelectionMin.getZ()),
|
BlockVector3.at(playerSelectionMin.getX(), 0, playerSelectionMin.getZ()),
|
||||||
BlockVector3.at(playerSelectionMax.getX(), world.getMaxY(), playerSelectionMax.getZ())
|
BlockVector3.at(playerSelectionMax.getX(), 255, playerSelectionMax.getZ())
|
||||||
);
|
);
|
||||||
// There's only one plot in the area...
|
// There's only one plot in the area...
|
||||||
final PlotId plotId = PlotId.of(1, 1);
|
final PlotId plotId = PlotId.of(1, 1);
|
||||||
@ -284,14 +278,14 @@ public class Area extends SubCommand {
|
|||||||
if (offsetZ != 0) {
|
if (offsetZ != 0) {
|
||||||
this.worldConfiguration.set(path + ".road.offset.z", offsetZ);
|
this.worldConfiguration.set(path + ".road.offset.z", offsetZ);
|
||||||
}
|
}
|
||||||
final String worldName = this.setupUtils.setupWorld(singleBuilder);
|
final String world = this.setupUtils.setupWorld(singleBuilder);
|
||||||
if (this.worldUtil.isWorld(worldName)) {
|
if (this.worldUtil.isWorld(world)) {
|
||||||
PlotSquared.get().loadWorld(worldName, null);
|
PlotSquared.get().loadWorld(world, null);
|
||||||
player.sendMessage(TranslatableCaption.of("single.single_area_created"));
|
player.sendMessage(TranslatableCaption.of("single.single_area_created"));
|
||||||
} else {
|
} else {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("errors.error_create"),
|
TranslatableCaption.of("errors.error_create"),
|
||||||
TagResolver.resolver("world", Tag.inserting(Component.text(hybridPlotWorld.getWorldName())))
|
Template.of("world", hybridPlotWorld.getWorldName())
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
@ -302,10 +296,7 @@ public class Area extends SubCommand {
|
|||||||
if (!Permissions.hasPermission(player, Permission.PERMISSION_AREA_CREATE)) {
|
if (!Permissions.hasPermission(player, Permission.PERMISSION_AREA_CREATE)) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("permission.no_permission"),
|
TranslatableCaption.of("permission.no_permission"),
|
||||||
TagResolver.resolver(
|
Template.of("node", String.valueOf(Permission.PERMISSION_AREA_CREATE))
|
||||||
"node",
|
|
||||||
Tag.inserting(Permission.PERMISSION_AREA_CREATE)
|
|
||||||
)
|
|
||||||
);
|
);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@ -313,10 +304,7 @@ public class Area extends SubCommand {
|
|||||||
case 1:
|
case 1:
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("commandconfig.command_syntax"),
|
TranslatableCaption.of("commandconfig.command_syntax"),
|
||||||
TagResolver.resolver(
|
Templates.of("value", "/plot area create [world[:id]] [<modifier>=<value>]...")
|
||||||
"value",
|
|
||||||
Tag.inserting(Component.text("/plot area create [world[:id]] [<modifier>=<value>]..."))
|
|
||||||
)
|
|
||||||
);
|
);
|
||||||
return false;
|
return false;
|
||||||
case 2:
|
case 2:
|
||||||
@ -330,11 +318,7 @@ public class Area extends SubCommand {
|
|||||||
if (area == null) {
|
if (area == null) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("commandconfig.command_syntax"),
|
TranslatableCaption.of("commandconfig.command_syntax"),
|
||||||
TagResolver.resolver(
|
Templates.of("value", "/plot area create [world[:id]] [<modifier>=<value>]...")
|
||||||
"value",
|
|
||||||
Tag.inserting(Component.text(
|
|
||||||
"/plot area create [world[:id]] [<modifier>=<value>]..."))
|
|
||||||
)
|
|
||||||
);
|
);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@ -345,18 +329,12 @@ public class Area extends SubCommand {
|
|||||||
);
|
);
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("set.set_attribute"),
|
TranslatableCaption.of("set.set_attribute"),
|
||||||
TagResolver.builder()
|
Template.of("attribute", "area_pos1"),
|
||||||
.tag("attribute", Tag.inserting(Component.text("area_pos1")))
|
Template.of("value", location.getX() + "," + location.getZ())
|
||||||
.tag("value", Tag.inserting(
|
|
||||||
Component.text(location.getX())
|
|
||||||
.append(Component.text(","))
|
|
||||||
.append(Component.text(location.getZ()))
|
|
||||||
))
|
|
||||||
.build()
|
|
||||||
);
|
);
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("area.set_pos2"),
|
TranslatableCaption.of("area.set_pos2"),
|
||||||
TagResolver.resolver("command", Tag.inserting(Component.text("/plot area create pos2")))
|
Template.of("command", "/plot area create pos2")
|
||||||
);
|
);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
@ -370,11 +348,7 @@ public class Area extends SubCommand {
|
|||||||
if (area == null) {
|
if (area == null) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("commandconfig.command_syntax"),
|
TranslatableCaption.of("commandconfig.command_syntax"),
|
||||||
TagResolver.resolver(
|
Templates.of("value", "/plot area create [world[:id]] [<modifier>=<value>]...")
|
||||||
"value",
|
|
||||||
Tag.inserting(Component.text(
|
|
||||||
"/plot area create [world[:id]] [<modifier>=<value>]..."))
|
|
||||||
)
|
|
||||||
);
|
);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@ -395,16 +369,12 @@ public class Area extends SubCommand {
|
|||||||
int lower = (area.ROAD_WIDTH & 1) == 0 ? area.ROAD_WIDTH / 2 - 1 : area.ROAD_WIDTH / 2;
|
int lower = (area.ROAD_WIDTH & 1) == 0 ? area.ROAD_WIDTH / 2 - 1 : area.ROAD_WIDTH / 2;
|
||||||
final int offsetX = bx - (area.ROAD_WIDTH == 0 ? 0 : lower);
|
final int offsetX = bx - (area.ROAD_WIDTH == 0 ? 0 : lower);
|
||||||
final int offsetZ = bz - (area.ROAD_WIDTH == 0 ? 0 : lower);
|
final int offsetZ = bz - (area.ROAD_WIDTH == 0 ? 0 : lower);
|
||||||
// Height doesn't matter for this region
|
final CuboidRegion region = RegionUtil.createRegion(bx, tx, bz, tz);
|
||||||
final CuboidRegion region = RegionUtil.createRegion(bx, tx, 0, 0, bz, tz);
|
|
||||||
final Set<PlotArea> areas = this.plotAreaManager.getPlotAreasSet(area.getWorldName(), region);
|
final Set<PlotArea> areas = this.plotAreaManager.getPlotAreasSet(area.getWorldName(), region);
|
||||||
if (!areas.isEmpty()) {
|
if (!areas.isEmpty()) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("cluster.cluster_intersection"),
|
TranslatableCaption.of("cluster.cluster_intersection"),
|
||||||
TagResolver.resolver(
|
Template.of("cluster", areas.iterator().next().toString())
|
||||||
"cluster",
|
|
||||||
Tag.inserting(areas.iterator().next())
|
|
||||||
)
|
|
||||||
);
|
);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@ -443,7 +413,7 @@ public class Area extends SubCommand {
|
|||||||
} else {
|
} else {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("errors.error_create"),
|
TranslatableCaption.of("errors.error_create"),
|
||||||
TagResolver.resolver("world", Tag.inserting(Component.text(area.getWorldName())))
|
Template.of("world", area.getWorldName())
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
@ -477,7 +447,7 @@ public class Area extends SubCommand {
|
|||||||
if (other != null && Objects.equals(pa.getId(), other.getId())) {
|
if (other != null && Objects.equals(pa.getId(), other.getId())) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("setup.setup_world_taken"),
|
TranslatableCaption.of("setup.setup_world_taken"),
|
||||||
TagResolver.resolver("value", Tag.inserting(Component.text(pa.getId())))
|
Template.of("value", pa.toString())
|
||||||
);
|
);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@ -492,13 +462,8 @@ public class Area extends SubCommand {
|
|||||||
if (pair.length != 2) {
|
if (pair.length != 2) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("commandconfig.command_syntax_extended"),
|
TranslatableCaption.of("commandconfig.command_syntax_extended"),
|
||||||
TagResolver.builder()
|
Template.of("value1,", getCommandString()),
|
||||||
.tag("value1", Tag.inserting(Component.text(getCommandString())))
|
Template.of("value2", " create [world[:id]] [<modifier>=<value>]...")
|
||||||
.tag(
|
|
||||||
"value2",
|
|
||||||
Tag.inserting(Component.text("create [world[:id]] [<modifier>=<value>]..."))
|
|
||||||
)
|
|
||||||
.build()
|
|
||||||
);
|
);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@ -534,14 +499,8 @@ public class Area extends SubCommand {
|
|||||||
default -> {
|
default -> {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("commandconfig.command_syntax_extended"),
|
TranslatableCaption.of("commandconfig.command_syntax_extended"),
|
||||||
TagResolver.builder()
|
Template.of("value1", getCommandString()),
|
||||||
.tag("value1", Tag.inserting(Component.text(getCommandString())))
|
Template.of("value2", " create [world[:id]] [<modifier>=<value>]...")
|
||||||
.tag(
|
|
||||||
"value2",
|
|
||||||
Tag.inserting(Component.text(
|
|
||||||
" create [world[:id]] [<modifier>=<value>]..."))
|
|
||||||
)
|
|
||||||
.build()
|
|
||||||
);
|
);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@ -551,7 +510,7 @@ public class Area extends SubCommand {
|
|||||||
if (this.worldUtil.isWorld(pa.getWorldName())) {
|
if (this.worldUtil.isWorld(pa.getWorldName())) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("setup.setup_world_taken"),
|
TranslatableCaption.of("setup.setup_world_taken"),
|
||||||
TagResolver.resolver("value", Tag.inserting(Component.text(pa.getWorldName())))
|
Template.of("value", pa.getWorldName())
|
||||||
);
|
);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@ -572,7 +531,7 @@ public class Area extends SubCommand {
|
|||||||
} else {
|
} else {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("errors.error_create"),
|
TranslatableCaption.of("errors.error_create"),
|
||||||
TagResolver.resolver("world", Tag.inserting(Component.text(pa.getWorldName())))
|
Template.of("world", pa.getWorldName())
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
try {
|
try {
|
||||||
@ -591,18 +550,12 @@ public class Area extends SubCommand {
|
|||||||
if (pa.getId() == null) {
|
if (pa.getId() == null) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("commandconfig.command_syntax"),
|
TranslatableCaption.of("commandconfig.command_syntax"),
|
||||||
TagResolver.resolver("value", Tag.inserting(Component.text(getUsage())))
|
Template.of("value", getUsage())
|
||||||
);
|
);
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("commandconfig.command_syntax_extended"),
|
TranslatableCaption.of("commandconfig.command_syntax_extended"),
|
||||||
TagResolver.builder()
|
Template.of("value1", getCommandString()),
|
||||||
.tag("value1", Tag.inserting(Component.text(getCommandString())))
|
Template.of("value2", " create [world[:id]] [<modifier>=<value>]...")
|
||||||
.tag(
|
|
||||||
"value2",
|
|
||||||
Tag.inserting(Component.text(
|
|
||||||
" create [world[:id]] [<modifier>=<value>]..."))
|
|
||||||
)
|
|
||||||
.build()
|
|
||||||
);
|
);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@ -619,7 +572,7 @@ public class Area extends SubCommand {
|
|||||||
metaData.computeIfAbsent(player.getUUID(), missingUUID -> new HashMap<>()).put("area_create_area", pa);
|
metaData.computeIfAbsent(player.getUUID(), missingUUID -> new HashMap<>()).put("area_create_area", pa);
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("single.get_position"),
|
TranslatableCaption.of("single.get_position"),
|
||||||
TagResolver.resolver("command", Tag.inserting(Component.text(getCommandString())))
|
Template.of("command", getCommandString())
|
||||||
);
|
);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@ -629,10 +582,7 @@ public class Area extends SubCommand {
|
|||||||
if (!Permissions.hasPermission(player, Permission.PERMISSION_AREA_INFO)) {
|
if (!Permissions.hasPermission(player, Permission.PERMISSION_AREA_INFO)) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("permission.no_permission"),
|
TranslatableCaption.of("permission.no_permission"),
|
||||||
TagResolver.resolver(
|
Template.of("node", String.valueOf(Permission.PERMISSION_AREA_INFO))
|
||||||
"node",
|
|
||||||
Tag.inserting(Permission.PERMISSION_AREA_INFO)
|
|
||||||
)
|
|
||||||
);
|
);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@ -643,20 +593,15 @@ public class Area extends SubCommand {
|
|||||||
default -> {
|
default -> {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("commandconfig.command_syntax_extended"),
|
TranslatableCaption.of("commandconfig.command_syntax_extended"),
|
||||||
TagResolver.builder()
|
Template.of("value1", getCommandString()),
|
||||||
.tag("value1", Tag.inserting(Component.text(getCommandString())))
|
Template.of("value2", " info [area]")
|
||||||
.tag("value2", Tag.inserting(Component.text(" info [area]")))
|
|
||||||
.build()
|
|
||||||
);
|
);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (area == null) {
|
if (area == null) {
|
||||||
if (args.length == 2) {
|
if (args.length == 2) {
|
||||||
player.sendMessage(
|
player.sendMessage(TranslatableCaption.of("errors.not_valid_plot_world"), Template.of("value", args[1]));
|
||||||
TranslatableCaption.of("errors.not_valid_plot_world"),
|
|
||||||
TagResolver.resolver("value", Tag.inserting(Component.text(args[1])))
|
|
||||||
);
|
|
||||||
} else {
|
} else {
|
||||||
player.sendMessage(TranslatableCaption.of("errors.not_in_plot_world"));
|
player.sendMessage(TranslatableCaption.of("errors.not_in_plot_world"));
|
||||||
}
|
}
|
||||||
@ -680,35 +625,42 @@ public class Area extends SubCommand {
|
|||||||
percent = claimed == 0 ? 0 : 100d * claimed / Integer.MAX_VALUE;
|
percent = claimed == 0 ? 0 : 100d * claimed / Integer.MAX_VALUE;
|
||||||
region = "N/A";
|
region = "N/A";
|
||||||
}
|
}
|
||||||
TagResolver resolver = TagResolver.builder()
|
Template headerTemplate = Template.of(
|
||||||
.tag(
|
"header",
|
||||||
"header",
|
TranslatableCaption.of("info.plot_info_header").getComponent(player)
|
||||||
Tag.inserting(TranslatableCaption.of("info.plot_info_header").toComponent(player))
|
);
|
||||||
)
|
Template nameTemplate = Template.of("name", name);
|
||||||
.tag("name", Tag.inserting(Component.text(name)))
|
Template typeTemplate = Template.of("type", area.getType().name());
|
||||||
.tag("type", Tag.inserting(Component.text(area.getType().name())))
|
Template terrainTemplate = Template.of("terrain", area.getTerrain().name());
|
||||||
.tag("terrain", Tag.inserting(Component.text(area.getTerrain().name())))
|
Template usageTemplate = Template.of("usage", String.format("%.2f", percent));
|
||||||
.tag("usage", Tag.inserting(Component.text(String.format("%.2f", percent))))
|
Template claimedTemplate = Template.of("claimed", String.valueOf(claimed));
|
||||||
.tag("claimed", Tag.inserting(Component.text(claimed)))
|
Template clustersTemplate = Template.of("clusters", String.valueOf(clusters));
|
||||||
.tag("clusters", Tag.inserting(Component.text(clusters)))
|
Template regionTemplate = Template.of("region", region);
|
||||||
.tag("region", Tag.inserting(Component.text(region)))
|
Template generatorTemplate = Template.of("generator", generator);
|
||||||
.tag("generator", Tag.inserting(Component.text(generator)))
|
Template footerTemplate = Template.of(
|
||||||
.tag(
|
"footer",
|
||||||
"footer",
|
TranslatableCaption.of("info.plot_info_footer").getComponent(player)
|
||||||
Tag.inserting(TranslatableCaption.of("info.plot_info_footer").toComponent(player))
|
);
|
||||||
)
|
player.sendMessage(
|
||||||
.build();
|
TranslatableCaption.of("info.area_info_format"),
|
||||||
player.sendMessage(TranslatableCaption.of("info.area_info_format"), resolver);
|
headerTemplate,
|
||||||
|
nameTemplate,
|
||||||
|
typeTemplate,
|
||||||
|
terrainTemplate,
|
||||||
|
usageTemplate,
|
||||||
|
claimedTemplate,
|
||||||
|
clustersTemplate,
|
||||||
|
regionTemplate,
|
||||||
|
generatorTemplate,
|
||||||
|
footerTemplate
|
||||||
|
);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
case "l", "list" -> {
|
case "l", "list" -> {
|
||||||
if (!Permissions.hasPermission(player, Permission.PERMISSION_AREA_LIST)) {
|
if (!Permissions.hasPermission(player, Permission.PERMISSION_AREA_LIST)) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("permission.no_permission"),
|
TranslatableCaption.of("permission.no_permission"),
|
||||||
TagResolver.resolver(
|
Template.of("node", String.valueOf(Permission.PERMISSION_AREA_LIST))
|
||||||
"node",
|
|
||||||
Tag.inserting(Permission.PERMISSION_AREA_LIST)
|
|
||||||
)
|
|
||||||
);
|
);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@ -725,10 +677,8 @@ public class Area extends SubCommand {
|
|||||||
default:
|
default:
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("commandconfig.command_syntax_extended"),
|
TranslatableCaption.of("commandconfig.command_syntax_extended"),
|
||||||
TagResolver.builder()
|
Template.of("value1", getCommandString()),
|
||||||
.tag("value1", Tag.inserting(Component.text(getCommandString())))
|
Template.of("value2", " list [#]")
|
||||||
.tag("value2", Tag.inserting(Component.text(" list [#]")))
|
|
||||||
.build()
|
|
||||||
);
|
);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@ -754,27 +704,37 @@ public class Area extends SubCommand {
|
|||||||
percent = claimed == 0 ? 0 : (double) claimed / Short.MAX_VALUE * Short.MAX_VALUE;
|
percent = claimed == 0 ? 0 : (double) claimed / Short.MAX_VALUE * Short.MAX_VALUE;
|
||||||
region = "N/A";
|
region = "N/A";
|
||||||
}
|
}
|
||||||
Component tooltip = MINI_MESSAGE.deserialize(
|
Template claimedTemplate = Template.of("claimed", String.valueOf(claimed));
|
||||||
TranslatableCaption.of("info.area_list_tooltip").getComponent(player),
|
Template usageTemplate = Template.of("usage", String.format("%.2f", percent) + "%");
|
||||||
TagResolver.builder()
|
Template clustersTemplate = Template.of("clusters", String.valueOf(clusters));
|
||||||
.tag("claimed", Tag.inserting(Component.text(claimed)))
|
Template regionTemplate = Template.of("region", region);
|
||||||
.tag("usage", Tag.inserting(Component.text(String.format("%.2f", percent) + "%")))
|
Template generatorTemplate = Template.of("generator", generator);
|
||||||
.tag("clusters", Tag.inserting(Component.text(clusters)))
|
String tooltip = MINI_MESSAGE.serialize(MINI_MESSAGE
|
||||||
.tag("region", Tag.inserting(Component.text(region)))
|
.parse(
|
||||||
.tag("generator", Tag.inserting(Component.text(generator)))
|
TranslatableCaption.of("info.area_list_tooltip").getComponent(player),
|
||||||
.build()
|
claimedTemplate,
|
||||||
);
|
usageTemplate,
|
||||||
TagResolver resolver = TagResolver.builder()
|
clustersTemplate,
|
||||||
.tag("hover_info", Tag.inserting(tooltip))
|
regionTemplate,
|
||||||
.tag("command_tp", Tag.preProcessParsed("/plot area tp " + name))
|
generatorTemplate
|
||||||
.tag("command_info", Tag.preProcessParsed("/plot area info " + name))
|
));
|
||||||
.tag("number", Tag.inserting(Component.text(i)))
|
Template tooltipTemplate = Template.of("hover_info", tooltip);
|
||||||
.tag("area_name", Tag.inserting(Component.text(name)))
|
Template visitcmdTemplate = Template.of("command_tp", "/plot area tp " + area);
|
||||||
.tag("area_type", Tag.inserting(Component.text(area.getType().name())))
|
Template infocmdTemplate = Template.of("command_info", "/plot area info " + area);
|
||||||
.tag("area_terrain", Tag.inserting(Component.text(area.getTerrain().name())))
|
Template numberTemplate = Template.of("number", String.valueOf(i));
|
||||||
.build();
|
Template nameTemplate = Template.of("area_name", name);
|
||||||
|
Template typeTemplate = Template.of("area_type", area.getType().name());
|
||||||
|
Template terrainTemplate = Template.of("area_terrain", area.getTerrain().name());
|
||||||
caption.set(TranslatableCaption.of("info.area_list_item"));
|
caption.set(TranslatableCaption.of("info.area_list_item"));
|
||||||
caption.setTagResolvers(resolver);
|
caption.setTemplates(
|
||||||
|
tooltipTemplate,
|
||||||
|
visitcmdTemplate,
|
||||||
|
numberTemplate,
|
||||||
|
nameTemplate,
|
||||||
|
typeTemplate,
|
||||||
|
terrainTemplate,
|
||||||
|
infocmdTemplate
|
||||||
|
);
|
||||||
}
|
}
|
||||||
}, "/plot area list", TranslatableCaption.of("list.area_list_header_paged"));
|
}, "/plot area list", TranslatableCaption.of("list.area_list_header_paged"));
|
||||||
return true;
|
return true;
|
||||||
@ -783,10 +743,7 @@ public class Area extends SubCommand {
|
|||||||
if (!Permissions.hasPermission(player, Permission.PERMISSION_AREA_REGEN)) {
|
if (!Permissions.hasPermission(player, Permission.PERMISSION_AREA_REGEN)) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("permission.no_permission"),
|
TranslatableCaption.of("permission.no_permission"),
|
||||||
TagResolver.resolver(
|
Template.of("node", String.valueOf(Permission.PERMISSION_AREA_REGEN))
|
||||||
"node",
|
|
||||||
Tag.inserting(Permission.PERMISSION_AREA_REGEN)
|
|
||||||
)
|
|
||||||
);
|
);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@ -798,7 +755,7 @@ public class Area extends SubCommand {
|
|||||||
if (area.getType() != PlotAreaType.PARTIAL) {
|
if (area.getType() != PlotAreaType.PARTIAL) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("single.delete_world_region"),
|
TranslatableCaption.of("single.delete_world_region"),
|
||||||
TagResolver.resolver("world", Tag.inserting(Component.text(area.getWorldName())))
|
Template.of("world", area.getWorldName())
|
||||||
);
|
);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@ -819,23 +776,20 @@ public class Area extends SubCommand {
|
|||||||
if (!Permissions.hasPermission(player, Permission.PERMISSION_AREA_TP)) {
|
if (!Permissions.hasPermission(player, Permission.PERMISSION_AREA_TP)) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("permission.no_permission"),
|
TranslatableCaption.of("permission.no_permission"),
|
||||||
TagResolver.resolver("node", Tag.inserting(Permission.PERMISSION_AREA_TP))
|
Template.of("node", String.valueOf(Permission.PERMISSION_AREA_TP))
|
||||||
);
|
);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
if (args.length != 2) {
|
if (args.length != 2) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("commandconfig.command_syntax"),
|
TranslatableCaption.of("commandconfig.command_syntax"),
|
||||||
TagResolver.resolver("value", Tag.inserting(Component.text("/plot area tp [area]")))
|
Template.of("value", "/plot area tp [area]")
|
||||||
);
|
);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
PlotArea area = this.plotAreaManager.getPlotAreaByString(args[1]);
|
PlotArea area = this.plotAreaManager.getPlotAreaByString(args[1]);
|
||||||
if (area == null) {
|
if (area == null) {
|
||||||
player.sendMessage(
|
player.sendMessage(TranslatableCaption.of("errors.not_valid_plot_world"), Template.of("value", args[1]));
|
||||||
TranslatableCaption.of("errors.not_valid_plot_world"),
|
|
||||||
TagResolver.resolver("value", Tag.inserting(Component.text(args[1])))
|
|
||||||
);
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
Location center;
|
Location center;
|
||||||
|
|||||||
@ -51,9 +51,7 @@ import com.plotsquared.core.util.task.AutoClaimFinishTask;
|
|||||||
import com.plotsquared.core.util.task.RunnableVal;
|
import com.plotsquared.core.util.task.RunnableVal;
|
||||||
import com.plotsquared.core.util.task.TaskManager;
|
import com.plotsquared.core.util.task.TaskManager;
|
||||||
import io.leangen.geantyref.TypeToken;
|
import io.leangen.geantyref.TypeToken;
|
||||||
import net.kyori.adventure.text.Component;
|
import net.kyori.adventure.text.minimessage.Template;
|
||||||
import net.kyori.adventure.text.minimessage.tag.Tag;
|
|
||||||
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
|
|
||||||
import org.checkerframework.checker.nullness.qual.NonNull;
|
import org.checkerframework.checker.nullness.qual.NonNull;
|
||||||
import org.checkerframework.checker.nullness.qual.Nullable;
|
import org.checkerframework.checker.nullness.qual.Nullable;
|
||||||
|
|
||||||
@ -119,13 +117,13 @@ public class Auto extends SubCommand {
|
|||||||
if (diff < 0 && grantedPlots < sizeX * sizeZ) {
|
if (diff < 0 && grantedPlots < sizeX * sizeZ) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("permission.cant_claim_more_plots"),
|
TranslatableCaption.of("permission.cant_claim_more_plots"),
|
||||||
TagResolver.resolver("amount", Tag.inserting(Component.text(diff + grantedPlots)))
|
Template.of("amount", String.valueOf(diff + grantedPlots))
|
||||||
);
|
);
|
||||||
return false;
|
return false;
|
||||||
} else if (diff >= 0 && grantedPlots + diff < sizeX * sizeZ) {
|
} else if (diff >= 0 && grantedPlots + diff < sizeX * sizeZ) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("permission.cant_claim_more_plots"),
|
TranslatableCaption.of("permission.cant_claim_more_plots"),
|
||||||
TagResolver.resolver("amount", Tag.inserting(Component.text(diff + grantedPlots)))
|
Template.of("amount", String.valueOf(diff + grantedPlots))
|
||||||
);
|
);
|
||||||
return false;
|
return false;
|
||||||
} else {
|
} else {
|
||||||
@ -137,16 +135,15 @@ public class Auto extends SubCommand {
|
|||||||
}
|
}
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("economy.removed_granted_plot"),
|
TranslatableCaption.of("economy.removed_granted_plot"),
|
||||||
TagResolver.builder()
|
Template.of("usedGrants", String.valueOf(grantedPlots - left)),
|
||||||
.tag("usedGrants", Tag.inserting(Component.text(grantedPlots - left)))
|
Template.of("remainingGrants", String.valueOf(left))
|
||||||
.tag("remainingGrants", Tag.inserting(Component.text(left)))
|
|
||||||
.build()
|
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("permission.cant_claim_more_plots"),
|
TranslatableCaption.of("permission.cant_claim_more_plots"),
|
||||||
TagResolver.resolver("amount", Tag.inserting(Component.text(player.getAllowedPlots())))
|
Template.of("amount", String.valueOf(player.getAllowedPlots())
|
||||||
|
)
|
||||||
);
|
);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@ -225,7 +222,7 @@ public class Auto extends SubCommand {
|
|||||||
} else {
|
} else {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("commandconfig.command_syntax"),
|
TranslatableCaption.of("commandconfig.command_syntax"),
|
||||||
TagResolver.resolver("value", Tag.inserting(Component.text(getUsage())))
|
Template.of("value", getUsage())
|
||||||
);
|
);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
@ -248,7 +245,7 @@ public class Auto extends SubCommand {
|
|||||||
if (event.getEventResult() == Result.DENY) {
|
if (event.getEventResult() == Result.DENY) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("events.event_denied"),
|
TranslatableCaption.of("events.event_denied"),
|
||||||
TagResolver.resolver("value", Tag.inserting(Component.text("Auto claim")))
|
Template.of("value", "Auto claim")
|
||||||
);
|
);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
@ -259,13 +256,13 @@ public class Auto extends SubCommand {
|
|||||||
if (!force && mega && !Permissions.hasPermission(player, Permission.PERMISSION_AUTO_MEGA)) {
|
if (!force && mega && !Permissions.hasPermission(player, Permission.PERMISSION_AUTO_MEGA)) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("permission.no_permission"),
|
TranslatableCaption.of("permission.no_permission"),
|
||||||
TagResolver.resolver("node", Tag.inserting(Permission.PERMISSION_AUTO_MEGA))
|
Template.of("node", String.valueOf(Permission.PERMISSION_AUTO_MEGA))
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
if (!force && sizeX * sizeZ > Settings.Claim.MAX_AUTO_AREA) {
|
if (!force && sizeX * sizeZ > Settings.Claim.MAX_AUTO_AREA) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("permission.cant_claim_more_plots_num"),
|
TranslatableCaption.of("permission.cant_claim_more_plots_num"),
|
||||||
TagResolver.resolver("amount", Tag.inserting(Component.text(Settings.Claim.MAX_AUTO_AREA)))
|
Template.of("amount", String.valueOf(Settings.Claim.MAX_AUTO_AREA))
|
||||||
);
|
);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@ -283,10 +280,8 @@ public class Auto extends SubCommand {
|
|||||||
if (!plotarea.hasSchematic(schematic)) {
|
if (!plotarea.hasSchematic(schematic)) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("schematics.schematic_invalid_named"),
|
TranslatableCaption.of("schematics.schematic_invalid_named"),
|
||||||
TagResolver.builder()
|
Template.of("schemname", schematic),
|
||||||
.tag("schemname", Tag.inserting(Component.text(schematic)))
|
Template.of("reason", "non-existent")
|
||||||
.tag("reason", Tag.inserting(Component.text("non-existent")))
|
|
||||||
.build()
|
|
||||||
);
|
);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
@ -297,7 +292,7 @@ public class Auto extends SubCommand {
|
|||||||
.hasPermission(player, "plots.admin.command.schematic")) {
|
.hasPermission(player, "plots.admin.command.schematic")) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("permission.no_permission"),
|
TranslatableCaption.of("permission.no_permission"),
|
||||||
TagResolver.resolver("node", Tag.inserting(Component.text("plots.claim.%s0")))
|
Template.of("node", "plots.claim.%s0")
|
||||||
);
|
);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
@ -316,20 +311,15 @@ public class Auto extends SubCommand {
|
|||||||
if (!force && this.econHandler.getMoney(player) < cost) {
|
if (!force && this.econHandler.getMoney(player) < cost) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("economy.cannot_afford_plot"),
|
TranslatableCaption.of("economy.cannot_afford_plot"),
|
||||||
TagResolver.builder()
|
Template.of("money", this.econHandler.format(cost)),
|
||||||
.tag("money", Tag.inserting(Component.text(this.econHandler.format(cost))))
|
Template.of("balance", this.econHandler.format(this.econHandler.getMoney(player)))
|
||||||
.tag(
|
|
||||||
"balance",
|
|
||||||
Tag.inserting(Component.text(this.econHandler.format(this.econHandler.getMoney(player))))
|
|
||||||
)
|
|
||||||
.build()
|
|
||||||
);
|
);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
this.econHandler.withdrawMoney(player, cost);
|
this.econHandler.withdrawMoney(player, cost);
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("economy.removed_balance"),
|
TranslatableCaption.of("economy.removed_balance"),
|
||||||
TagResolver.resolver("money", Tag.inserting(Component.text(this.econHandler.format(cost))))
|
Template.of("money", this.econHandler.format(cost))
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -363,7 +353,7 @@ public class Auto extends SubCommand {
|
|||||||
if (!force && mergeEvent.getEventResult() == Result.DENY) {
|
if (!force && mergeEvent.getEventResult() == Result.DENY) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("events.event_denied"),
|
TranslatableCaption.of("events.event_denied"),
|
||||||
TagResolver.resolver("value", Tag.inserting(Component.text("Auto merge")))
|
Template.of("value", "Auto merge")
|
||||||
);
|
);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -37,9 +37,7 @@ import com.plotsquared.core.plot.Plot;
|
|||||||
import com.plotsquared.core.util.Permissions;
|
import com.plotsquared.core.util.Permissions;
|
||||||
import com.plotsquared.core.util.task.RunnableVal2;
|
import com.plotsquared.core.util.task.RunnableVal2;
|
||||||
import com.plotsquared.core.util.task.RunnableVal3;
|
import com.plotsquared.core.util.task.RunnableVal3;
|
||||||
import net.kyori.adventure.text.Component;
|
import net.kyori.adventure.text.minimessage.Template;
|
||||||
import net.kyori.adventure.text.minimessage.tag.Tag;
|
|
||||||
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
|
|
||||||
import org.checkerframework.checker.nullness.qual.NonNull;
|
import org.checkerframework.checker.nullness.qual.NonNull;
|
||||||
|
|
||||||
import java.nio.file.Files;
|
import java.nio.file.Files;
|
||||||
@ -76,7 +74,7 @@ public final class Backup extends Command {
|
|||||||
private static boolean sendMessage(PlotPlayer<?> player) {
|
private static boolean sendMessage(PlotPlayer<?> player) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("commandconfig.command_syntax"),
|
TranslatableCaption.of("commandconfig.command_syntax"),
|
||||||
TagResolver.resolver("value", Tag.inserting(Component.text("/plot backup <save | list | load>")))
|
Template.of("value", "/plot backup <save | list | load>")
|
||||||
);
|
);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
@ -144,45 +142,34 @@ public final class Backup extends Command {
|
|||||||
} else if (!plot.hasOwner()) {
|
} else if (!plot.hasOwner()) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("backups.backup_impossible"),
|
TranslatableCaption.of("backups.backup_impossible"),
|
||||||
TagResolver.resolver("plot", Tag.inserting(
|
Template.of("plot", TranslatableCaption.of("generic.generic_unowned").getComponent(player))
|
||||||
TranslatableCaption.of("generic.generic_unowned").toComponent(player)
|
|
||||||
))
|
|
||||||
);
|
);
|
||||||
} else if (plot.getVolume() > Integer.MAX_VALUE) {
|
} else if (plot.getVolume() > Integer.MAX_VALUE) {
|
||||||
player.sendMessage(TranslatableCaption.of("schematics.schematic_too_large"));
|
player.sendMessage(TranslatableCaption.of("schematics.schematic_too_large"));
|
||||||
} else if (plot.isMerged()) {
|
} else if (plot.isMerged()) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("backups.backup_impossible"),
|
TranslatableCaption.of("backups.backup_impossible"),
|
||||||
TagResolver.resolver("plot", Tag.inserting(
|
Template.of("plot", TranslatableCaption.of("generic.generic_merged").getComponent(player))
|
||||||
TranslatableCaption.of("generic.generic_merged").toComponent(player)
|
|
||||||
))
|
|
||||||
);
|
);
|
||||||
} else if (!plot.isOwner(player.getUUID()) && !Permissions
|
} else if (!plot.isOwner(player.getUUID()) && !Permissions
|
||||||
.hasPermission(player, Permission.PERMISSION_ADMIN_BACKUP_OTHER)) {
|
.hasPermission(player, Permission.PERMISSION_ADMIN_BACKUP_OTHER)) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("permission.no_permission"),
|
TranslatableCaption.of("permission.no_permission"),
|
||||||
TagResolver.resolver(
|
Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_BACKUP_OTHER))
|
||||||
"node",
|
|
||||||
Tag.inserting(Permission.PERMISSION_ADMIN_BACKUP_OTHER)
|
|
||||||
)
|
|
||||||
);
|
);
|
||||||
} else {
|
} else {
|
||||||
final BackupProfile backupProfile = Objects.requireNonNull(this.backupManager.getProfile(plot));
|
final BackupProfile backupProfile = Objects.requireNonNull(this.backupManager.getProfile(plot));
|
||||||
if (backupProfile instanceof NullBackupProfile) {
|
if (backupProfile instanceof NullBackupProfile) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("backups.backup_impossible"),
|
TranslatableCaption.of("backups.backup_impossible"),
|
||||||
TagResolver.resolver(
|
Template.of("plot", TranslatableCaption.of("generic.generic_other").getComponent(player))
|
||||||
"plot", Tag.inserting(TranslatableCaption
|
|
||||||
.of("generic.generic_other")
|
|
||||||
.toComponent(player))
|
|
||||||
)
|
|
||||||
);
|
);
|
||||||
} else {
|
} else {
|
||||||
backupProfile.createBackup().whenComplete((backup, throwable) -> {
|
backupProfile.createBackup().whenComplete((backup, throwable) -> {
|
||||||
if (throwable != null) {
|
if (throwable != null) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("backups.backup_save_failed"),
|
TranslatableCaption.of("backups.backup_save_failed"),
|
||||||
TagResolver.resolver("reason", Tag.inserting(Component.text(throwable.getMessage())))
|
Template.of("reason", throwable.getMessage())
|
||||||
);
|
);
|
||||||
throwable.printStackTrace();
|
throwable.printStackTrace();
|
||||||
} else {
|
} else {
|
||||||
@ -209,16 +196,12 @@ public final class Backup extends Command {
|
|||||||
} else if (!plot.hasOwner()) {
|
} else if (!plot.hasOwner()) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("backups.backup_impossible"),
|
TranslatableCaption.of("backups.backup_impossible"),
|
||||||
TagResolver.resolver("plot", Tag.inserting(
|
Template.of("plot", TranslatableCaption.of("generic.generic_unowned").getComponent(player))
|
||||||
TranslatableCaption.of("generic.generic_unowned").toComponent(player)
|
|
||||||
))
|
|
||||||
);
|
);
|
||||||
} else if (plot.isMerged()) {
|
} else if (plot.isMerged()) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("backups.backup_impossible"),
|
TranslatableCaption.of("backups.backup_impossible"),
|
||||||
TagResolver.resolver("plot", Tag.inserting(
|
Template.of("plot", TranslatableCaption.of("generic.generic_merged").getComponent(player))
|
||||||
TranslatableCaption.of("generic.generic_merged").toComponent(player)
|
|
||||||
))
|
|
||||||
);
|
);
|
||||||
} else if (plot.getVolume() > Integer.MAX_VALUE) {
|
} else if (plot.getVolume() > Integer.MAX_VALUE) {
|
||||||
player.sendMessage(TranslatableCaption.of("schematics.schematic_too_large"));
|
player.sendMessage(TranslatableCaption.of("schematics.schematic_too_large"));
|
||||||
@ -226,48 +209,37 @@ public final class Backup extends Command {
|
|||||||
.hasPermission(player, Permission.PERMISSION_ADMIN_BACKUP_OTHER)) {
|
.hasPermission(player, Permission.PERMISSION_ADMIN_BACKUP_OTHER)) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("permission.no_permission"),
|
TranslatableCaption.of("permission.no_permission"),
|
||||||
TagResolver.resolver(
|
Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_BACKUP_OTHER))
|
||||||
"node",
|
|
||||||
Tag.inserting(Permission.PERMISSION_ADMIN_BACKUP_OTHER)
|
|
||||||
)
|
|
||||||
);
|
);
|
||||||
} else {
|
} else {
|
||||||
final BackupProfile backupProfile = Objects.requireNonNull(this.backupManager.getProfile(plot));
|
final BackupProfile backupProfile = Objects.requireNonNull(this.backupManager.getProfile(plot));
|
||||||
if (backupProfile instanceof NullBackupProfile) {
|
if (backupProfile instanceof NullBackupProfile) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("backups.backup_impossible"),
|
TranslatableCaption.of("backups.backup_impossible"),
|
||||||
TagResolver.resolver("plot", Tag.inserting(
|
Template.of("plot", TranslatableCaption.of("generic.generic_other").getComponent(player))
|
||||||
TranslatableCaption.of("generic.generic_other").toComponent(player)
|
|
||||||
))
|
|
||||||
);
|
);
|
||||||
} else {
|
} else {
|
||||||
backupProfile.listBackups().whenComplete((backups, throwable) -> {
|
backupProfile.listBackups().whenComplete((backups, throwable) -> {
|
||||||
if (throwable != null) {
|
if (throwable != null) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("backups.backup_list_failed"),
|
TranslatableCaption.of("backups.backup_list_failed"),
|
||||||
TagResolver.resolver("reason", Tag.inserting(Component.text(throwable.getMessage())))
|
Template.of("reason", throwable.getMessage())
|
||||||
);
|
);
|
||||||
throwable.printStackTrace();
|
throwable.printStackTrace();
|
||||||
} else {
|
} else {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("backups.backup_list_header"),
|
TranslatableCaption.of("backups.backup_list_header"),
|
||||||
TagResolver.resolver("plot", Tag.inserting(Component.text(plot.getId().toCommaSeparatedString())))
|
Template.of("plot", plot.getId().toCommaSeparatedString())
|
||||||
);
|
);
|
||||||
try {
|
try {
|
||||||
for (int i = 0; i < backups.size(); i++) {
|
for (int i = 0; i < backups.size(); i++) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("backups.backup_list_entry"),
|
TranslatableCaption.of("backups.backup_list_entry"),
|
||||||
TagResolver.builder()
|
Template.of("number", Integer.toString(i + 1)),
|
||||||
.tag("number", Tag.inserting(Component.text(i + 1)))
|
Template.of("value", DateTimeFormatter.RFC_1123_DATE_TIME.format(ZonedDateTime.ofInstant(
|
||||||
.tag(
|
Instant.ofEpochMilli(backups.get(i).getCreationTime()),
|
||||||
"value",
|
ZoneId.systemDefault()
|
||||||
Tag.inserting(Component.text(DateTimeFormatter.RFC_1123_DATE_TIME.format(
|
)))
|
||||||
ZonedDateTime.ofInstant(
|
|
||||||
Instant.ofEpochMilli(backups.get(i).getCreationTime()),
|
|
||||||
ZoneId.systemDefault()
|
|
||||||
))))
|
|
||||||
)
|
|
||||||
.build()
|
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
} catch (final Exception e) {
|
} catch (final Exception e) {
|
||||||
@ -295,16 +267,12 @@ public final class Backup extends Command {
|
|||||||
} else if (!plot.hasOwner()) {
|
} else if (!plot.hasOwner()) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("backups.backup_impossible"),
|
TranslatableCaption.of("backups.backup_impossible"),
|
||||||
TagResolver.resolver("plot", Tag.inserting(
|
Template.of("plot", TranslatableCaption.of("generic.generic_unowned").getComponent(player))
|
||||||
TranslatableCaption.of("generic.generic_unowned").toComponent(player)
|
|
||||||
))
|
|
||||||
);
|
);
|
||||||
} else if (plot.isMerged()) {
|
} else if (plot.isMerged()) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("backups.backup_impossible"),
|
TranslatableCaption.of("backups.backup_impossible"),
|
||||||
TagResolver.resolver("plot", Tag.inserting(
|
Template.of("plot", TranslatableCaption.of("generic.generic_merged").getComponent(player))
|
||||||
TranslatableCaption.of("generic.generic_merged").toComponent(player)
|
|
||||||
))
|
|
||||||
);
|
);
|
||||||
} else if (plot.getVolume() > Integer.MAX_VALUE) {
|
} else if (plot.getVolume() > Integer.MAX_VALUE) {
|
||||||
player.sendMessage(TranslatableCaption.of("schematics.schematic_too_large"));
|
player.sendMessage(TranslatableCaption.of("schematics.schematic_too_large"));
|
||||||
@ -312,15 +280,12 @@ public final class Backup extends Command {
|
|||||||
.hasPermission(player, Permission.PERMISSION_ADMIN_BACKUP_OTHER)) {
|
.hasPermission(player, Permission.PERMISSION_ADMIN_BACKUP_OTHER)) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("permission.no_permission"),
|
TranslatableCaption.of("permission.no_permission"),
|
||||||
TagResolver.resolver(
|
Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_BACKUP_OTHER))
|
||||||
"node",
|
|
||||||
Tag.inserting(Permission.PERMISSION_ADMIN_BACKUP_OTHER)
|
|
||||||
)
|
|
||||||
);
|
);
|
||||||
} else if (args.length == 0) {
|
} else if (args.length == 0) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("commandconfig.command_syntax"),
|
TranslatableCaption.of("commandconfig.command_syntax"),
|
||||||
TagResolver.resolver("value", Tag.inserting(Component.text("Usage: /plot backup save/list/load")))
|
Template.of("value", "Usage: /plot backup save/list/load")
|
||||||
);
|
);
|
||||||
} else {
|
} else {
|
||||||
final int number;
|
final int number;
|
||||||
@ -329,7 +294,7 @@ public final class Backup extends Command {
|
|||||||
} catch (final Exception e) {
|
} catch (final Exception e) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("invalid.not_a_number"),
|
TranslatableCaption.of("invalid.not_a_number"),
|
||||||
TagResolver.resolver("value", Tag.inserting(Component.text(args[0])))
|
Template.of("value", args[0])
|
||||||
);
|
);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@ -337,27 +302,23 @@ public final class Backup extends Command {
|
|||||||
if (backupProfile instanceof NullBackupProfile) {
|
if (backupProfile instanceof NullBackupProfile) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("backups.backup_impossible"),
|
TranslatableCaption.of("backups.backup_impossible"),
|
||||||
TagResolver.resolver("plot", Tag.inserting(
|
Template.of("plot", TranslatableCaption.of("generic.generic_other").getComponent(player))
|
||||||
TranslatableCaption.of("generic.generic_other").toComponent(player)
|
|
||||||
))
|
|
||||||
);
|
);
|
||||||
} else {
|
} else {
|
||||||
backupProfile.listBackups().whenComplete((backups, throwable) -> {
|
backupProfile.listBackups().whenComplete((backups, throwable) -> {
|
||||||
if (throwable != null) {
|
if (throwable != null) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("backups.backup_load_failure"),
|
TranslatableCaption.of("backups.backup_load_failure"),
|
||||||
TagResolver.resolver("reason", Tag.inserting(Component.text(throwable.getMessage())))
|
Template.of("reason", throwable.getMessage())
|
||||||
);
|
);
|
||||||
throwable.printStackTrace();
|
throwable.printStackTrace();
|
||||||
} else {
|
} else {
|
||||||
if (number < 1 || number > backups.size()) {
|
if (number < 1 || number > backups.size()) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("backups.backup_impossible"),
|
TranslatableCaption.of("backups.backup_impossible"),
|
||||||
TagResolver.resolver(
|
Template.of(
|
||||||
"plot",
|
"plot",
|
||||||
Tag.inserting(TranslatableCaption
|
TranslatableCaption.of("generic.generic_invalid_choice").getComponent(player)
|
||||||
.of("generic.generic_invalid_choice")
|
|
||||||
.toComponent(player))
|
|
||||||
)
|
)
|
||||||
);
|
);
|
||||||
} else {
|
} else {
|
||||||
@ -367,11 +328,9 @@ public final class Backup extends Command {
|
|||||||
.exists(backup.getFile())) {
|
.exists(backup.getFile())) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("backups.backup_impossible"),
|
TranslatableCaption.of("backups.backup_impossible"),
|
||||||
TagResolver.resolver(
|
Template.of(
|
||||||
"plot",
|
"plot",
|
||||||
Tag.inserting(TranslatableCaption
|
TranslatableCaption.of("generic.generic_invalid_choice").getComponent(player)
|
||||||
.of("generic.generic_invalid_choice")
|
|
||||||
.toComponent(player))
|
|
||||||
)
|
)
|
||||||
);
|
);
|
||||||
} else {
|
} else {
|
||||||
@ -381,10 +340,7 @@ public final class Backup extends Command {
|
|||||||
if (error != null) {
|
if (error != null) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("backups.backup_load_failure"),
|
TranslatableCaption.of("backups.backup_load_failure"),
|
||||||
TagResolver.resolver(
|
Template.of("reason", error.getMessage())
|
||||||
"reason",
|
|
||||||
Tag.inserting(Component.text(error.getMessage()))
|
|
||||||
)
|
|
||||||
);
|
);
|
||||||
} else {
|
} else {
|
||||||
player.sendMessage(TranslatableCaption.of("backups.backup_load_success"));
|
player.sendMessage(TranslatableCaption.of("backups.backup_load_success"));
|
||||||
|
|||||||
@ -25,7 +25,6 @@
|
|||||||
*/
|
*/
|
||||||
package com.plotsquared.core.command;
|
package com.plotsquared.core.command;
|
||||||
|
|
||||||
import com.plotsquared.core.configuration.caption.StaticCaption;
|
|
||||||
import com.plotsquared.core.configuration.caption.TranslatableCaption;
|
import com.plotsquared.core.configuration.caption.TranslatableCaption;
|
||||||
import com.plotsquared.core.player.PlotPlayer;
|
import com.plotsquared.core.player.PlotPlayer;
|
||||||
import com.plotsquared.core.plot.Plot;
|
import com.plotsquared.core.plot.Plot;
|
||||||
@ -33,10 +32,7 @@ import com.plotsquared.core.util.StringMan;
|
|||||||
import com.sk89q.worldedit.command.util.SuggestionHelper;
|
import com.sk89q.worldedit.command.util.SuggestionHelper;
|
||||||
import com.sk89q.worldedit.world.biome.BiomeType;
|
import com.sk89q.worldedit.world.biome.BiomeType;
|
||||||
import com.sk89q.worldedit.world.biome.BiomeTypes;
|
import com.sk89q.worldedit.world.biome.BiomeTypes;
|
||||||
import net.kyori.adventure.text.Component;
|
import net.kyori.adventure.text.minimessage.Template;
|
||||||
import net.kyori.adventure.text.TextComponent;
|
|
||||||
import net.kyori.adventure.text.minimessage.tag.Tag;
|
|
||||||
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
|
|
||||||
|
|
||||||
import java.util.Collection;
|
import java.util.Collection;
|
||||||
import java.util.Locale;
|
import java.util.Locale;
|
||||||
@ -58,13 +54,16 @@ public class Biome extends SetCommand {
|
|||||||
} catch (final Exception ignore) {
|
} catch (final Exception ignore) {
|
||||||
}
|
}
|
||||||
if (biome == null) {
|
if (biome == null) {
|
||||||
String separator = TranslatableCaption.of("blocklist.block_list_separator").getComponent(player);
|
String biomes = StringMan.join(
|
||||||
|
BiomeType.REGISTRY.values(),
|
||||||
|
MINI_MESSAGE.serialize(MINI_MESSAGE.parse(TranslatableCaption
|
||||||
|
.of("blocklist.block_list_separator")
|
||||||
|
.getComponent(player)))
|
||||||
|
);
|
||||||
player.sendMessage(TranslatableCaption.of("biome.need_biome"));
|
player.sendMessage(TranslatableCaption.of("biome.need_biome"));
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
StaticCaption.of(
|
TranslatableCaption.of("commandconfig.subcommand_set_options_header"),
|
||||||
TranslatableCaption.of("commandconfig.subcommand_set_options_header_only").getComponent(player)
|
Template.of("values", biomes)
|
||||||
+ StringMan.join(BiomeType.REGISTRY.values(), separator)
|
|
||||||
)
|
|
||||||
);
|
);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@ -81,7 +80,7 @@ public class Biome extends SetCommand {
|
|||||||
plot.removeRunning();
|
plot.removeRunning();
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("biome.biome_set_to"),
|
TranslatableCaption.of("biome.biome_set_to"),
|
||||||
TagResolver.resolver("value", Tag.inserting(Component.text(value.toLowerCase())))
|
Template.of("value", value.toLowerCase())
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
return true;
|
return true;
|
||||||
|
|||||||
@ -39,9 +39,7 @@ import com.plotsquared.core.util.EconHandler;
|
|||||||
import com.plotsquared.core.util.EventDispatcher;
|
import com.plotsquared.core.util.EventDispatcher;
|
||||||
import com.plotsquared.core.util.task.RunnableVal2;
|
import com.plotsquared.core.util.task.RunnableVal2;
|
||||||
import com.plotsquared.core.util.task.RunnableVal3;
|
import com.plotsquared.core.util.task.RunnableVal3;
|
||||||
import net.kyori.adventure.text.Component;
|
import net.kyori.adventure.text.minimessage.Template;
|
||||||
import net.kyori.adventure.text.minimessage.tag.Tag;
|
|
||||||
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
|
|
||||||
import org.checkerframework.checker.nullness.qual.NonNull;
|
import org.checkerframework.checker.nullness.qual.NonNull;
|
||||||
|
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
@ -93,7 +91,7 @@ public class Buy extends Command {
|
|||||||
checkTrue(
|
checkTrue(
|
||||||
player.getPlotCount() + plots.size() <= player.getAllowedPlots(),
|
player.getPlotCount() + plots.size() <= player.getAllowedPlots(),
|
||||||
TranslatableCaption.of("permission.cant_claim_more_plots"),
|
TranslatableCaption.of("permission.cant_claim_more_plots"),
|
||||||
TagResolver.resolver("amount", Tag.inserting(Component.text(player.getAllowedPlots())))
|
Template.of("amount", String.valueOf(player.getAllowedPlots()))
|
||||||
);
|
);
|
||||||
double price = plot.getFlag(PriceFlag.class);
|
double price = plot.getFlag(PriceFlag.class);
|
||||||
if (price <= 0) {
|
if (price <= 0) {
|
||||||
@ -106,10 +104,8 @@ public class Buy extends Command {
|
|||||||
checkTrue(
|
checkTrue(
|
||||||
this.econHandler.getMoney(player) >= price,
|
this.econHandler.getMoney(player) >= price,
|
||||||
TranslatableCaption.of("economy.cannot_afford_plot"),
|
TranslatableCaption.of("economy.cannot_afford_plot"),
|
||||||
TagResolver.builder()
|
Template.of("money", this.econHandler.format(price)),
|
||||||
.tag("money", Tag.inserting(Component.text(this.econHandler.format(price))))
|
Template.of("balance", this.econHandler.format(this.econHandler.getMoney(player)))
|
||||||
.tag("balance", Tag.inserting(Component.text(this.econHandler.format(this.econHandler.getMoney(player)))))
|
|
||||||
.build()
|
|
||||||
);
|
);
|
||||||
this.econHandler.withdrawMoney(player, price);
|
this.econHandler.withdrawMoney(player, price);
|
||||||
// Failure
|
// Failure
|
||||||
@ -117,7 +113,7 @@ public class Buy extends Command {
|
|||||||
confirm.run(this, () -> {
|
confirm.run(this, () -> {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("economy.removed_balance"),
|
TranslatableCaption.of("economy.removed_balance"),
|
||||||
TagResolver.resolver("money", Tag.inserting(Component.text(this.econHandler.format(price))))
|
Template.of("money", this.econHandler.format(price))
|
||||||
);
|
);
|
||||||
|
|
||||||
this.econHandler.depositMoney(PlotSquared.platform().playerManager().getOfflinePlayer(plot.getOwnerAbs()), price);
|
this.econHandler.depositMoney(PlotSquared.platform().playerManager().getOfflinePlayer(plot.getOwnerAbs()), price);
|
||||||
@ -126,11 +122,9 @@ public class Buy extends Command {
|
|||||||
if (owner != null) {
|
if (owner != null) {
|
||||||
owner.sendMessage(
|
owner.sendMessage(
|
||||||
TranslatableCaption.of("economy.plot_sold"),
|
TranslatableCaption.of("economy.plot_sold"),
|
||||||
TagResolver.builder()
|
Template.of("plot", plot.getId().toString()),
|
||||||
.tag("plot", Tag.inserting(Component.text(plot.getId().toString())))
|
Template.of("player", player.getName()),
|
||||||
.tag("player", Tag.inserting(Component.text(player.getName())))
|
Template.of("price", this.econHandler.format(price))
|
||||||
.tag("price", Tag.inserting(Component.text(this.econHandler.format(price))))
|
|
||||||
.build()
|
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
PlotFlag<?, ?> plotFlag = plot.getFlagContainer().getFlag(PriceFlag.class);
|
PlotFlag<?, ?> plotFlag = plot.getFlagContainer().getFlag(PriceFlag.class);
|
||||||
@ -141,7 +135,7 @@ public class Buy extends Command {
|
|||||||
plot.setOwner(player.getUUID());
|
plot.setOwner(player.getUUID());
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("working.claimed"),
|
TranslatableCaption.of("working.claimed"),
|
||||||
TagResolver.resolver("plot", Tag.inserting(Component.text(plot.getId().toString())))
|
Template.of("plot", plot.getId().toString())
|
||||||
);
|
);
|
||||||
whenDone.run(Buy.this, CommandResult.SUCCESS);
|
whenDone.run(Buy.this, CommandResult.SUCCESS);
|
||||||
}, () -> {
|
}, () -> {
|
||||||
|
|||||||
@ -37,10 +37,7 @@ import com.plotsquared.core.plot.flag.implementations.MiscCapFlag;
|
|||||||
import com.plotsquared.core.plot.flag.implementations.MobCapFlag;
|
import com.plotsquared.core.plot.flag.implementations.MobCapFlag;
|
||||||
import com.plotsquared.core.plot.flag.implementations.VehicleCapFlag;
|
import com.plotsquared.core.plot.flag.implementations.VehicleCapFlag;
|
||||||
import com.plotsquared.core.util.Permissions;
|
import com.plotsquared.core.util.Permissions;
|
||||||
import net.kyori.adventure.text.Component;
|
import net.kyori.adventure.text.minimessage.Template;
|
||||||
import net.kyori.adventure.text.ComponentLike;
|
|
||||||
import net.kyori.adventure.text.minimessage.tag.Tag;
|
|
||||||
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
|
|
||||||
|
|
||||||
import static com.plotsquared.core.util.entity.EntityCategories.CAP_ANIMAL;
|
import static com.plotsquared.core.util.entity.EntityCategories.CAP_ANIMAL;
|
||||||
import static com.plotsquared.core.util.entity.EntityCategories.CAP_ENTITY;
|
import static com.plotsquared.core.util.entity.EntityCategories.CAP_ENTITY;
|
||||||
@ -65,7 +62,7 @@ public class Caps extends SubCommand {
|
|||||||
.hasPermission(player, Permission.PERMISSION_ADMIN_CAPS_OTHER)) {
|
.hasPermission(player, Permission.PERMISSION_ADMIN_CAPS_OTHER)) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("permission.no_permission"),
|
TranslatableCaption.of("permission.no_permission"),
|
||||||
TagResolver.resolver("node", Tag.inserting(Permission.PERMISSION_ADMIN_CAPS_OTHER))
|
Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_CAPS_OTHER))
|
||||||
);
|
);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@ -92,17 +89,15 @@ public class Caps extends SubCommand {
|
|||||||
final int current = countedEntities[type];
|
final int current = countedEntities[type];
|
||||||
final int max = plot.getFlag(capFlag);
|
final int max = plot.getFlag(capFlag);
|
||||||
final String percentage = String.format("%.1f", 100 * ((float) current / max));
|
final String percentage = String.format("%.1f", 100 * ((float) current / max));
|
||||||
ComponentLike maxBeautified = max >= Integer.MAX_VALUE
|
String maxBeautified = max >= Integer.MAX_VALUE
|
||||||
? TranslatableCaption.of("info.infinite").toComponent(player)
|
? TranslatableCaption.of("info.infinite").getComponent(player)
|
||||||
: Component.text(max);
|
: String.valueOf(max);
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("info.plot_caps_format"),
|
TranslatableCaption.of("info.plot_caps_format"),
|
||||||
TagResolver.builder()
|
Template.of("cap", name),
|
||||||
.tag("cap", Tag.inserting(Component.text(name)))
|
Template.of("current", String.valueOf(current)),
|
||||||
.tag("current", Tag.inserting(Component.text(current)))
|
Template.of("limit", maxBeautified),
|
||||||
.tag("limit", Tag.inserting(maxBeautified))
|
Template.of("percentage", percentage)
|
||||||
.tag("percentage", Tag.inserting(Component.text(percentage)))
|
|
||||||
.build()
|
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -28,15 +28,13 @@ package com.plotsquared.core.command;
|
|||||||
import com.plotsquared.core.configuration.caption.TranslatableCaption;
|
import com.plotsquared.core.configuration.caption.TranslatableCaption;
|
||||||
import com.plotsquared.core.player.PlotPlayer;
|
import com.plotsquared.core.player.PlotPlayer;
|
||||||
import com.plotsquared.core.plot.PlotArea;
|
import com.plotsquared.core.plot.PlotArea;
|
||||||
import net.kyori.adventure.text.Component;
|
import net.kyori.adventure.text.minimessage.Template;
|
||||||
import net.kyori.adventure.text.minimessage.tag.Tag;
|
|
||||||
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @deprecated In favor of "/plot toggle chat" and
|
* @deprecated In favor of "/plot toggle chat" and
|
||||||
* scheduled for removal within the next major release.
|
* scheduled for removal within the next major release.
|
||||||
*/
|
*/
|
||||||
@Deprecated(forRemoval = true, since = "6.0.0")
|
@Deprecated(forRemoval = true)
|
||||||
@CommandDeclaration(command = "chat",
|
@CommandDeclaration(command = "chat",
|
||||||
usage = "/plot chat",
|
usage = "/plot chat",
|
||||||
permission = "plots.chat",
|
permission = "plots.chat",
|
||||||
@ -50,7 +48,7 @@ public class Chat extends SubCommand {
|
|||||||
check(area, TranslatableCaption.of("errors.not_in_plot_world"));
|
check(area, TranslatableCaption.of("errors.not_in_plot_world"));
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("errors.deprecated_commands"),
|
TranslatableCaption.of("errors.deprecated_commands"),
|
||||||
TagResolver.resolver("replacement", Tag.inserting(Component.text("/plot toggle chat")))
|
Template.of("replacement", "/plot toggle chat")
|
||||||
);
|
);
|
||||||
if (player.getPlotAreaAbs().isForcingPlotChat()) {
|
if (player.getPlotAreaAbs().isForcingPlotChat()) {
|
||||||
player.sendMessage(TranslatableCaption.of("chat.plot_chat_forced"));
|
player.sendMessage(TranslatableCaption.of("chat.plot_chat_forced"));
|
||||||
|
|||||||
@ -45,9 +45,7 @@ import com.plotsquared.core.util.EventDispatcher;
|
|||||||
import com.plotsquared.core.util.Permissions;
|
import com.plotsquared.core.util.Permissions;
|
||||||
import com.plotsquared.core.util.PlotExpression;
|
import com.plotsquared.core.util.PlotExpression;
|
||||||
import com.plotsquared.core.util.task.TaskManager;
|
import com.plotsquared.core.util.task.TaskManager;
|
||||||
import net.kyori.adventure.text.Component;
|
import net.kyori.adventure.text.minimessage.Template;
|
||||||
import net.kyori.adventure.text.minimessage.tag.Tag;
|
|
||||||
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
|
|
||||||
import org.apache.logging.log4j.LogManager;
|
import org.apache.logging.log4j.LogManager;
|
||||||
import org.apache.logging.log4j.Logger;
|
import org.apache.logging.log4j.Logger;
|
||||||
import org.checkerframework.checker.nullness.qual.NonNull;
|
import org.checkerframework.checker.nullness.qual.NonNull;
|
||||||
@ -91,7 +89,7 @@ public class Claim extends SubCommand {
|
|||||||
if (event.getEventResult() == Result.DENY) {
|
if (event.getEventResult() == Result.DENY) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("events.event_denied"),
|
TranslatableCaption.of("events.event_denied"),
|
||||||
TagResolver.resolver("value", Tag.inserting(Component.text("Claim")))
|
Template.of("value", "Claim")
|
||||||
);
|
);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
@ -110,14 +108,14 @@ public class Claim extends SubCommand {
|
|||||||
if (grants <= 0) {
|
if (grants <= 0) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("permission.cant_claim_more_plots"),
|
TranslatableCaption.of("permission.cant_claim_more_plots"),
|
||||||
TagResolver.resolver("amount", Tag.inserting(Component.text(grants)))
|
Template.of("amount", String.valueOf(grants))
|
||||||
);
|
);
|
||||||
metaDataAccess.remove();
|
metaDataAccess.remove();
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("permission.cant_claim_more_plots"),
|
TranslatableCaption.of("permission.cant_claim_more_plots"),
|
||||||
TagResolver.resolver("amount", Tag.inserting(Component.text(player.getAllowedPlots())))
|
Template.of("amount", String.valueOf(player.getAllowedPlots()))
|
||||||
);
|
);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@ -132,10 +130,8 @@ public class Claim extends SubCommand {
|
|||||||
if (!area.hasSchematic(schematic)) {
|
if (!area.hasSchematic(schematic)) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("schematics.schematic_invalid_named"),
|
TranslatableCaption.of("schematics.schematic_invalid_named"),
|
||||||
TagResolver.builder()
|
Template.of("schemname", schematic),
|
||||||
.tag("schemname", Tag.inserting(Component.text(schematic)))
|
Template.of("reason", "non-existent")
|
||||||
.tag("reason", Tag.inserting(Component.text("non-existent")))
|
|
||||||
.build()
|
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
if (!Permissions.hasPermission(player, Permission.PERMISSION_CLAIM_SCHEMATIC
|
if (!Permissions.hasPermission(player, Permission.PERMISSION_CLAIM_SCHEMATIC
|
||||||
@ -145,7 +141,7 @@ public class Claim extends SubCommand {
|
|||||||
) && !force) {
|
) && !force) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("permission.no_schematic_permission"),
|
TranslatableCaption.of("permission.no_schematic_permission"),
|
||||||
TagResolver.resolver("value", Tag.inserting(Component.text(schematic)))
|
Template.of("value", schematic)
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -161,28 +157,16 @@ public class Claim extends SubCommand {
|
|||||||
if (this.econHandler.getMoney(player) < cost) {
|
if (this.econHandler.getMoney(player) < cost) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("economy.cannot_afford_plot"),
|
TranslatableCaption.of("economy.cannot_afford_plot"),
|
||||||
TagResolver.builder()
|
Template.of("money", this.econHandler.format(cost)),
|
||||||
.tag("money", Tag.inserting(Component.text(this.econHandler.format(cost))))
|
Template.of("balance", this.econHandler.format(this.econHandler.getMoney(player)))
|
||||||
.tag(
|
|
||||||
"balance",
|
|
||||||
Tag.inserting(Component.text(this.econHandler.format(this.econHandler.getMoney(
|
|
||||||
player))))
|
|
||||||
)
|
|
||||||
.build()
|
|
||||||
);
|
);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
this.econHandler.withdrawMoney(player, cost);
|
this.econHandler.withdrawMoney(player, cost);
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("economy.removed_balance"),
|
TranslatableCaption.of("economy.removed_balance"),
|
||||||
TagResolver.builder()
|
Template.of("money", this.econHandler.format(cost)),
|
||||||
.tag("money", Tag.inserting(Component.text(this.econHandler.format(cost))))
|
Template.of("balance", this.econHandler.format(this.econHandler.getMoney(player)))
|
||||||
.tag(
|
|
||||||
"balance",
|
|
||||||
Tag.inserting(Component.text(this.econHandler.format(this.econHandler.getMoney(
|
|
||||||
player))))
|
|
||||||
)
|
|
||||||
.build()
|
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -194,10 +178,8 @@ public class Claim extends SubCommand {
|
|||||||
}
|
}
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("economy.removed_granted_plot"),
|
TranslatableCaption.of("economy.removed_granted_plot"),
|
||||||
TagResolver.builder()
|
Template.of("usedGrants", String.valueOf((grants - 1))),
|
||||||
.tag("usedGrants", Tag.inserting(Component.text(grants - 1)))
|
Template.of("remainingGrants", String.valueOf(grants))
|
||||||
.tag("remainingGrants", Tag.inserting(Component.text(grants)))
|
|
||||||
.build()
|
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -223,7 +205,7 @@ public class Claim extends SubCommand {
|
|||||||
if (mergeEvent.getEventResult() == Result.DENY) {
|
if (mergeEvent.getEventResult() == Result.DENY) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("events.event_denied"),
|
TranslatableCaption.of("events.event_denied"),
|
||||||
TagResolver.resolver("value", Tag.inserting(Component.text("Auto merge on claim")))
|
Template.of("value", "Auto merge on claim")
|
||||||
);
|
);
|
||||||
} else {
|
} else {
|
||||||
if (plot.getPlotModificationManager().autoMerge(
|
if (plot.getPlotModificationManager().autoMerge(
|
||||||
|
|||||||
@ -43,9 +43,7 @@ import com.plotsquared.core.util.Permissions;
|
|||||||
import com.plotsquared.core.util.task.RunnableVal2;
|
import com.plotsquared.core.util.task.RunnableVal2;
|
||||||
import com.plotsquared.core.util.task.RunnableVal3;
|
import com.plotsquared.core.util.task.RunnableVal3;
|
||||||
import com.plotsquared.core.util.task.TaskManager;
|
import com.plotsquared.core.util.task.TaskManager;
|
||||||
import net.kyori.adventure.text.Component;
|
import net.kyori.adventure.text.minimessage.Template;
|
||||||
import net.kyori.adventure.text.minimessage.tag.Tag;
|
|
||||||
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
|
|
||||||
import org.checkerframework.checker.nullness.qual.NonNull;
|
import org.checkerframework.checker.nullness.qual.NonNull;
|
||||||
|
|
||||||
import java.util.concurrent.CompletableFuture;
|
import java.util.concurrent.CompletableFuture;
|
||||||
@ -88,7 +86,7 @@ public class Clear extends Command {
|
|||||||
if (eventResult == Result.DENY) {
|
if (eventResult == Result.DENY) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("events.event_denied"),
|
TranslatableCaption.of("events.event_denied"),
|
||||||
TagResolver.resolver("value", Tag.inserting(Component.text("Clear")))
|
Template.of("value", "Clear")
|
||||||
);
|
);
|
||||||
return CompletableFuture.completedFuture(true);
|
return CompletableFuture.completedFuture(true);
|
||||||
}
|
}
|
||||||
@ -139,10 +137,8 @@ public class Clear extends Command {
|
|||||||
}
|
}
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("working.clearing_done"),
|
TranslatableCaption.of("working.clearing_done"),
|
||||||
TagResolver.builder()
|
Template.of("amount", String.valueOf(System.currentTimeMillis() - start)),
|
||||||
.tag("amount", Tag.inserting(Component.text(System.currentTimeMillis() - start)))
|
Template.of("plot", plot.getId().toString())
|
||||||
.tag("plot", Tag.inserting(Component.text(plot.getId().toString())))
|
|
||||||
.build()
|
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|||||||
@ -39,15 +39,10 @@ import com.plotsquared.core.plot.Plot;
|
|||||||
import com.plotsquared.core.plot.PlotArea;
|
import com.plotsquared.core.plot.PlotArea;
|
||||||
import com.plotsquared.core.plot.PlotCluster;
|
import com.plotsquared.core.plot.PlotCluster;
|
||||||
import com.plotsquared.core.plot.PlotId;
|
import com.plotsquared.core.plot.PlotId;
|
||||||
import com.plotsquared.core.util.ComponentHelper;
|
|
||||||
import com.plotsquared.core.util.Permissions;
|
import com.plotsquared.core.util.Permissions;
|
||||||
import com.plotsquared.core.util.TabCompletions;
|
import com.plotsquared.core.util.TabCompletions;
|
||||||
import com.plotsquared.core.util.query.PlotQuery;
|
import com.plotsquared.core.util.query.PlotQuery;
|
||||||
import net.kyori.adventure.text.Component;
|
import net.kyori.adventure.text.minimessage.Template;
|
||||||
import net.kyori.adventure.text.format.NamedTextColor;
|
|
||||||
import net.kyori.adventure.text.format.Style;
|
|
||||||
import net.kyori.adventure.text.minimessage.tag.Tag;
|
|
||||||
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
|
|
||||||
|
|
||||||
import java.util.Collection;
|
import java.util.Collection;
|
||||||
import java.util.Collections;
|
import java.util.Collections;
|
||||||
@ -58,7 +53,6 @@ import java.util.Set;
|
|||||||
import java.util.UUID;
|
import java.util.UUID;
|
||||||
import java.util.concurrent.TimeoutException;
|
import java.util.concurrent.TimeoutException;
|
||||||
import java.util.stream.Collectors;
|
import java.util.stream.Collectors;
|
||||||
import java.util.stream.Stream;
|
|
||||||
|
|
||||||
@CommandDeclaration(command = "cluster",
|
@CommandDeclaration(command = "cluster",
|
||||||
aliases = "clusters",
|
aliases = "clusters",
|
||||||
@ -67,19 +61,18 @@ import java.util.stream.Stream;
|
|||||||
permission = "plots.cluster")
|
permission = "plots.cluster")
|
||||||
public class Cluster extends SubCommand {
|
public class Cluster extends SubCommand {
|
||||||
|
|
||||||
private static final Component[] AVAILABLE_ARGS = Stream.of(
|
|
||||||
"list", "create", "delete", "resize", "invite", "kick", "leave", "helpers", "tp", "sethome"
|
|
||||||
).map(s -> Component.text(s).style(Style.style(NamedTextColor.DARK_AQUA))).toArray(Component[]::new);
|
|
||||||
private static final Component SEPARATOR = Component.text(", ").style(Style.style(NamedTextColor.GRAY));
|
|
||||||
|
|
||||||
// list, create, delete, resize, invite, kick, leave, helpers, tp, sethome
|
|
||||||
@Override
|
@Override
|
||||||
public boolean onCommand(PlotPlayer<?> player, String[] args) {
|
public boolean onCommand(PlotPlayer<?> player, String[] args) {
|
||||||
|
|
||||||
|
// list, create, delete, resize, invite, kick, leave, helpers, tp, sethome
|
||||||
if (args.length == 0) {
|
if (args.length == 0) {
|
||||||
// return arguments
|
// return arguments
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("cluster.cluster_available_args"),
|
TranslatableCaption.of("cluster.cluster_available_args"),
|
||||||
TagResolver.resolver("list", Tag.inserting(ComponentHelper.join(AVAILABLE_ARGS, SEPARATOR)))
|
Template.of(
|
||||||
|
"list",
|
||||||
|
"<dark_aqua>list</dark_aqua><gray>, </gray><dark_aqua>create</dark_aqua><gray>, </gray><dark_aqua>delete</dark_aqua><gray>, </gray><dark_aqua>resize</dark_aqua><gray>, </gray><dark_aqua>invite</dark_aqua><gray>, </gray><dark_aqua>kick</dark_aqua><gray>, </gray><dark_aqua>leave</dark_aqua><gray>, </gray><dark_aqua>members</dark_aqua><gray>, </gray><dark_aqua>info</dark_aqua><gray>, </gray><dark_aqua>tp</dark_aqua><gray>, </gray><dark_aqua>sethome</dark_aqua>"
|
||||||
|
)
|
||||||
);
|
);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@ -90,17 +83,14 @@ public class Cluster extends SubCommand {
|
|||||||
if (!Permissions.hasPermission(player, Permission.PERMISSION_CLUSTER_LIST)) {
|
if (!Permissions.hasPermission(player, Permission.PERMISSION_CLUSTER_LIST)) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("permission.no_permission"),
|
TranslatableCaption.of("permission.no_permission"),
|
||||||
TagResolver.resolver(
|
Template.of("node", String.valueOf(Permission.PERMISSION_CLUSTER_LIST))
|
||||||
"node",
|
|
||||||
Tag.inserting(Permission.PERMISSION_CLUSTER_LIST)
|
|
||||||
)
|
|
||||||
);
|
);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
if (args.length != 1) {
|
if (args.length != 1) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("commandconfig.command_syntax"),
|
TranslatableCaption.of("commandconfig.command_syntax"),
|
||||||
TagResolver.resolver("value", Tag.inserting(Component.text("/plot cluster list")))
|
Template.of("value", "/plot cluster list")
|
||||||
);
|
);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@ -112,7 +102,7 @@ public class Cluster extends SubCommand {
|
|||||||
Set<PlotCluster> clusters = area.getClusters();
|
Set<PlotCluster> clusters = area.getClusters();
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("cluster.cluster_list_heading"),
|
TranslatableCaption.of("cluster.cluster_list_heading"),
|
||||||
TagResolver.resolver("amount", Tag.inserting(Component.text(clusters.size())))
|
Template.of("amount", clusters.size() + "")
|
||||||
);
|
);
|
||||||
for (PlotCluster cluster : clusters) {
|
for (PlotCluster cluster : clusters) {
|
||||||
// Ignore unmanaged clusters
|
// Ignore unmanaged clusters
|
||||||
@ -120,22 +110,22 @@ public class Cluster extends SubCommand {
|
|||||||
if (player.getUUID().equals(cluster.owner)) {
|
if (player.getUUID().equals(cluster.owner)) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("cluster.cluster_list_element_owner"),
|
TranslatableCaption.of("cluster.cluster_list_element_owner"),
|
||||||
TagResolver.resolver("cluster", Tag.inserting(Component.text(name)))
|
Template.of("cluster", name)
|
||||||
);
|
);
|
||||||
} else if (cluster.helpers.contains(player.getUUID())) {
|
} else if (cluster.helpers.contains(player.getUUID())) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("cluster.cluster_list_element_helpers"),
|
TranslatableCaption.of("cluster.cluster_list_element_helpers"),
|
||||||
TagResolver.resolver("cluster", Tag.inserting(Component.text(name)))
|
Template.of("cluster", name)
|
||||||
);
|
);
|
||||||
} else if (cluster.invited.contains(player.getUUID())) {
|
} else if (cluster.invited.contains(player.getUUID())) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("cluster.cluster_list_element_invited"),
|
TranslatableCaption.of("cluster.cluster_list_element_invited"),
|
||||||
TagResolver.resolver("cluster", Tag.inserting(Component.text(name)))
|
Template.of("cluster", name)
|
||||||
);
|
);
|
||||||
} else {
|
} else {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("cluster.cluster_list_element"),
|
TranslatableCaption.of("cluster.cluster_list_element"),
|
||||||
TagResolver.resolver("cluster", Tag.inserting(Component.text(cluster.toString())))
|
Template.of("cluster", cluster.toString())
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -146,10 +136,7 @@ public class Cluster extends SubCommand {
|
|||||||
if (!Permissions.hasPermission(player, Permission.PERMISSION_CLUSTER_CREATE)) {
|
if (!Permissions.hasPermission(player, Permission.PERMISSION_CLUSTER_CREATE)) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("permission.no_permission"),
|
TranslatableCaption.of("permission.no_permission"),
|
||||||
TagResolver.resolver(
|
Template.of("node", String.valueOf(Permission.PERMISSION_CLUSTER_CREATE))
|
||||||
"node",
|
|
||||||
Tag.inserting(Permission.PERMISSION_CLUSTER_CREATE)
|
|
||||||
)
|
|
||||||
);
|
);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@ -161,10 +148,7 @@ public class Cluster extends SubCommand {
|
|||||||
if (args.length != 4) {
|
if (args.length != 4) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("commandconfig.command_syntax"),
|
TranslatableCaption.of("commandconfig.command_syntax"),
|
||||||
TagResolver.resolver(
|
Template.of("value", "/plot cluster create <name> <id-bot> <id-top>")
|
||||||
"value",
|
|
||||||
Tag.inserting(Component.text("/plot cluster create <name> <id-bot> <id-top>"))
|
|
||||||
)
|
|
||||||
);
|
);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@ -174,7 +158,7 @@ public class Cluster extends SubCommand {
|
|||||||
if (currentClusters >= player.getAllowedPlots()) {
|
if (currentClusters >= player.getAllowedPlots()) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("permission.cant_claim_more_clusters"),
|
TranslatableCaption.of("permission.cant_claim_more_clusters"),
|
||||||
TagResolver.resolver("amount", Tag.inserting(Component.text(player.getAllowedPlots())))
|
Template.of("amount", String.valueOf(player.getAllowedPlots()))
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
PlotId pos1;
|
PlotId pos1;
|
||||||
@ -192,7 +176,7 @@ public class Cluster extends SubCommand {
|
|||||||
if (area.getCluster(name) != null) {
|
if (area.getCluster(name) != null) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("alias.alias_is_taken"),
|
TranslatableCaption.of("alias.alias_is_taken"),
|
||||||
TagResolver.resolver("alias", Tag.inserting(Component.text(name)))
|
Template.of("alias", name)
|
||||||
);
|
);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@ -206,7 +190,7 @@ public class Cluster extends SubCommand {
|
|||||||
if (cluster != null) {
|
if (cluster != null) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("cluster.cluster_intersection"),
|
TranslatableCaption.of("cluster.cluster_intersection"),
|
||||||
TagResolver.resolver("cluster", Tag.inserting(Component.text(cluster.getName())))
|
Template.of("cluster", cluster.getName())
|
||||||
);
|
);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@ -214,7 +198,7 @@ public class Cluster extends SubCommand {
|
|||||||
if (!area.contains(pos1) || !area.contains(pos2)) {
|
if (!area.contains(pos1) || !area.contains(pos2)) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("cluster.cluster_outside"),
|
TranslatableCaption.of("cluster.cluster_outside"),
|
||||||
TagResolver.resolver("area", Tag.inserting(Component.text(area.toString())))
|
Template.of("area", String.valueOf(area))
|
||||||
);
|
);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@ -227,10 +211,7 @@ public class Cluster extends SubCommand {
|
|||||||
if (!plot.isOwner(uuid)) {
|
if (!plot.isOwner(uuid)) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("permission.no_permission"),
|
TranslatableCaption.of("permission.no_permission"),
|
||||||
TagResolver.resolver(
|
Template.of("node", String.valueOf(Permission.PERMISSION_CLUSTER_CREATE_OTHER))
|
||||||
"node",
|
|
||||||
Tag.inserting(Permission.PERMISSION_CLUSTER_CREATE_OTHER)
|
|
||||||
)
|
|
||||||
);
|
);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@ -252,10 +233,7 @@ public class Cluster extends SubCommand {
|
|||||||
if (current + cluster.getArea() > allowed) {
|
if (current + cluster.getArea() > allowed) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("permission.no_permission"),
|
TranslatableCaption.of("permission.no_permission"),
|
||||||
TagResolver.resolver(
|
Template.of("node", Permission.PERMISSION_CLUSTER_SIZE + "." + (current + cluster.getArea()))
|
||||||
"node",
|
|
||||||
Tag.inserting(Component.text(Permission.PERMISSION_CLUSTER_SIZE + "." + (current + cluster.getArea())))
|
|
||||||
)
|
|
||||||
);
|
);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@ -274,7 +252,7 @@ public class Cluster extends SubCommand {
|
|||||||
}
|
}
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("cluster.cluster_created"),
|
TranslatableCaption.of("cluster.cluster_created"),
|
||||||
TagResolver.resolver("name", Tag.inserting(Component.text(name)))
|
Template.of("name", name)
|
||||||
);
|
);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
@ -284,17 +262,14 @@ public class Cluster extends SubCommand {
|
|||||||
if (!Permissions.hasPermission(player, Permission.PERMISSION_CLUSTER_DELETE)) {
|
if (!Permissions.hasPermission(player, Permission.PERMISSION_CLUSTER_DELETE)) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("permission.no_permission"),
|
TranslatableCaption.of("permission.no_permission"),
|
||||||
TagResolver.resolver(
|
Template.of("node", String.valueOf(Permission.PERMISSION_CLUSTER_DELETE))
|
||||||
"node",
|
|
||||||
Tag.inserting(Permission.PERMISSION_CLUSTER_DELETE)
|
|
||||||
)
|
|
||||||
);
|
);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
if (args.length != 1 && args.length != 2) {
|
if (args.length != 1 && args.length != 2) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("commandconfig.command_syntax"),
|
TranslatableCaption.of("commandconfig.command_syntax"),
|
||||||
TagResolver.resolver("value", Tag.inserting(Component.text("/plot cluster delete [name]")))
|
Template.of("value", "/plot cluster delete [name]")
|
||||||
);
|
);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@ -309,7 +284,7 @@ public class Cluster extends SubCommand {
|
|||||||
if (cluster == null) {
|
if (cluster == null) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("cluster.invalid_cluster_name"),
|
TranslatableCaption.of("cluster.invalid_cluster_name"),
|
||||||
TagResolver.resolver("cluster", Tag.inserting(Component.text(args[1])))
|
Template.of("cluster", args[1])
|
||||||
);
|
);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@ -325,18 +300,15 @@ public class Cluster extends SubCommand {
|
|||||||
.hasPermission(player, Permission.PERMISSION_CLUSTER_DELETE_OTHER)) {
|
.hasPermission(player, Permission.PERMISSION_CLUSTER_DELETE_OTHER)) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("permission.no_permission"),
|
TranslatableCaption.of("permission.no_permission"),
|
||||||
TagResolver.resolver(
|
Template.of("node", String.valueOf(Permission.PERMISSION_CLUSTER_DELETE_OTHER))
|
||||||
"node",
|
|
||||||
Tag.inserting(Permission.PERMISSION_CLUSTER_DELETE_OTHER)
|
|
||||||
)
|
|
||||||
);
|
);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
DBFunc.delete(cluster);
|
DBFunc.delete(cluster);
|
||||||
player.sendMessage(TranslatableCaption.of("cluster.cluster_deleted"), TagResolver.resolver(
|
player.sendMessage(TranslatableCaption.of("cluster.cluster_deleted"), Template.of(
|
||||||
"cluster",
|
"cluster",
|
||||||
Tag.inserting(Component.text(cluster.toString()))
|
String.valueOf(cluster)
|
||||||
));
|
));
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
@ -345,17 +317,14 @@ public class Cluster extends SubCommand {
|
|||||||
if (!Permissions.hasPermission(player, Permission.PERMISSION_CLUSTER_RESIZE)) {
|
if (!Permissions.hasPermission(player, Permission.PERMISSION_CLUSTER_RESIZE)) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("permission.no_permission"),
|
TranslatableCaption.of("permission.no_permission"),
|
||||||
TagResolver.resolver(
|
Template.of("node", String.valueOf(Permission.PERMISSION_CLUSTER_RESIZE))
|
||||||
"node",
|
|
||||||
Tag.inserting(Permission.PERMISSION_CLUSTER_RESIZE)
|
|
||||||
)
|
|
||||||
);
|
);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
if (args.length != 3) {
|
if (args.length != 3) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("commandconfig.command_syntax"),
|
TranslatableCaption.of("commandconfig.command_syntax"),
|
||||||
TagResolver.resolver("value", Tag.inserting(Component.text("/plot cluster resize [name]")))
|
Template.of("value", "/plot cluster resize [name]")
|
||||||
);
|
);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@ -389,10 +358,7 @@ public class Cluster extends SubCommand {
|
|||||||
.hasPermission(player, Permission.PERMISSION_CLUSTER_RESIZE_OTHER)) {
|
.hasPermission(player, Permission.PERMISSION_CLUSTER_RESIZE_OTHER)) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("permission.no_permission"),
|
TranslatableCaption.of("permission.no_permission"),
|
||||||
TagResolver.resolver(
|
Template.of("node", String.valueOf(Permission.PERMISSION_CLUSTER_RESIZE_OTHER))
|
||||||
"node",
|
|
||||||
Tag.inserting(Permission.PERMISSION_CLUSTER_RESIZE_OTHER)
|
|
||||||
)
|
|
||||||
);
|
);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@ -402,12 +368,13 @@ public class Cluster extends SubCommand {
|
|||||||
if (intersect != null) {
|
if (intersect != null) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("cluster.cluster_intersection"),
|
TranslatableCaption.of("cluster.cluster_intersection"),
|
||||||
TagResolver.resolver("cluster", Tag.inserting(Component.text(intersect.getName())))
|
Template.of("cluster", intersect.getName())
|
||||||
);
|
);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
Set<Plot> existing = area.getPlotSelectionOwned(cluster.getP1(), cluster.getP2());
|
Set<Plot> existing = area.getPlotSelectionOwned(cluster.getP1(), cluster.getP2());
|
||||||
Set<Plot> newPlots = area.getPlotSelectionOwned(pos1, pos2);
|
Set<Plot> newPlots = area.getPlotSelectionOwned(pos1, pos2);
|
||||||
|
// Set<Plot> removed = (HashSet<Plot>) existing.clone();
|
||||||
Set<Plot> removed = new HashSet<>(existing);
|
Set<Plot> removed = new HashSet<>(existing);
|
||||||
|
|
||||||
removed.removeAll(newPlots);
|
removed.removeAll(newPlots);
|
||||||
@ -417,10 +384,7 @@ public class Cluster extends SubCommand {
|
|||||||
.hasPermission(player, Permission.PERMISSION_CLUSTER_RESIZE_SHRINK)) {
|
.hasPermission(player, Permission.PERMISSION_CLUSTER_RESIZE_SHRINK)) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("permission.no_permission"),
|
TranslatableCaption.of("permission.no_permission"),
|
||||||
TagResolver.resolver(
|
Template.of("node", String.valueOf(Permission.PERMISSION_CLUSTER_RESIZE_SHRINK))
|
||||||
"node",
|
|
||||||
Tag.inserting(Permission.PERMISSION_CLUSTER_RESIZE_SHRINK)
|
|
||||||
)
|
|
||||||
);
|
);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@ -431,10 +395,7 @@ public class Cluster extends SubCommand {
|
|||||||
.hasPermission(player, Permission.PERMISSION_CLUSTER_RESIZE_EXPAND)) {
|
.hasPermission(player, Permission.PERMISSION_CLUSTER_RESIZE_EXPAND)) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("permission.no_permission"),
|
TranslatableCaption.of("permission.no_permission"),
|
||||||
TagResolver.resolver(
|
Template.of("node", String.valueOf(Permission.PERMISSION_CLUSTER_RESIZE_EXPAND))
|
||||||
"node",
|
|
||||||
Tag.inserting(Permission.PERMISSION_CLUSTER_RESIZE_EXPAND)
|
|
||||||
)
|
|
||||||
);
|
);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@ -453,9 +414,7 @@ public class Cluster extends SubCommand {
|
|||||||
if (current + cluster.getArea() > allowed) {
|
if (current + cluster.getArea() > allowed) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("permission.no_permission"),
|
TranslatableCaption.of("permission.no_permission"),
|
||||||
TagResolver.resolver("node", Tag.inserting(Component.text(
|
Template.of("node", Permission.PERMISSION_CLUSTER + "." + (current + cluster.getArea()))
|
||||||
Permission.PERMISSION_CLUSTER + "." + (current + cluster.getArea())
|
|
||||||
)))
|
|
||||||
);
|
);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@ -470,17 +429,14 @@ public class Cluster extends SubCommand {
|
|||||||
if (!Permissions.hasPermission(player, Permission.PERMISSION_CLUSTER_INVITE)) {
|
if (!Permissions.hasPermission(player, Permission.PERMISSION_CLUSTER_INVITE)) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("permission.no_permission"),
|
TranslatableCaption.of("permission.no_permission"),
|
||||||
TagResolver.resolver(
|
Template.of("node", String.valueOf(Permission.PERMISSION_CLUSTER_INVITE))
|
||||||
"node",
|
|
||||||
Tag.inserting(Permission.PERMISSION_CLUSTER_INVITE)
|
|
||||||
)
|
|
||||||
);
|
);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
if (args.length != 2) {
|
if (args.length != 2) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("commandconfig.command_syntax"),
|
TranslatableCaption.of("commandconfig.command_syntax"),
|
||||||
TagResolver.resolver("value", Tag.inserting(Component.text("/plot cluster invite <player>")))
|
Template.of("value", "/plot cluster invite <player>")
|
||||||
);
|
);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@ -499,10 +455,7 @@ public class Cluster extends SubCommand {
|
|||||||
.hasPermission(player, Permission.PERMISSION_CLUSTER_INVITE_OTHER)) {
|
.hasPermission(player, Permission.PERMISSION_CLUSTER_INVITE_OTHER)) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("permission.no_permission"),
|
TranslatableCaption.of("permission.no_permission"),
|
||||||
TagResolver.resolver(
|
Template.of("node", Permission.PERMISSION_CLUSTER_INVITE_OTHER.toString())
|
||||||
"node",
|
|
||||||
Tag.inserting(Permission.PERMISSION_CLUSTER_INVITE_OTHER)
|
|
||||||
)
|
|
||||||
);
|
);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@ -515,7 +468,7 @@ public class Cluster extends SubCommand {
|
|||||||
} else if (throwable != null) {
|
} else if (throwable != null) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("errors.invalid_player"),
|
TranslatableCaption.of("errors.invalid_player"),
|
||||||
TagResolver.resolver("value", Tag.inserting(Component.text(args[1])))
|
Template.of("value", args[1])
|
||||||
);
|
);
|
||||||
} else {
|
} else {
|
||||||
if (!cluster.isAdded(uuid)) {
|
if (!cluster.isAdded(uuid)) {
|
||||||
@ -527,7 +480,7 @@ public class Cluster extends SubCommand {
|
|||||||
if (otherPlayer != null) {
|
if (otherPlayer != null) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("cluster.cluster_invited"),
|
TranslatableCaption.of("cluster.cluster_invited"),
|
||||||
TagResolver.resolver("cluster", Tag.inserting(Component.text(cluster.getName())))
|
Template.of("cluster", cluster.getName())
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -542,17 +495,14 @@ public class Cluster extends SubCommand {
|
|||||||
if (!Permissions.hasPermission(player, Permission.PERMISSION_CLUSTER_KICK)) {
|
if (!Permissions.hasPermission(player, Permission.PERMISSION_CLUSTER_KICK)) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("permission.no_permission"),
|
TranslatableCaption.of("permission.no_permission"),
|
||||||
TagResolver.resolver(
|
Template.of("node", Permission.PERMISSION_CLUSTER_KICK.toString())
|
||||||
"node",
|
|
||||||
Tag.inserting(Permission.PERMISSION_CLUSTER_KICK)
|
|
||||||
)
|
|
||||||
);
|
);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
if (args.length != 2) {
|
if (args.length != 2) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("commandconfig.command_syntax"),
|
TranslatableCaption.of("commandconfig.command_syntax"),
|
||||||
TagResolver.resolver("value", Tag.inserting(Component.text("/plot cluster kick <player>")))
|
Template.of("value", "/plot cluster kick <player>")
|
||||||
);
|
);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@ -570,10 +520,7 @@ public class Cluster extends SubCommand {
|
|||||||
.hasPermission(player, Permission.PERMISSION_CLUSTER_KICK_OTHER)) {
|
.hasPermission(player, Permission.PERMISSION_CLUSTER_KICK_OTHER)) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("permission.no_permission"),
|
TranslatableCaption.of("permission.no_permission"),
|
||||||
TagResolver.resolver(
|
Template.of("node", Permission.PERMISSION_CLUSTER_KICK_OTHER.toString())
|
||||||
"node",
|
|
||||||
Tag.inserting(Permission.PERMISSION_CLUSTER_KICK_OTHER)
|
|
||||||
)
|
|
||||||
);
|
);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@ -586,7 +533,7 @@ public class Cluster extends SubCommand {
|
|||||||
} else if (throwable != null) {
|
} else if (throwable != null) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("errors.invalid_player"),
|
TranslatableCaption.of("errors.invalid_player"),
|
||||||
TagResolver.resolver("value", Tag.inserting(Component.text(args[1])))
|
Template.of("value", args[1])
|
||||||
);
|
);
|
||||||
} else {
|
} else {
|
||||||
// Can't kick if the player is yourself, the owner, or not added to the cluster
|
// Can't kick if the player is yourself, the owner, or not added to the cluster
|
||||||
@ -594,7 +541,7 @@ public class Cluster extends SubCommand {
|
|||||||
|| !cluster.isAdded(uuid)) {
|
|| !cluster.isAdded(uuid)) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("cluster.cannot_kick_player"),
|
TranslatableCaption.of("cluster.cannot_kick_player"),
|
||||||
TagResolver.resolver("value", Tag.inserting(Component.text(cluster.getName())))
|
Template.of("value", cluster.getName())
|
||||||
);
|
);
|
||||||
} else {
|
} else {
|
||||||
if (cluster.helpers.contains(uuid)) {
|
if (cluster.helpers.contains(uuid)) {
|
||||||
@ -609,7 +556,7 @@ public class Cluster extends SubCommand {
|
|||||||
if (player2 != null) {
|
if (player2 != null) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("cluster.cluster_removed"),
|
TranslatableCaption.of("cluster.cluster_removed"),
|
||||||
TagResolver.resolver("cluster", Tag.inserting(Component.text(cluster.getName())))
|
Template.of("cluster", cluster.getName())
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
removePlayerPlots(cluster, uuid, player2.getLocation().getWorldName());
|
removePlayerPlots(cluster, uuid, player2.getLocation().getWorldName());
|
||||||
@ -624,17 +571,14 @@ public class Cluster extends SubCommand {
|
|||||||
if (!Permissions.hasPermission(player, Permission.PERMISSION_CLUSTER_LEAVE)) {
|
if (!Permissions.hasPermission(player, Permission.PERMISSION_CLUSTER_LEAVE)) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("permission.no_permission"),
|
TranslatableCaption.of("permission.no_permission"),
|
||||||
TagResolver.resolver(
|
Template.of("node", Permission.PERMISSION_CLUSTER_LEAVE.toString())
|
||||||
"node",
|
|
||||||
Tag.inserting(Permission.PERMISSION_CLUSTER_LEAVE)
|
|
||||||
)
|
|
||||||
);
|
);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
if (args.length != 1 && args.length != 2) {
|
if (args.length != 1 && args.length != 2) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("commandconfig.command_syntax"),
|
TranslatableCaption.of("commandconfig.command_syntax"),
|
||||||
TagResolver.resolver("value", Tag.inserting(Component.text("/plot cluster leave [name]")))
|
Template.of("value", "/plot cluster leave [name]")
|
||||||
);
|
);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@ -648,7 +592,7 @@ public class Cluster extends SubCommand {
|
|||||||
if (cluster == null) {
|
if (cluster == null) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("cluster.invalid_cluster_name"),
|
TranslatableCaption.of("cluster.invalid_cluster_name"),
|
||||||
TagResolver.resolver("cluster", Tag.inserting(Component.text(args[1])))
|
Template.of("cluster", args[1])
|
||||||
);
|
);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@ -676,7 +620,7 @@ public class Cluster extends SubCommand {
|
|||||||
DBFunc.removeInvited(cluster, uuid);
|
DBFunc.removeInvited(cluster, uuid);
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("cluster.cluster_removed"),
|
TranslatableCaption.of("cluster.cluster_removed"),
|
||||||
TagResolver.resolver("cluster", Tag.inserting(Component.text(cluster.getName())))
|
Template.of("cluster", cluster.getName())
|
||||||
);
|
);
|
||||||
removePlayerPlots(cluster, uuid, player.getLocation().getWorldName());
|
removePlayerPlots(cluster, uuid, player.getLocation().getWorldName());
|
||||||
return true;
|
return true;
|
||||||
@ -685,20 +629,14 @@ public class Cluster extends SubCommand {
|
|||||||
if (!Permissions.hasPermission(player, Permission.PERMISSION_CLUSTER_HELPERS)) {
|
if (!Permissions.hasPermission(player, Permission.PERMISSION_CLUSTER_HELPERS)) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("permission.no_permission"),
|
TranslatableCaption.of("permission.no_permission"),
|
||||||
TagResolver.resolver(
|
Template.of("node", Permission.PERMISSION_CLUSTER_HELPERS.toString())
|
||||||
"node",
|
|
||||||
Tag.inserting(Component.text(Permission.PERMISSION_CLUSTER_HELPERS.toString()))
|
|
||||||
)
|
|
||||||
);
|
);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
if (args.length != 3) {
|
if (args.length != 3) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("commandconfig.command_syntax"),
|
TranslatableCaption.of("commandconfig.command_syntax"),
|
||||||
TagResolver.resolver(
|
Template.of("value", "/plot cluster members <add | remove> <player>")
|
||||||
"value",
|
|
||||||
Tag.inserting(Component.text("/plot cluster members <add | remove> <player>"))
|
|
||||||
)
|
|
||||||
);
|
);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@ -719,7 +657,7 @@ public class Cluster extends SubCommand {
|
|||||||
} else if (throwable != null) {
|
} else if (throwable != null) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("errors.invalid_player"),
|
TranslatableCaption.of("errors.invalid_player"),
|
||||||
TagResolver.resolver("value", Tag.inserting(Component.text(args[2])))
|
Template.of("value", args[2])
|
||||||
);
|
);
|
||||||
} else {
|
} else {
|
||||||
if (args[1].equalsIgnoreCase("add")) {
|
if (args[1].equalsIgnoreCase("add")) {
|
||||||
@ -733,9 +671,7 @@ public class Cluster extends SubCommand {
|
|||||||
} else {
|
} else {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("commandconfig.command_syntax"),
|
TranslatableCaption.of("commandconfig.command_syntax"),
|
||||||
TagResolver.resolver("value", Tag.inserting(Component.text(
|
Template.of("value", "/plot cluster members <add | remove> <player>")
|
||||||
"/plot cluster members <add | remove> <player>"
|
|
||||||
)))
|
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -748,17 +684,14 @@ public class Cluster extends SubCommand {
|
|||||||
if (!Permissions.hasPermission(player, Permission.PERMISSION_CLUSTER_TP)) {
|
if (!Permissions.hasPermission(player, Permission.PERMISSION_CLUSTER_TP)) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("permission.no_permission"),
|
TranslatableCaption.of("permission.no_permission"),
|
||||||
TagResolver.resolver(
|
Template.of("node", Permission.PERMISSION_CLUSTER_TP.toString())
|
||||||
"node",
|
|
||||||
Tag.inserting(Permission.PERMISSION_CLUSTER_TP)
|
|
||||||
)
|
|
||||||
);
|
);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
if (args.length != 2) {
|
if (args.length != 2) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("commandconfig.command_syntax"),
|
TranslatableCaption.of("commandconfig.command_syntax"),
|
||||||
TagResolver.resolver("value", Tag.inserting(Component.text("/plot cluster tp <name>")))
|
Template.of("value", "/plot cluster tp <name>")
|
||||||
);
|
);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@ -771,7 +704,7 @@ public class Cluster extends SubCommand {
|
|||||||
if (cluster == null) {
|
if (cluster == null) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("cluster.invalid_cluster_name"),
|
TranslatableCaption.of("cluster.invalid_cluster_name"),
|
||||||
TagResolver.resolver("cluster", Tag.inserting(Component.text(args[1])))
|
Template.of("cluster", args[1])
|
||||||
);
|
);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@ -780,10 +713,7 @@ public class Cluster extends SubCommand {
|
|||||||
if (!Permissions.hasPermission(player, Permission.PERMISSION_CLUSTER_TP_OTHER)) {
|
if (!Permissions.hasPermission(player, Permission.PERMISSION_CLUSTER_TP_OTHER)) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("permission.no_permission"),
|
TranslatableCaption.of("permission.no_permission"),
|
||||||
TagResolver.resolver(
|
Template.of("node", Permission.PERMISSION_CLUSTER_TP_OTHER.toString())
|
||||||
"node",
|
|
||||||
Tag.inserting(Permission.PERMISSION_CLUSTER_TP_OTHER)
|
|
||||||
)
|
|
||||||
);
|
);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@ -799,17 +729,14 @@ public class Cluster extends SubCommand {
|
|||||||
if (!Permissions.hasPermission(player, Permission.PERMISSION_CLUSTER_INFO)) {
|
if (!Permissions.hasPermission(player, Permission.PERMISSION_CLUSTER_INFO)) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("permission.no_permission"),
|
TranslatableCaption.of("permission.no_permission"),
|
||||||
TagResolver.resolver(
|
Template.of("node", Permission.PERMISSION_CLUSTER_TP.toString())
|
||||||
"node",
|
|
||||||
Tag.inserting(Permission.PERMISSION_CLUSTER_TP)
|
|
||||||
)
|
|
||||||
);
|
);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
if (args.length != 1 && args.length != 2) {
|
if (args.length != 1 && args.length != 2) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("commandconfig.command_syntax"),
|
TranslatableCaption.of("commandconfig.command_syntax"),
|
||||||
TagResolver.resolver("value", Tag.inserting(Component.text("/plot cluster info [name]")))
|
Template.of("value", "/plot cluster info [name]")
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
PlotArea area = player.getApplicablePlotArea();
|
PlotArea area = player.getApplicablePlotArea();
|
||||||
@ -823,7 +750,7 @@ public class Cluster extends SubCommand {
|
|||||||
if (cluster == null) {
|
if (cluster == null) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("cluster.invalid_cluster_name"),
|
TranslatableCaption.of("cluster.invalid_cluster_name"),
|
||||||
TagResolver.resolver("cluster", Tag.inserting(Component.text(args[1])))
|
Template.of("cluster", args[1])
|
||||||
);
|
);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@ -852,14 +779,19 @@ public class Cluster extends SubCommand {
|
|||||||
cluster.getP2().getY() - cluster.getP1().getY() + 1);
|
cluster.getP2().getY() - cluster.getP1().getY() + 1);
|
||||||
String rights = cluster.isAdded(player.getUUID()) + "";
|
String rights = cluster.isAdded(player.getUUID()) + "";
|
||||||
Caption message = TranslatableCaption.of("cluster.cluster_info");
|
Caption message = TranslatableCaption.of("cluster.cluster_info");
|
||||||
TagResolver resolver = TagResolver.builder()
|
Template idTemplate = Template.of("id", id);
|
||||||
.tag("id", Tag.inserting(Component.text(id)))
|
Template ownerTemplate = Template.of("owner", owner);
|
||||||
.tag("owner", Tag.inserting(Component.text(owner)))
|
Template nameTemplate = Template.of("name", name);
|
||||||
.tag("name", Tag.inserting(Component.text(name)))
|
Template sizeTemplate = Template.of("size", size);
|
||||||
.tag("size", Tag.inserting(Component.text(size)))
|
Template rightsTemplate = Template.of("rights", rights);
|
||||||
.tag("rights", Tag.inserting(Component.text(rights)))
|
player.sendMessage(
|
||||||
.build();
|
message,
|
||||||
player.sendMessage(message, resolver);
|
idTemplate,
|
||||||
|
ownerTemplate,
|
||||||
|
nameTemplate,
|
||||||
|
sizeTemplate,
|
||||||
|
rightsTemplate
|
||||||
|
);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
return true;
|
return true;
|
||||||
@ -870,14 +802,14 @@ public class Cluster extends SubCommand {
|
|||||||
if (!Permissions.hasPermission(player, Permission.PERMISSION_CLUSTER_SETHOME)) {
|
if (!Permissions.hasPermission(player, Permission.PERMISSION_CLUSTER_SETHOME)) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("permission.no_permission"),
|
TranslatableCaption.of("permission.no_permission"),
|
||||||
TagResolver.resolver("node", Tag.inserting(Permission.PERMISSION_CLUSTER_SETHOME))
|
Template.of("node", Permission.PERMISSION_CLUSTER_SETHOME.toString())
|
||||||
);
|
);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
if (args.length != 1 && args.length != 2) {
|
if (args.length != 1 && args.length != 2) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("commandconfig.command_syntax"),
|
TranslatableCaption.of("commandconfig.command_syntax"),
|
||||||
TagResolver.resolver("value", Tag.inserting(Component.text("/plot cluster sethome")))
|
Template.of("value", "/plot cluster sethome")
|
||||||
);
|
);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@ -895,10 +827,7 @@ public class Cluster extends SubCommand {
|
|||||||
.hasPermission(player, Permission.PERMISSION_CLUSTER_SETHOME_OTHER)) {
|
.hasPermission(player, Permission.PERMISSION_CLUSTER_SETHOME_OTHER)) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("permission.no_permission"),
|
TranslatableCaption.of("permission.no_permission"),
|
||||||
TagResolver.resolver(
|
Template.of("node", Permission.PERMISSION_CLUSTER_SETHOME_OTHER.toString())
|
||||||
"node",
|
|
||||||
Tag.inserting(Permission.PERMISSION_CLUSTER_SETHOME_OTHER)
|
|
||||||
)
|
|
||||||
);
|
);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@ -917,7 +846,10 @@ public class Cluster extends SubCommand {
|
|||||||
}
|
}
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("cluster.cluster_available_args"),
|
TranslatableCaption.of("cluster.cluster_available_args"),
|
||||||
TagResolver.resolver("list", Tag.inserting(ComponentHelper.join(AVAILABLE_ARGS, SEPARATOR)))
|
Template.of(
|
||||||
|
"list",
|
||||||
|
"<dark_aqua>list</dark_aqua><gray>, </gray><dark_aqua>create</dark_aqua><gray>, </gray><dark_aqua>delete</dark_aqua><gray>, </gray><dark_aqua>resize</dark_aqua><gray>, </gray><dark_aqua>invite</dark_aqua><gray>, </gray><dark_aqua>kick</dark_aqua><gray>, </gray><dark_aqua>leave</dark_aqua><gray>, </gray><dark_aqua>members</dark_aqua><gray>, </gray><dark_aqua>info</dark_aqua><gray>, </gray><dark_aqua>tp</dark_aqua><gray>, </gray><dark_aqua>sethome</dark_aqua>"
|
||||||
|
)
|
||||||
);
|
);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -32,9 +32,7 @@ import com.plotsquared.core.player.PlayerMetaDataKeys;
|
|||||||
import com.plotsquared.core.player.PlotPlayer;
|
import com.plotsquared.core.player.PlotPlayer;
|
||||||
import com.plotsquared.core.util.task.TaskManager;
|
import com.plotsquared.core.util.task.TaskManager;
|
||||||
import com.plotsquared.core.util.task.TaskTime;
|
import com.plotsquared.core.util.task.TaskTime;
|
||||||
import net.kyori.adventure.text.Component;
|
import net.kyori.adventure.text.minimessage.Template;
|
||||||
import net.kyori.adventure.text.minimessage.tag.Tag;
|
|
||||||
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
|
|
||||||
import org.checkerframework.checker.nullness.qual.Nullable;
|
import org.checkerframework.checker.nullness.qual.Nullable;
|
||||||
|
|
||||||
public class CmdConfirm {
|
public class CmdConfirm {
|
||||||
@ -61,11 +59,9 @@ public class CmdConfirm {
|
|||||||
if (commandStr != null) {
|
if (commandStr != null) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("confirm.requires_confirm"),
|
TranslatableCaption.of("confirm.requires_confirm"),
|
||||||
TagResolver.builder()
|
Template.of("command", commandStr),
|
||||||
.tag("command", Tag.inserting(Component.text(commandStr)))
|
Template.of("timeout", String.valueOf(Settings.Confirmation.CONFIRMATION_TIMEOUT_SECONDS)),
|
||||||
.tag("timeout", Tag.inserting(Component.text(Settings.Confirmation.CONFIRMATION_TIMEOUT_SECONDS)))
|
Template.of("value", "/plot confirm")
|
||||||
.tag("value", Tag.inserting(Component.text("/plot confirm")))
|
|
||||||
.build()
|
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
TaskManager.runTaskLater(() -> {
|
TaskManager.runTaskLater(() -> {
|
||||||
|
|||||||
@ -37,10 +37,8 @@ import com.plotsquared.core.util.StringComparison;
|
|||||||
import com.plotsquared.core.util.StringMan;
|
import com.plotsquared.core.util.StringMan;
|
||||||
import com.plotsquared.core.util.task.RunnableVal2;
|
import com.plotsquared.core.util.task.RunnableVal2;
|
||||||
import com.plotsquared.core.util.task.RunnableVal3;
|
import com.plotsquared.core.util.task.RunnableVal3;
|
||||||
import net.kyori.adventure.text.Component;
|
|
||||||
import net.kyori.adventure.text.minimessage.MiniMessage;
|
import net.kyori.adventure.text.minimessage.MiniMessage;
|
||||||
import net.kyori.adventure.text.minimessage.tag.Tag;
|
import net.kyori.adventure.text.minimessage.Template;
|
||||||
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
|
|
||||||
import org.checkerframework.checker.nullness.qual.Nullable;
|
import org.checkerframework.checker.nullness.qual.Nullable;
|
||||||
|
|
||||||
import java.lang.reflect.InvocationTargetException;
|
import java.lang.reflect.InvocationTargetException;
|
||||||
@ -265,14 +263,10 @@ public abstract class Command {
|
|||||||
max = c.size();
|
max = c.size();
|
||||||
}
|
}
|
||||||
// Send the header
|
// Send the header
|
||||||
player.sendMessage(
|
Template curTemplate = Template.of("cur", String.valueOf(page + 1));
|
||||||
header,
|
Template maxTemplate = Template.of("max", String.valueOf(totalPages + 1));
|
||||||
TagResolver.builder()
|
Template amountTemplate = Template.of("amount", String.valueOf(c.size()));
|
||||||
.tag("cur", Tag.inserting(Component.text(page + 1)))
|
player.sendMessage(header, curTemplate, maxTemplate, amountTemplate);
|
||||||
.tag("max", Tag.inserting(Component.text(totalPages + 1)))
|
|
||||||
.tag("amount", Tag.inserting(Component.text(c.size())))
|
|
||||||
.build()
|
|
||||||
);
|
|
||||||
// Send the page content
|
// Send the page content
|
||||||
List<T> subList = c.subList(page * size, max);
|
List<T> subList = c.subList(page * size, max);
|
||||||
int i = page * size;
|
int i = page * size;
|
||||||
@ -280,24 +274,13 @@ public abstract class Command {
|
|||||||
i++;
|
i++;
|
||||||
final CaptionHolder msg = new CaptionHolder();
|
final CaptionHolder msg = new CaptionHolder();
|
||||||
add.run(i, obj, msg);
|
add.run(i, obj, msg);
|
||||||
player.sendMessage(msg.get(), msg.getTagResolvers());
|
player.sendMessage(msg.get(), msg.getTemplates());
|
||||||
}
|
}
|
||||||
// Send the footer
|
// Send the footer
|
||||||
player.sendMessage(
|
Template command1 = Template.of("command1", baseCommand + " " + page);
|
||||||
TranslatableCaption.of("list.page_turn"),
|
Template command2 = Template.of("command2", baseCommand + " " + (page + 2));
|
||||||
TagResolver.builder()
|
Template clickable = Template.of("clickable", TranslatableCaption.of("list.clickable").getComponent(player));
|
||||||
.tag("cur", Tag.inserting(Component.text(page + 1)))
|
player.sendMessage(TranslatableCaption.of("list.page_turn"), command1, command2, clickable);
|
||||||
.tag(
|
|
||||||
"command1",
|
|
||||||
Tag.preProcessParsed(baseCommand + " " + page)
|
|
||||||
)
|
|
||||||
.tag("command2", Tag.preProcessParsed(baseCommand + " " + (page + 2)))
|
|
||||||
.tag(
|
|
||||||
"clickable",
|
|
||||||
Tag.inserting(TranslatableCaption.of("list.clickable").toComponent(player))
|
|
||||||
)
|
|
||||||
.build()
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -305,7 +288,7 @@ public abstract class Command {
|
|||||||
* @param args Arguments
|
* @param args Arguments
|
||||||
* @param confirm Instance, Success, Failure
|
* @param confirm Instance, Success, Failure
|
||||||
* @param whenDone task to run when done
|
* @param whenDone task to run when done
|
||||||
* @return CompletableFuture {@code true} if the command executed fully, {@code false} in
|
* @return CompletableFuture true if the command executed fully, false in
|
||||||
* any other case
|
* any other case
|
||||||
*/
|
*/
|
||||||
public CompletableFuture<Boolean> execute(
|
public CompletableFuture<Boolean> execute(
|
||||||
@ -349,7 +332,7 @@ public abstract class Command {
|
|||||||
if (commands.isEmpty()) {
|
if (commands.isEmpty()) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("commandconfig.did_you_mean"),
|
TranslatableCaption.of("commandconfig.did_you_mean"),
|
||||||
TagResolver.resolver("value", Tag.inserting(Component.text(MainCommand.getInstance().help.getUsage())))
|
Template.of("value", MainCommand.getInstance().help.getUsage())
|
||||||
);
|
);
|
||||||
return CompletableFuture.completedFuture(false);
|
return CompletableFuture.completedFuture(false);
|
||||||
}
|
}
|
||||||
@ -370,7 +353,7 @@ public abstract class Command {
|
|||||||
}
|
}
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("commandconfig.did_you_mean"),
|
TranslatableCaption.of("commandconfig.did_you_mean"),
|
||||||
TagResolver.resolver("value", Tag.inserting(Component.text(cmd.getUsage())))
|
Template.of("value", cmd.getUsage())
|
||||||
);
|
);
|
||||||
return CompletableFuture.completedFuture(false);
|
return CompletableFuture.completedFuture(false);
|
||||||
}
|
}
|
||||||
@ -405,7 +388,7 @@ public abstract class Command {
|
|||||||
// TODO improve or remove the Argument system
|
// TODO improve or remove the Argument system
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("commandconfig.command_syntax"),
|
TranslatableCaption.of("commandconfig.command_syntax"),
|
||||||
TagResolver.resolver("value", Tag.inserting(Component.text(StringMan.join(fullSplit, " "))))
|
Template.of("value", StringMan.join(fullSplit, " "))
|
||||||
);
|
);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@ -494,7 +477,7 @@ public abstract class Command {
|
|||||||
if (message) {
|
if (message) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("permission.no_permission"),
|
TranslatableCaption.of("permission.no_permission"),
|
||||||
TagResolver.resolver("node", Tag.inserting(Component.text(getPermission())))
|
Template.of("node", getPermission())
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
@ -519,7 +502,7 @@ public abstract class Command {
|
|||||||
public void sendUsage(PlotPlayer<?> player) {
|
public void sendUsage(PlotPlayer<?> player) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("commandconfig.command_syntax"),
|
TranslatableCaption.of("commandconfig.command_syntax"),
|
||||||
TagResolver.resolver("value", Tag.inserting(Component.text(getUsage())))
|
Template.of("value", getUsage())
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -623,13 +606,13 @@ public abstract class Command {
|
|||||||
return this.getFullId().hashCode();
|
return this.getFullId().hashCode();
|
||||||
}
|
}
|
||||||
|
|
||||||
public void checkTrue(boolean mustBeTrue, Caption message, TagResolver... args) {
|
public void checkTrue(boolean mustBeTrue, Caption message, Template... args) {
|
||||||
if (!mustBeTrue) {
|
if (!mustBeTrue) {
|
||||||
throw new CommandException(message, args);
|
throw new CommandException(message, args);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public <T> T check(T object, Caption message, TagResolver... args) {
|
public <T> T check(T object, Caption message, Template... args) {
|
||||||
if (object == null) {
|
if (object == null) {
|
||||||
throw new CommandException(message, args);
|
throw new CommandException(message, args);
|
||||||
}
|
}
|
||||||
@ -645,10 +628,10 @@ public abstract class Command {
|
|||||||
|
|
||||||
public static class CommandException extends RuntimeException {
|
public static class CommandException extends RuntimeException {
|
||||||
|
|
||||||
|
private final Template[] args;
|
||||||
private final Caption message;
|
private final Caption message;
|
||||||
private final TagResolver[] args;
|
|
||||||
|
|
||||||
public CommandException(final @Nullable Caption message, final TagResolver... args) {
|
public CommandException(final @Nullable Caption message, final Template... args) {
|
||||||
this.message = message;
|
this.message = message;
|
||||||
this.args = args;
|
this.args = args;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -26,7 +26,7 @@
|
|||||||
package com.plotsquared.core.command;
|
package com.plotsquared.core.command;
|
||||||
|
|
||||||
import com.plotsquared.core.configuration.caption.Caption;
|
import com.plotsquared.core.configuration.caption.Caption;
|
||||||
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
|
import net.kyori.adventure.text.minimessage.Template;
|
||||||
import org.checkerframework.checker.nullness.qual.NonNull;
|
import org.checkerframework.checker.nullness.qual.NonNull;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -41,7 +41,7 @@ public interface CommandCaller {
|
|||||||
* @param caption Caption to send
|
* @param caption Caption to send
|
||||||
* @param replacements Variable replacements
|
* @param replacements Variable replacements
|
||||||
*/
|
*/
|
||||||
void sendMessage(@NonNull Caption caption, @NonNull TagResolver... replacements);
|
void sendMessage(@NonNull Caption caption, @NonNull Template... replacements);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Check the player's permissions. <i>Will be cached if permission caching is enabled.</i>
|
* Check the player's permissions. <i>Will be cached if permission caching is enabled.</i>
|
||||||
|
|||||||
@ -28,10 +28,6 @@ package com.plotsquared.core.command;
|
|||||||
import com.plotsquared.core.configuration.caption.Caption;
|
import com.plotsquared.core.configuration.caption.Caption;
|
||||||
import com.plotsquared.core.configuration.caption.LocaleHolder;
|
import com.plotsquared.core.configuration.caption.LocaleHolder;
|
||||||
import com.plotsquared.core.configuration.caption.TranslatableCaption;
|
import com.plotsquared.core.configuration.caption.TranslatableCaption;
|
||||||
import com.plotsquared.core.player.PlotPlayer;
|
|
||||||
import net.kyori.adventure.text.Component;
|
|
||||||
import net.kyori.adventure.text.ComponentLike;
|
|
||||||
import net.kyori.adventure.text.minimessage.MiniMessage;
|
|
||||||
import org.checkerframework.checker.nullness.qual.NonNull;
|
import org.checkerframework.checker.nullness.qual.NonNull;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -99,21 +95,4 @@ public enum CommandCategory implements Caption {
|
|||||||
public String getComponent(@NonNull LocaleHolder localeHolder) {
|
public String getComponent(@NonNull LocaleHolder localeHolder) {
|
||||||
return this.caption.getComponent(localeHolder);
|
return this.caption.getComponent(localeHolder);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public @NonNull Component toComponent(@NonNull final LocaleHolder localeHolder) {
|
|
||||||
return MiniMessage.miniMessage().deserialize(getComponent(localeHolder));
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Checks if a player has access to this command category
|
|
||||||
*
|
|
||||||
* @param player The player to check against
|
|
||||||
* @return {@code true} if at least one command of this category can be executed by the player, {@code false} otherwise
|
|
||||||
* @since 6.5.0
|
|
||||||
*/
|
|
||||||
boolean canAccess(PlotPlayer<?> player) {
|
|
||||||
return !MainCommand.getInstance().getCommands(this, player).isEmpty();
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -34,9 +34,7 @@ import com.plotsquared.core.plot.comment.CommentInbox;
|
|||||||
import com.plotsquared.core.plot.comment.CommentManager;
|
import com.plotsquared.core.plot.comment.CommentManager;
|
||||||
import com.plotsquared.core.plot.comment.PlotComment;
|
import com.plotsquared.core.plot.comment.PlotComment;
|
||||||
import com.plotsquared.core.util.StringMan;
|
import com.plotsquared.core.util.StringMan;
|
||||||
import net.kyori.adventure.text.Component;
|
import net.kyori.adventure.text.minimessage.Template;
|
||||||
import net.kyori.adventure.text.minimessage.tag.Tag;
|
|
||||||
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
|
|
||||||
|
|
||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
import java.util.Locale;
|
import java.util.Locale;
|
||||||
@ -53,10 +51,8 @@ public class Comment extends SubCommand {
|
|||||||
if (args.length < 2) {
|
if (args.length < 2) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("comment.comment_syntax"),
|
TranslatableCaption.of("comment.comment_syntax"),
|
||||||
TagResolver.builder()
|
Template.of("command", "/plot comment [X;Z]"),
|
||||||
.tag("command", Tag.inserting(Component.text("/plot comment [X;Z]")))
|
Template.of("list", StringMan.join(CommentManager.inboxes.keySet(), "|"))
|
||||||
.tag("list", Tag.inserting(Component.text(StringMan.join(CommentManager.inboxes.keySet(), "|"))))
|
|
||||||
.build()
|
|
||||||
);
|
);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@ -75,10 +71,8 @@ public class Comment extends SubCommand {
|
|||||||
if (args.length < 3) {
|
if (args.length < 3) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("comment.comment_syntax"),
|
TranslatableCaption.of("comment.comment_syntax"),
|
||||||
TagResolver.builder()
|
Template.of("command", "/plot comment [X;Z]"),
|
||||||
.tag("command", Tag.inserting(Component.text("/plot comment [X;Z]")))
|
Template.of("list", StringMan.join(CommentManager.inboxes.keySet(), "|"))
|
||||||
.tag("list", Tag.inserting(Component.text(StringMan.join(CommentManager.inboxes.keySet(), "|"))))
|
|
||||||
.build()
|
|
||||||
);
|
);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@ -89,10 +83,8 @@ public class Comment extends SubCommand {
|
|||||||
if (inbox == null) {
|
if (inbox == null) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("comment.comment_syntax"),
|
TranslatableCaption.of("comment.comment_syntax"),
|
||||||
TagResolver.builder()
|
Template.of("command", "/plot comment [X;Z]"),
|
||||||
.tag("command", Tag.inserting(Component.text("/plot comment [X;Z]")))
|
Template.of("list", StringMan.join(CommentManager.inboxes.keySet(), "|"))
|
||||||
.tag("list", Tag.inserting(Component.text(StringMan.join(CommentManager.inboxes.keySet(), "|"))))
|
|
||||||
.build()
|
|
||||||
);
|
);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@ -112,10 +104,8 @@ public class Comment extends SubCommand {
|
|||||||
player.sendMessage(TranslatableCaption.of("comment.no_plot_inbox"));
|
player.sendMessage(TranslatableCaption.of("comment.no_plot_inbox"));
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("comment.comment_syntax"),
|
TranslatableCaption.of("comment.comment_syntax"),
|
||||||
TagResolver.builder()
|
Template.of("command", "/plot comment [X;Z]"),
|
||||||
.tag("command", Tag.inserting(Component.text("/plot comment [X;Z]")))
|
Template.of("list", StringMan.join(CommentManager.inboxes.keySet(), "|"))
|
||||||
.tag("list", Tag.inserting(Component.text(StringMan.join(CommentManager.inboxes.keySet(), "|"))))
|
|
||||||
.build()
|
|
||||||
);
|
);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -36,9 +36,7 @@ import com.plotsquared.core.util.MathMan;
|
|||||||
import com.plotsquared.core.util.WorldUtil;
|
import com.plotsquared.core.util.WorldUtil;
|
||||||
import com.plotsquared.core.util.task.TaskManager;
|
import com.plotsquared.core.util.task.TaskManager;
|
||||||
import com.plotsquared.core.util.task.TaskTime;
|
import com.plotsquared.core.util.task.TaskTime;
|
||||||
import net.kyori.adventure.text.Component;
|
import net.kyori.adventure.text.minimessage.Template;
|
||||||
import net.kyori.adventure.text.minimessage.tag.Tag;
|
|
||||||
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
|
|
||||||
import org.checkerframework.checker.nullness.qual.NonNull;
|
import org.checkerframework.checker.nullness.qual.NonNull;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
@ -77,9 +75,7 @@ public class Condense extends SubCommand {
|
|||||||
if (args.length != 2 && args.length != 3) {
|
if (args.length != 2 && args.length != 3) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("commandconfig.command_syntax"),
|
TranslatableCaption.of("commandconfig.command_syntax"),
|
||||||
TagResolver.resolver("value", Tag.inserting(Component.text(
|
Template.of("value", "/plot condense <area> <start | stop | info> [radius]")
|
||||||
"/plot condense <area> <start | stop | info> [radius]"
|
|
||||||
)))
|
|
||||||
);
|
);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@ -93,10 +89,7 @@ public class Condense extends SubCommand {
|
|||||||
if (args.length == 2) {
|
if (args.length == 2) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("commandconfig.command_syntax"),
|
TranslatableCaption.of("commandconfig.command_syntax"),
|
||||||
TagResolver.resolver(
|
Template.of("value", "/plot condense" + area + " start <radius>")
|
||||||
"value",
|
|
||||||
Tag.inserting(Component.text("/plot condense" + area + " start " + "<radius>"))
|
|
||||||
)
|
|
||||||
);
|
);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@ -195,10 +188,8 @@ public class Condense extends SubCommand {
|
|||||||
if (result.get()) {
|
if (result.get()) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("condense.moving"),
|
TranslatableCaption.of("condense.moving"),
|
||||||
TagResolver.builder()
|
Template.of("origin", String.valueOf(origin)),
|
||||||
.tag("origin", Tag.inserting(Component.text(origin.toString())))
|
Template.of("possible", String.valueOf(possible))
|
||||||
.tag("possible", Tag.inserting(Component.text(possible.toString())))
|
|
||||||
.build()
|
|
||||||
);
|
);
|
||||||
TaskManager.runTaskLater(task, TaskTime.ticks(1L));
|
TaskManager.runTaskLater(task, TaskTime.ticks(1L));
|
||||||
}
|
}
|
||||||
@ -218,7 +209,7 @@ public class Condense extends SubCommand {
|
|||||||
if (i >= free.size()) {
|
if (i >= free.size()) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("condense.skipping"),
|
TranslatableCaption.of("condense.skipping"),
|
||||||
TagResolver.resolver("plot", Tag.inserting(Component.text(origin.toString())))
|
Template.of("plot", String.valueOf(origin))
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -239,10 +230,7 @@ public class Condense extends SubCommand {
|
|||||||
if (args.length == 2) {
|
if (args.length == 2) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("commandconfig.command_syntax"),
|
TranslatableCaption.of("commandconfig.command_syntax"),
|
||||||
TagResolver.resolver(
|
Template.of("value", "/plot condense " + area + " info <radius>")
|
||||||
"value",
|
|
||||||
Tag.inserting(Component.text("/plot condense " + area + " info <radius>"))
|
|
||||||
)
|
|
||||||
);
|
);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@ -263,20 +251,20 @@ public class Condense extends SubCommand {
|
|||||||
player.sendMessage(TranslatableCaption.of("condense.default_eval"));
|
player.sendMessage(TranslatableCaption.of("condense.default_eval"));
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("condense.minimum_radius"),
|
TranslatableCaption.of("condense.minimum_radius"),
|
||||||
TagResolver.resolver("minimumRadius", Tag.inserting(Component.text(minimumRadius)))
|
Template.of("minimumRadius", String.valueOf(minimumRadius))
|
||||||
);
|
);
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("condense.maximum_moved"),
|
TranslatableCaption.of("condense.minimum_radius"),
|
||||||
TagResolver.resolver("maxMove", Tag.inserting(Component.text(maxMove)))
|
Template.of("maxMove", String.valueOf(maxMove))
|
||||||
);
|
);
|
||||||
player.sendMessage(TranslatableCaption.of("condense.input_eval"));
|
player.sendMessage(TranslatableCaption.of("condense.input_eval"));
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("condense.input_radius"),
|
TranslatableCaption.of("condense.input_radius"),
|
||||||
TagResolver.resolver("radius", Tag.inserting(Component.text(radius)))
|
Template.of("radius", String.valueOf(radius))
|
||||||
);
|
);
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("condense.estimated_moves"),
|
TranslatableCaption.of("condense.estimated_moves"),
|
||||||
TagResolver.resolver("userMove", Tag.inserting(Component.text(userMove)))
|
Template.of("userMove", String.valueOf(userMove))
|
||||||
);
|
);
|
||||||
player.sendMessage(TranslatableCaption.of("condense.eta"));
|
player.sendMessage(TranslatableCaption.of("condense.eta"));
|
||||||
player.sendMessage(TranslatableCaption.of("condense.radius_measured"));
|
player.sendMessage(TranslatableCaption.of("condense.radius_measured"));
|
||||||
@ -285,10 +273,7 @@ public class Condense extends SubCommand {
|
|||||||
}
|
}
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("commandconfig.command_syntax"),
|
TranslatableCaption.of("commandconfig.command_syntax"),
|
||||||
TagResolver.resolver(
|
Template.of("value", "/plot condense " + area.getWorldName() + " <start | stop | info> [radius]")
|
||||||
"value",
|
|
||||||
Tag.inserting(Component.text("/plot condense " + area.getWorldName() + " <start | stop | info> [radius]"))
|
|
||||||
)
|
|
||||||
);
|
);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -48,7 +48,7 @@ public class Confirm extends SubCommand {
|
|||||||
player.sendMessage(TranslatableCaption.of("confirm.expired_confirm"));
|
player.sendMessage(TranslatableCaption.of("confirm.expired_confirm"));
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
TaskManager.runTask(command.command);
|
TaskManager.runTaskAsync(command.command);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -37,9 +37,7 @@ import com.plotsquared.core.plot.flag.PlotFlag;
|
|||||||
import com.plotsquared.core.plot.flag.implementations.DoneFlag;
|
import com.plotsquared.core.plot.flag.implementations.DoneFlag;
|
||||||
import com.plotsquared.core.util.EventDispatcher;
|
import com.plotsquared.core.util.EventDispatcher;
|
||||||
import com.plotsquared.core.util.Permissions;
|
import com.plotsquared.core.util.Permissions;
|
||||||
import net.kyori.adventure.text.Component;
|
import net.kyori.adventure.text.minimessage.Template;
|
||||||
import net.kyori.adventure.text.minimessage.tag.Tag;
|
|
||||||
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
|
|
||||||
import org.checkerframework.checker.nullness.qual.NonNull;
|
import org.checkerframework.checker.nullness.qual.NonNull;
|
||||||
|
|
||||||
@CommandDeclaration(command = "continue",
|
@CommandDeclaration(command = "continue",
|
||||||
@ -66,9 +64,7 @@ public class Continue extends SubCommand {
|
|||||||
.hasPermission(player, Permission.PERMISSION_ADMIN_COMMAND_CONTINUE)) {
|
.hasPermission(player, Permission.PERMISSION_ADMIN_COMMAND_CONTINUE)) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("permission.no_permission"),
|
TranslatableCaption.of("permission.no_permission"),
|
||||||
TagResolver.resolver("node", Tag.inserting(
|
Template.of("node", TranslatableCaption.of("permission.no_plot_perms").getComponent(player))
|
||||||
TranslatableCaption.of("permission.no_plot_perms").toComponent(player)
|
|
||||||
))
|
|
||||||
);
|
);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@ -81,7 +77,7 @@ public class Continue extends SubCommand {
|
|||||||
< player.getPlotCount() + size)) {
|
< player.getPlotCount() + size)) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("permission.cant_claim_more_plots"),
|
TranslatableCaption.of("permission.cant_claim_more_plots"),
|
||||||
TagResolver.resolver("amount", Tag.inserting(Component.text(player.getAllowedPlots())))
|
Template.of("amount", String.valueOf(player.getAllowedPlots()))
|
||||||
);
|
);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@ -95,7 +91,7 @@ public class Continue extends SubCommand {
|
|||||||
if (event.getEventResult() == Result.DENY) {
|
if (event.getEventResult() == Result.DENY) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("events.event_denied"),
|
TranslatableCaption.of("events.event_denied"),
|
||||||
TagResolver.resolver("value", Tag.inserting(Component.text("Done flag removal")))
|
Template.of("value", "Done flag removal")
|
||||||
);
|
);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -31,9 +31,7 @@ import com.plotsquared.core.permissions.Permission;
|
|||||||
import com.plotsquared.core.player.PlotPlayer;
|
import com.plotsquared.core.player.PlotPlayer;
|
||||||
import com.plotsquared.core.plot.Plot;
|
import com.plotsquared.core.plot.Plot;
|
||||||
import com.plotsquared.core.util.Permissions;
|
import com.plotsquared.core.util.Permissions;
|
||||||
import net.kyori.adventure.text.Component;
|
import net.kyori.adventure.text.minimessage.Template;
|
||||||
import net.kyori.adventure.text.minimessage.tag.Tag;
|
|
||||||
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
|
|
||||||
|
|
||||||
@CommandDeclaration(command = "copy",
|
@CommandDeclaration(command = "copy",
|
||||||
permission = "plots.copy",
|
permission = "plots.copy",
|
||||||
@ -59,7 +57,7 @@ public class Copy extends SubCommand {
|
|||||||
if (args.length != 1) {
|
if (args.length != 1) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("commandconfig.command_syntax"),
|
TranslatableCaption.of("commandconfig.command_syntax"),
|
||||||
TagResolver.resolver("value", Tag.inserting(Component.text("/plot copy <X;Z>")))
|
Template.of("value", "/plot copy <X;Z>")
|
||||||
);
|
);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@ -78,11 +76,8 @@ public class Copy extends SubCommand {
|
|||||||
|
|
||||||
plot1.getPlotModificationManager().copy(plot2, player).thenAccept(result -> {
|
plot1.getPlotModificationManager().copy(plot2, player).thenAccept(result -> {
|
||||||
if (result) {
|
if (result) {
|
||||||
player.sendMessage(TranslatableCaption.of("move.copy_success"),
|
player.sendMessage(TranslatableCaption.of("move.copy_success"), Template.of("origin", String.valueOf(plot1)),
|
||||||
TagResolver.builder()
|
Template.of("target", String.valueOf(plot2))
|
||||||
.tag("origin", Tag.inserting(Component.text(plot1.toString())))
|
|
||||||
.tag("target", Tag.inserting(Component.text(plot2.toString())))
|
|
||||||
.build()
|
|
||||||
);
|
);
|
||||||
} else {
|
} else {
|
||||||
player.sendMessage(TranslatableCaption.of("move.requires_unowned"));
|
player.sendMessage(TranslatableCaption.of("move.requires_unowned"));
|
||||||
|
|||||||
@ -32,9 +32,7 @@ import com.plotsquared.core.generator.HybridUtils;
|
|||||||
import com.plotsquared.core.location.Location;
|
import com.plotsquared.core.location.Location;
|
||||||
import com.plotsquared.core.player.PlotPlayer;
|
import com.plotsquared.core.player.PlotPlayer;
|
||||||
import com.plotsquared.core.plot.Plot;
|
import com.plotsquared.core.plot.Plot;
|
||||||
import net.kyori.adventure.text.Component;
|
import net.kyori.adventure.text.minimessage.Template;
|
||||||
import net.kyori.adventure.text.minimessage.tag.Tag;
|
|
||||||
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
|
|
||||||
import org.checkerframework.checker.nullness.qual.NonNull;
|
import org.checkerframework.checker.nullness.qual.NonNull;
|
||||||
|
|
||||||
@CommandDeclaration(command = "createroadschematic",
|
@CommandDeclaration(command = "createroadschematic",
|
||||||
@ -70,7 +68,7 @@ public class CreateRoadSchematic extends SubCommand {
|
|||||||
this.hybridUtils.setupRoadSchematic(plot);
|
this.hybridUtils.setupRoadSchematic(plot);
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("schematics.schematic_road_created"),
|
TranslatableCaption.of("schematics.schematic_road_created"),
|
||||||
TagResolver.resolver("command", Tag.inserting(Component.text("/plot debugroadregen")))
|
Template.of("command", "/plot debugroadregen")
|
||||||
);
|
);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -47,9 +47,7 @@ import com.plotsquared.core.util.EventDispatcher;
|
|||||||
import com.plotsquared.core.util.FileUtils;
|
import com.plotsquared.core.util.FileUtils;
|
||||||
import com.plotsquared.core.util.query.PlotQuery;
|
import com.plotsquared.core.util.query.PlotQuery;
|
||||||
import com.plotsquared.core.util.task.TaskManager;
|
import com.plotsquared.core.util.task.TaskManager;
|
||||||
import net.kyori.adventure.text.Component;
|
import net.kyori.adventure.text.minimessage.Template;
|
||||||
import net.kyori.adventure.text.minimessage.tag.Tag;
|
|
||||||
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
|
|
||||||
import org.checkerframework.checker.nullness.qual.NonNull;
|
import org.checkerframework.checker.nullness.qual.NonNull;
|
||||||
|
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
@ -110,10 +108,7 @@ public class DatabaseCommand extends SubCommand {
|
|||||||
if (args.length < 1) {
|
if (args.length < 1) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("commandconfig.command_syntax"),
|
TranslatableCaption.of("commandconfig.command_syntax"),
|
||||||
TagResolver.resolver(
|
Template.of("value", "/plot database [area] <sqlite | mysql | import>")
|
||||||
"value",
|
|
||||||
Tag.inserting(Component.text("/plot database [area] <sqlite | mysql | import>"))
|
|
||||||
)
|
|
||||||
);
|
);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@ -128,7 +123,7 @@ public class DatabaseCommand extends SubCommand {
|
|||||||
if (args.length < 1) {
|
if (args.length < 1) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("commandconfig.command_syntax"),
|
TranslatableCaption.of("commandconfig.command_syntax"),
|
||||||
TagResolver.resolver("value", Tag.inserting(Component.text("/plot database [area] <sqlite|mysql|import>")))
|
Template.of("value", "/plot database [area] <sqlite|mysql|import>")
|
||||||
);
|
);
|
||||||
player.sendMessage(TranslatableCaption.of("database.arg"));
|
player.sendMessage(TranslatableCaption.of("database.arg"));
|
||||||
return false;
|
return false;
|
||||||
@ -141,10 +136,7 @@ public class DatabaseCommand extends SubCommand {
|
|||||||
if (args.length < 2) {
|
if (args.length < 2) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("commandconfig.command_syntax"),
|
TranslatableCaption.of("commandconfig.command_syntax"),
|
||||||
TagResolver.resolver(
|
Template.of("value", "/plot database import <sqlite file> [prefix]")
|
||||||
"value",
|
|
||||||
Tag.inserting(Component.text("/plot database import <sqlite file> [prefix]"))
|
|
||||||
)
|
|
||||||
);
|
);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@ -155,7 +147,7 @@ public class DatabaseCommand extends SubCommand {
|
|||||||
if (!file.exists()) {
|
if (!file.exists()) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("database.does_not_exist"),
|
TranslatableCaption.of("database.does_not_exist"),
|
||||||
TagResolver.resolver("value", Tag.inserting(Component.text(file.toString())))
|
Template.of("value", String.valueOf(file))
|
||||||
);
|
);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@ -199,10 +191,8 @@ public class DatabaseCommand extends SubCommand {
|
|||||||
}
|
}
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("database.skipping_duplicated_plot"),
|
TranslatableCaption.of("database.skipping_duplicated_plot"),
|
||||||
TagResolver.builder()
|
Template.of("plot", String.valueOf(plot)),
|
||||||
.tag("plot", Tag.inserting(Component.text(plot.toString())))
|
Template.of("id", String.valueOf(plot.temp))
|
||||||
.tag("id", Tag.inserting(Component.text(plot.temp)))
|
|
||||||
.build()
|
|
||||||
);
|
);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -41,10 +41,7 @@ import com.plotsquared.core.uuid.UUIDMapping;
|
|||||||
import com.sk89q.worldedit.world.entity.EntityType;
|
import com.sk89q.worldedit.world.entity.EntityType;
|
||||||
import net.kyori.adventure.text.Component;
|
import net.kyori.adventure.text.Component;
|
||||||
import net.kyori.adventure.text.TextComponent;
|
import net.kyori.adventure.text.TextComponent;
|
||||||
import net.kyori.adventure.text.format.NamedTextColor;
|
import net.kyori.adventure.text.minimessage.Template;
|
||||||
import net.kyori.adventure.text.format.TextColor;
|
|
||||||
import net.kyori.adventure.text.minimessage.tag.Tag;
|
|
||||||
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
|
|
||||||
import org.checkerframework.checker.nullness.qual.NonNull;
|
import org.checkerframework.checker.nullness.qual.NonNull;
|
||||||
|
|
||||||
import java.util.Collection;
|
import java.util.Collection;
|
||||||
@ -78,10 +75,7 @@ public class Debug extends SubCommand {
|
|||||||
if (args.length == 0) {
|
if (args.length == 0) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("commandconfig.command_syntax"),
|
TranslatableCaption.of("commandconfig.command_syntax"),
|
||||||
TagResolver.resolver(
|
Template.of("value", "/plot debug <loadedchunks | player | debug-players | entitytypes | msg>")
|
||||||
"value",
|
|
||||||
Tag.inserting(Component.text("/plot debug <loadedchunks | player | debug-players | entitytypes | msg>"))
|
|
||||||
)
|
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
if (args.length > 0) {
|
if (args.length > 0) {
|
||||||
@ -108,7 +102,7 @@ public class Debug extends SubCommand {
|
|||||||
final Collection<UUIDMapping> mappings = PlotSquared.get().getImpromptuUUIDPipeline().getAllImmediately();
|
final Collection<UUIDMapping> mappings = PlotSquared.get().getImpromptuUUIDPipeline().getAllImmediately();
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("debug.cached_uuids"),
|
TranslatableCaption.of("debug.cached_uuids"),
|
||||||
TagResolver.resolver("value", Tag.inserting(Component.text(mappings.size())))
|
Template.of("value", String.valueOf(mappings.size()))
|
||||||
);
|
);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
@ -117,7 +111,7 @@ public class Debug extends SubCommand {
|
|||||||
for (final PlotPlayer<?> pp : PlotPlayer.getDebugModePlayers()) {
|
for (final PlotPlayer<?> pp : PlotPlayer.getDebugModePlayers()) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("debug.player_in_debugmode_list"),
|
TranslatableCaption.of("debug.player_in_debugmode_list"),
|
||||||
TagResolver.resolver("value", Tag.inserting(Component.text(pp.getName())))
|
Template.of("value", pp.getName())
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
@ -127,11 +121,10 @@ public class Debug extends SubCommand {
|
|||||||
player.sendMessage(TranslatableCaption.of("debug.entity_categories"));
|
player.sendMessage(TranslatableCaption.of("debug.entity_categories"));
|
||||||
EntityCategory.REGISTRY.forEach(category -> {
|
EntityCategory.REGISTRY.forEach(category -> {
|
||||||
final StringBuilder builder =
|
final StringBuilder builder =
|
||||||
new StringBuilder("<gray>-</gray> <gold>").append(category.getId()).append("</gold><gray>: <gold>");
|
new StringBuilder("§7- §6").append(category.getId()).append("§7: §6");
|
||||||
for (final EntityType entityType : category.getAll()) {
|
for (final EntityType entityType : category.getAll()) {
|
||||||
builder.append(entityType.getId()).append(" ");
|
builder.append(entityType.getId()).append(" ");
|
||||||
}
|
}
|
||||||
builder.append("</gold>");
|
|
||||||
player.sendMessage(StaticCaption.of("<prefix>" + builder));
|
player.sendMessage(StaticCaption.of("<prefix>" + builder));
|
||||||
});
|
});
|
||||||
EntityType.REGISTRY.values().stream().sorted(Comparator.comparing(EntityType::getId))
|
EntityType.REGISTRY.values().stream().sorted(Comparator.comparing(EntityType::getId))
|
||||||
@ -151,53 +144,28 @@ public class Debug extends SubCommand {
|
|||||||
.getCaptionMap(TranslatableCaption.DEFAULT_NAMESPACE)
|
.getCaptionMap(TranslatableCaption.DEFAULT_NAMESPACE)
|
||||||
.getCaptions();
|
.getCaptions();
|
||||||
TextComponent.Builder information = Component.text();
|
TextComponent.Builder information = Component.text();
|
||||||
Component header = TranslatableCaption.of("debug.debug_header").toComponent(player)
|
Component header = MINI_MESSAGE.parse(TranslatableCaption.of("debug.debug_header").getComponent(player) + "\n");
|
||||||
.append(Component.newline());
|
|
||||||
String line = TranslatableCaption.of("debug.debug_line").getComponent(player) + "\n";
|
String line = TranslatableCaption.of("debug.debug_line").getComponent(player) + "\n";
|
||||||
String section = TranslatableCaption.of("debug.debug_section").getComponent(player) + "\n";
|
String section = TranslatableCaption.of("debug.debug_section").getComponent(player) + "\n";
|
||||||
information.append(header);
|
information.append(header);
|
||||||
information.append(MINI_MESSAGE.deserialize(
|
information.append(MINI_MESSAGE.parse(section, Template.of("val", "PlotArea")));
|
||||||
section,
|
|
||||||
TagResolver.resolver("val", Tag.inserting(Component.text("PlotArea")))
|
|
||||||
));
|
|
||||||
information.append(MINI_MESSAGE
|
information.append(MINI_MESSAGE
|
||||||
.deserialize(
|
.parse(
|
||||||
line,
|
line,
|
||||||
TagResolver.builder()
|
Template.of("var", "Plot Worlds"),
|
||||||
.tag("var", Tag.inserting(Component.text("Plot Worlds")))
|
Template.of("val", StringMan.join(this.plotAreaManager.getAllPlotAreas(), ", "))
|
||||||
.tag(
|
|
||||||
"val",
|
|
||||||
Tag.inserting(Component.text(StringMan.join(
|
|
||||||
this.plotAreaManager.getAllPlotAreas(),
|
|
||||||
", "
|
|
||||||
)))
|
|
||||||
)
|
|
||||||
.build()
|
|
||||||
));
|
));
|
||||||
information.append(
|
information.append(
|
||||||
MINI_MESSAGE.deserialize(
|
MINI_MESSAGE.parse(
|
||||||
line,
|
line,
|
||||||
TagResolver.builder()
|
Template.of("var", "Owned Plots"),
|
||||||
.tag("var", Tag.inserting(Component.text("Owned Plots")))
|
Template.of("val", String.valueOf(PlotQuery.newQuery().allPlots().count()))
|
||||||
.tag(
|
|
||||||
"val",
|
|
||||||
Tag.inserting(Component.text(PlotQuery.newQuery().allPlots().count()))
|
|
||||||
)
|
|
||||||
.build()
|
|
||||||
));
|
));
|
||||||
information.append(MINI_MESSAGE.deserialize(
|
information.append(MINI_MESSAGE.parse(section, Template.of("val", "Messages")));
|
||||||
section,
|
information.append(MINI_MESSAGE.parse(
|
||||||
TagResolver.resolver("val", Tag.inserting(Component.text("Messages")))
|
|
||||||
));
|
|
||||||
information.append(MINI_MESSAGE.deserialize(
|
|
||||||
line,
|
line,
|
||||||
TagResolver.builder()
|
Template.of("var", "Total Messages"),
|
||||||
.tag("var", Tag.inserting(Component.text("Total Messages")))
|
Template.of("val", String.valueOf(captions.size()))
|
||||||
.tag(
|
|
||||||
"val",
|
|
||||||
Tag.inserting(Component.text(captions.size()))
|
|
||||||
)
|
|
||||||
.build()
|
|
||||||
));
|
));
|
||||||
player.sendMessage(StaticCaption.of(MINI_MESSAGE.serialize(information.build())));
|
player.sendMessage(StaticCaption.of(MINI_MESSAGE.serialize(information.build())));
|
||||||
return true;
|
return true;
|
||||||
|
|||||||
@ -43,14 +43,12 @@ import com.plotsquared.core.util.EventDispatcher;
|
|||||||
import com.plotsquared.core.util.StringMan;
|
import com.plotsquared.core.util.StringMan;
|
||||||
import com.plotsquared.core.util.query.PlotQuery;
|
import com.plotsquared.core.util.query.PlotQuery;
|
||||||
import com.plotsquared.core.util.task.RunnableVal;
|
import com.plotsquared.core.util.task.RunnableVal;
|
||||||
import net.kyori.adventure.text.Component;
|
import net.kyori.adventure.text.minimessage.Template;
|
||||||
import net.kyori.adventure.text.minimessage.tag.Tag;
|
|
||||||
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
|
|
||||||
import org.checkerframework.checker.nullness.qual.NonNull;
|
import org.checkerframework.checker.nullness.qual.NonNull;
|
||||||
|
|
||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
import java.util.Collection;
|
import java.util.Collection;
|
||||||
import java.util.LinkedHashSet;
|
import java.util.HashSet;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Locale;
|
import java.util.Locale;
|
||||||
import java.util.stream.Collectors;
|
import java.util.stream.Collectors;
|
||||||
@ -104,7 +102,7 @@ public class DebugExec extends SubCommand {
|
|||||||
if (analysis != null) {
|
if (analysis != null) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("debugexec.changes_column"),
|
TranslatableCaption.of("debugexec.changes_column"),
|
||||||
TagResolver.resolver("value", Tag.inserting(Component.text(analysis.changes)))
|
Template.of("value", String.valueOf(analysis.changes))
|
||||||
);
|
);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
@ -114,7 +112,7 @@ public class DebugExec extends SubCommand {
|
|||||||
public void run(PlotAnalysis value) {
|
public void run(PlotAnalysis value) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("debugexec.analyze_done"),
|
TranslatableCaption.of("debugexec.analyze_done"),
|
||||||
TagResolver.resolver("command", Tag.inserting(Component.text("/plot debugexec analyze")))
|
Template.of("command", "/plot debugexec analyze")
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
@ -124,10 +122,7 @@ public class DebugExec extends SubCommand {
|
|||||||
if (args.length != 2) {
|
if (args.length != 2) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("commandconfig.command_syntax"),
|
TranslatableCaption.of("commandconfig.command_syntax"),
|
||||||
TagResolver.resolver(
|
Template.of("value", "/plot debugexec analyze <threshold>")
|
||||||
"value",
|
|
||||||
Tag.inserting(Component.text("/plot debugexec analyze <threshold>"))
|
|
||||||
)
|
|
||||||
);
|
);
|
||||||
player.sendMessage(TranslatableCaption.of("debugexec.threshold_default"));
|
player.sendMessage(TranslatableCaption.of("debugexec.threshold_default"));
|
||||||
return false;
|
return false;
|
||||||
@ -138,7 +133,7 @@ public class DebugExec extends SubCommand {
|
|||||||
} catch (NumberFormatException ignored) {
|
} catch (NumberFormatException ignored) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("debugexec.invalid_threshold"),
|
TranslatableCaption.of("debugexec.invalid_threshold"),
|
||||||
TagResolver.resolver("value", Tag.inserting(Component.text(args[1])))
|
Template.of("value", args[1])
|
||||||
);
|
);
|
||||||
player.sendMessage(TranslatableCaption.of("debugexec.threshold_default_double"));
|
player.sendMessage(TranslatableCaption.of("debugexec.threshold_default_double"));
|
||||||
return false;
|
return false;
|
||||||
@ -172,7 +167,7 @@ public class DebugExec extends SubCommand {
|
|||||||
if (args.length != 2) {
|
if (args.length != 2) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("commandconfig.command_syntax"),
|
TranslatableCaption.of("commandconfig.command_syntax"),
|
||||||
TagResolver.resolver("value", Tag.inserting(Component.text("/plot debugexec remove-flag <flag>")))
|
Template.of("value", "/plot debugexec remove-flag <flag>")
|
||||||
);
|
);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@ -190,7 +185,7 @@ public class DebugExec extends SubCommand {
|
|||||||
}
|
}
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("debugexec.cleared_flag"),
|
TranslatableCaption.of("debugexec.cleared_flag"),
|
||||||
TagResolver.resolver("value", Tag.inserting(Component.text(flag)))
|
Template.of("value", flag)
|
||||||
);
|
);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
@ -198,10 +193,7 @@ public class DebugExec extends SubCommand {
|
|||||||
if (args.length != 2) {
|
if (args.length != 2) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("commandconfig.command_syntax"),
|
TranslatableCaption.of("commandconfig.command_syntax"),
|
||||||
TagResolver.resolver(
|
Template.of("value", "Invalid syntax: /plot debugexec start-rgar <world>")
|
||||||
"value",
|
|
||||||
Tag.inserting(Component.text("Invalid syntax: /plot debugexec start-rgar <world>"))
|
|
||||||
)
|
|
||||||
);
|
);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@ -209,13 +201,13 @@ public class DebugExec extends SubCommand {
|
|||||||
if (area == null) {
|
if (area == null) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("errors.not_valid_plot_world"),
|
TranslatableCaption.of("errors.not_valid_plot_world"),
|
||||||
TagResolver.resolver("value", Tag.inserting(Component.text(args[1])))
|
Template.of("value", args[1])
|
||||||
);
|
);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
boolean result;
|
boolean result;
|
||||||
if (HybridUtils.regions != null) {
|
if (HybridUtils.regions != null) {
|
||||||
result = this.hybridUtils.scheduleRoadUpdate(area, HybridUtils.regions, 0, new LinkedHashSet<>());
|
result = this.hybridUtils.scheduleRoadUpdate(area, HybridUtils.regions, 0, new HashSet<>());
|
||||||
} else {
|
} else {
|
||||||
result = this.hybridUtils.scheduleRoadUpdate(area, 0);
|
result = this.hybridUtils.scheduleRoadUpdate(area, 0);
|
||||||
}
|
}
|
||||||
|
|||||||
@ -38,9 +38,7 @@ import com.plotsquared.core.inject.annotations.WorldFile;
|
|||||||
import com.plotsquared.core.player.PlotPlayer;
|
import com.plotsquared.core.player.PlotPlayer;
|
||||||
import com.plotsquared.core.util.PremiumVerification;
|
import com.plotsquared.core.util.PremiumVerification;
|
||||||
import com.plotsquared.core.util.task.TaskManager;
|
import com.plotsquared.core.util.task.TaskManager;
|
||||||
import net.kyori.adventure.text.Component;
|
import net.kyori.adventure.text.minimessage.Template;
|
||||||
import net.kyori.adventure.text.minimessage.tag.Tag;
|
|
||||||
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
|
|
||||||
import org.checkerframework.checker.nullness.qual.NonNull;
|
import org.checkerframework.checker.nullness.qual.NonNull;
|
||||||
|
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
@ -140,10 +138,8 @@ public class DebugPaste extends SubCommand {
|
|||||||
} catch (IOException ignored) {
|
} catch (IOException ignored) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("debugpaste.latest_log"),
|
TranslatableCaption.of("debugpaste.latest_log"),
|
||||||
TagResolver.builder()
|
Template.of("file", "latest.log"),
|
||||||
.tag("file", Tag.inserting(Component.text("latest.log")))
|
Template.of("size", "14MB")
|
||||||
.tag("size", Tag.inserting(Component.text("14MB")))
|
|
||||||
.build()
|
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -152,7 +148,7 @@ public class DebugPaste extends SubCommand {
|
|||||||
} catch (final IllegalArgumentException ignored) {
|
} catch (final IllegalArgumentException ignored) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("debugpaste.empty_file"),
|
TranslatableCaption.of("debugpaste.empty_file"),
|
||||||
TagResolver.resolver("file", Tag.inserting(Component.text("settings.yml")))
|
Template.of("file", "settings.yml")
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
try {
|
try {
|
||||||
@ -160,7 +156,7 @@ public class DebugPaste extends SubCommand {
|
|||||||
} catch (final IllegalArgumentException ignored) {
|
} catch (final IllegalArgumentException ignored) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("debugpaste.empty_file"),
|
TranslatableCaption.of("debugpaste.empty_file"),
|
||||||
TagResolver.resolver("file", Tag.inserting(Component.text("worlds.yml")))
|
Template.of("file", "worlds.yml")
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -173,7 +169,7 @@ public class DebugPaste extends SubCommand {
|
|||||||
} catch (final IOException ignored) {
|
} catch (final IOException ignored) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("debugpaste.skip_multiverse"),
|
TranslatableCaption.of("debugpaste.skip_multiverse"),
|
||||||
TagResolver.resolver("file", Tag.inserting(Component.text("worlds.yml")))
|
Template.of("file", "worlds.yml")
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -188,20 +184,20 @@ public class DebugPaste extends SubCommand {
|
|||||||
String.format("https://athion.net/ISPaster/paste/view/%s", pasteId);
|
String.format("https://athion.net/ISPaster/paste/view/%s", pasteId);
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("debugpaste.debug_report_created"),
|
TranslatableCaption.of("debugpaste.debug_report_created"),
|
||||||
TagResolver.resolver("url", Tag.preProcessParsed(link))
|
Template.of("url", link)
|
||||||
);
|
);
|
||||||
} else {
|
} else {
|
||||||
final String responseMessage = jsonObject.get("response").getAsString();
|
final String responseMessage = jsonObject.get("response").getAsString();
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("debugpaste.creation_failed"),
|
TranslatableCaption.of("debugpaste.creation_failed"),
|
||||||
TagResolver.resolver("value", Tag.inserting(Component.text(responseMessage)))
|
Template.of("value", responseMessage)
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
} catch (final Throwable throwable) {
|
} catch (final Throwable throwable) {
|
||||||
throwable.printStackTrace();
|
throwable.printStackTrace();
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("debugpaste.creation_failed"),
|
TranslatableCaption.of("debugpaste.creation_failed"),
|
||||||
TagResolver.resolver("value", Tag.inserting(Component.text(throwable.getMessage())))
|
Template.of("value", throwable.getMessage())
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
} catch (IOException e) {
|
} catch (IOException e) {
|
||||||
|
|||||||
@ -35,9 +35,7 @@ import com.plotsquared.core.plot.Plot;
|
|||||||
import com.plotsquared.core.plot.PlotArea;
|
import com.plotsquared.core.plot.PlotArea;
|
||||||
import com.plotsquared.core.plot.PlotManager;
|
import com.plotsquared.core.plot.PlotManager;
|
||||||
import com.plotsquared.core.queue.QueueCoordinator;
|
import com.plotsquared.core.queue.QueueCoordinator;
|
||||||
import net.kyori.adventure.text.Component;
|
import net.kyori.adventure.text.minimessage.Template;
|
||||||
import net.kyori.adventure.text.minimessage.tag.Tag;
|
|
||||||
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
|
|
||||||
import org.checkerframework.checker.nullness.qual.NonNull;
|
import org.checkerframework.checker.nullness.qual.NonNull;
|
||||||
|
|
||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
@ -69,7 +67,7 @@ public class DebugRoadRegen extends SubCommand {
|
|||||||
if (args.length < 1) {
|
if (args.length < 1) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("commandconfig.command_syntax"),
|
TranslatableCaption.of("commandconfig.command_syntax"),
|
||||||
TagResolver.resolver("value", Tag.inserting(Component.text(DebugRoadRegen.USAGE)))
|
Template.of("value", DebugRoadRegen.USAGE)
|
||||||
);
|
);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@ -89,7 +87,7 @@ public class DebugRoadRegen extends SubCommand {
|
|||||||
default:
|
default:
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("commandconfig.command_syntax"),
|
TranslatableCaption.of("commandconfig.command_syntax"),
|
||||||
TagResolver.resolver("value", Tag.inserting(Component.text(DebugRoadRegen.USAGE)))
|
Template.of("value", DebugRoadRegen.USAGE)
|
||||||
);
|
);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@ -112,11 +110,11 @@ public class DebugRoadRegen extends SubCommand {
|
|||||||
queue.setCompleteTask(() -> {
|
queue.setCompleteTask(() -> {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("debugroadregen.regen_done"),
|
TranslatableCaption.of("debugroadregen.regen_done"),
|
||||||
TagResolver.resolver("value", Tag.inserting(Component.text(plot.getId().toString())))
|
Template.of("value", plot.getId().toString())
|
||||||
);
|
);
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("debugroadregen.regen_all"),
|
TranslatableCaption.of("debugroadregen.regen_all"),
|
||||||
TagResolver.resolver("value", Tag.inserting(Component.text("/plot regenallroads")))
|
Template.of("value", "/plot regenallroads")
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
manager.createRoadEast(plot, queue);
|
manager.createRoadEast(plot, queue);
|
||||||
@ -135,18 +133,18 @@ public class DebugRoadRegen extends SubCommand {
|
|||||||
} catch (NumberFormatException ignored) {
|
} catch (NumberFormatException ignored) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("invalid.not_valid_number"),
|
TranslatableCaption.of("invalid.not_valid_number"),
|
||||||
TagResolver.resolver("value", Tag.inserting(Component.text("0, 256")))
|
Template.of("value", "0, 256")
|
||||||
);
|
);
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("commandconfig.command_syntax"),
|
TranslatableCaption.of("commandconfig.command_syntax"),
|
||||||
TagResolver.resolver("value", Tag.inserting(Component.text(DebugRoadRegen.USAGE)))
|
Template.of("value", DebugRoadRegen.USAGE)
|
||||||
);
|
);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
} else if (args.length != 0) {
|
} else if (args.length != 0) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("commandconfig.command_syntax"),
|
TranslatableCaption.of("commandconfig.command_syntax"),
|
||||||
TagResolver.resolver("value", Tag.inserting(Component.text(DebugRoadRegen.USAGE)))
|
Template.of("value", DebugRoadRegen.USAGE)
|
||||||
);
|
);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@ -164,11 +162,11 @@ public class DebugRoadRegen extends SubCommand {
|
|||||||
}
|
}
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("debugroadregen.schematic"),
|
TranslatableCaption.of("debugroadregen.schematic"),
|
||||||
TagResolver.resolver("command", Tag.inserting(Component.text("/plot createroadschematic")))
|
Template.of("command", "/plot createroadschematic")
|
||||||
);
|
);
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("debugroadregen.regenallroads"),
|
TranslatableCaption.of("debugroadregen.regenallroads"),
|
||||||
TagResolver.resolver("command", Tag.inserting(Component.text("/plot regenallroads")))
|
Template.of("command", "/plot regenallroads")
|
||||||
);
|
);
|
||||||
boolean result = this.hybridUtils.scheduleSingleRegionRoadUpdate(plot, height);
|
boolean result = this.hybridUtils.scheduleSingleRegionRoadUpdate(plot, height);
|
||||||
if (!result) {
|
if (!result) {
|
||||||
|
|||||||
@ -40,9 +40,7 @@ import com.plotsquared.core.util.EventDispatcher;
|
|||||||
import com.plotsquared.core.util.Permissions;
|
import com.plotsquared.core.util.Permissions;
|
||||||
import com.plotsquared.core.util.PlotExpression;
|
import com.plotsquared.core.util.PlotExpression;
|
||||||
import com.plotsquared.core.util.task.TaskManager;
|
import com.plotsquared.core.util.task.TaskManager;
|
||||||
import net.kyori.adventure.text.Component;
|
import net.kyori.adventure.text.minimessage.Template;
|
||||||
import net.kyori.adventure.text.minimessage.tag.Tag;
|
|
||||||
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
|
|
||||||
import org.checkerframework.checker.nullness.qual.NonNull;
|
import org.checkerframework.checker.nullness.qual.NonNull;
|
||||||
|
|
||||||
|
|
||||||
@ -87,7 +85,7 @@ public class Delete extends SubCommand {
|
|||||||
if (eventResult == Result.DENY) {
|
if (eventResult == Result.DENY) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("events.event_denied"),
|
TranslatableCaption.of("events.event_denied"),
|
||||||
TagResolver.resolver("value", Tag.inserting(Component.text("Delete")))
|
Template.of("value", "Delete")
|
||||||
);
|
);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
@ -123,17 +121,14 @@ public class Delete extends SubCommand {
|
|||||||
this.econHandler.depositMoney(player, value);
|
this.econHandler.depositMoney(player, value);
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("economy.added_balance"),
|
TranslatableCaption.of("economy.added_balance"),
|
||||||
TagResolver.resolver("money", Tag.inserting(Component.text(this.econHandler.format(value))))
|
Template.of("money", this.econHandler.format(value))
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("working.deleting_done"),
|
TranslatableCaption.of("working.deleting_done"),
|
||||||
TagResolver.resolver(
|
Template.of("amount", String.valueOf(System.currentTimeMillis() - start)),
|
||||||
"amount",
|
Template.of("plot", plot.getId().toString())
|
||||||
Tag.inserting(Component.text(String.valueOf(System.currentTimeMillis() - start)))
|
|
||||||
),
|
|
||||||
TagResolver.resolver("plot", Tag.inserting(Component.text(plot.getId().toString())))
|
|
||||||
);
|
);
|
||||||
eventDispatcher.callPostDelete(plot);
|
eventDispatcher.callPostDelete(plot);
|
||||||
});
|
});
|
||||||
|
|||||||
@ -42,9 +42,7 @@ import com.plotsquared.core.util.PlayerManager;
|
|||||||
import com.plotsquared.core.util.TabCompletions;
|
import com.plotsquared.core.util.TabCompletions;
|
||||||
import com.plotsquared.core.util.WorldUtil;
|
import com.plotsquared.core.util.WorldUtil;
|
||||||
import com.sk89q.worldedit.world.gamemode.GameModes;
|
import com.sk89q.worldedit.world.gamemode.GameModes;
|
||||||
import net.kyori.adventure.text.Component;
|
import net.kyori.adventure.text.minimessage.Template;
|
||||||
import net.kyori.adventure.text.minimessage.tag.Tag;
|
|
||||||
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
|
|
||||||
import org.checkerframework.checker.nullness.qual.NonNull;
|
import org.checkerframework.checker.nullness.qual.NonNull;
|
||||||
|
|
||||||
import java.util.Collection;
|
import java.util.Collection;
|
||||||
@ -99,7 +97,7 @@ public class Deny extends SubCommand {
|
|||||||
if (size >= maxDenySize) {
|
if (size >= maxDenySize) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("members.plot_max_members_denied"),
|
TranslatableCaption.of("members.plot_max_members_denied"),
|
||||||
TagResolver.resolver("amount", Tag.inserting(Component.text(size)))
|
Template.of("amount", String.valueOf(size))
|
||||||
);
|
);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@ -110,7 +108,7 @@ public class Deny extends SubCommand {
|
|||||||
} else if (throwable != null || uuids.isEmpty()) {
|
} else if (throwable != null || uuids.isEmpty()) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("errors.invalid_player"),
|
TranslatableCaption.of("errors.invalid_player"),
|
||||||
TagResolver.resolver("value", Tag.inserting(Component.text(args[0])))
|
Template.of("value", args[0])
|
||||||
);
|
);
|
||||||
} else {
|
} else {
|
||||||
for (UUID uuid : uuids) {
|
for (UUID uuid : uuids) {
|
||||||
@ -119,7 +117,7 @@ public class Deny extends SubCommand {
|
|||||||
.hasPermission(player, Permission.PERMISSION_ADMIN_COMMAND_DENY))) {
|
.hasPermission(player, Permission.PERMISSION_ADMIN_COMMAND_DENY))) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("errors.invalid_player"),
|
TranslatableCaption.of("errors.invalid_player"),
|
||||||
TagResolver.resolver("value", Tag.inserting(Component.text(args[0])))
|
Template.of("value", args[0])
|
||||||
);
|
);
|
||||||
} else if (plot.isOwner(uuid)) {
|
} else if (plot.isOwner(uuid)) {
|
||||||
player.sendMessage(TranslatableCaption.of("deny.cant_remove_owner"));
|
player.sendMessage(TranslatableCaption.of("deny.cant_remove_owner"));
|
||||||
@ -127,10 +125,7 @@ public class Deny extends SubCommand {
|
|||||||
} else if (plot.getDenied().contains(uuid)) {
|
} else if (plot.getDenied().contains(uuid)) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("member.already_added"),
|
TranslatableCaption.of("member.already_added"),
|
||||||
TagResolver.resolver(
|
Template.of("player", PlayerManager.resolveName(uuid).getComponent(player))
|
||||||
"player",
|
|
||||||
Tag.inserting(PlayerManager.resolveName(uuid).toComponent(player))
|
|
||||||
)
|
|
||||||
);
|
);
|
||||||
return;
|
return;
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
@ -34,9 +34,7 @@ import com.plotsquared.core.player.PlotPlayer;
|
|||||||
import com.plotsquared.core.plot.Plot;
|
import com.plotsquared.core.plot.Plot;
|
||||||
import com.plotsquared.core.plot.flag.implementations.DescriptionFlag;
|
import com.plotsquared.core.plot.flag.implementations.DescriptionFlag;
|
||||||
import com.plotsquared.core.util.EventDispatcher;
|
import com.plotsquared.core.util.EventDispatcher;
|
||||||
import net.kyori.adventure.text.Component;
|
import net.kyori.adventure.text.minimessage.Template;
|
||||||
import net.kyori.adventure.text.minimessage.tag.Tag;
|
|
||||||
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
|
|
||||||
import org.checkerframework.checker.nullness.qual.NonNull;
|
import org.checkerframework.checker.nullness.qual.NonNull;
|
||||||
|
|
||||||
@CommandDeclaration(command = "setdescription",
|
@CommandDeclaration(command = "setdescription",
|
||||||
@ -63,7 +61,7 @@ public class Desc extends SetCommand {
|
|||||||
if (event.getEventResult() == Result.DENY) {
|
if (event.getEventResult() == Result.DENY) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("events.event_denied"),
|
TranslatableCaption.of("events.event_denied"),
|
||||||
TagResolver.resolver("value", Tag.inserting(Component.text("Description removal")))
|
Template.of("value", "Description removal")
|
||||||
);
|
);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@ -78,7 +76,7 @@ public class Desc extends SetCommand {
|
|||||||
if (event.getEventResult() == Result.DENY) {
|
if (event.getEventResult() == Result.DENY) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("events.event_denied"),
|
TranslatableCaption.of("events.event_denied"),
|
||||||
TagResolver.resolver("value", Tag.inserting(Component.text("Description set")))
|
Template.of("value", "Description set")
|
||||||
);
|
);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -43,9 +43,7 @@ import com.plotsquared.core.plot.flag.implementations.DoneFlag;
|
|||||||
import com.plotsquared.core.util.EventDispatcher;
|
import com.plotsquared.core.util.EventDispatcher;
|
||||||
import com.plotsquared.core.util.Permissions;
|
import com.plotsquared.core.util.Permissions;
|
||||||
import com.plotsquared.core.util.task.RunnableVal;
|
import com.plotsquared.core.util.task.RunnableVal;
|
||||||
import net.kyori.adventure.text.Component;
|
import net.kyori.adventure.text.minimessage.Template;
|
||||||
import net.kyori.adventure.text.minimessage.tag.Tag;
|
|
||||||
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
|
|
||||||
import org.checkerframework.checker.nullness.qual.NonNull;
|
import org.checkerframework.checker.nullness.qual.NonNull;
|
||||||
|
|
||||||
@CommandDeclaration(command = "done",
|
@CommandDeclaration(command = "done",
|
||||||
@ -79,7 +77,7 @@ public class Done extends SubCommand {
|
|||||||
if (event.getEventResult() == Result.DENY) {
|
if (event.getEventResult() == Result.DENY) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("events.event_denied"),
|
TranslatableCaption.of("events.event_denied"),
|
||||||
TagResolver.resolver("value", Tag.inserting(Component.text("Done")))
|
Template.of("value", "Done")
|
||||||
);
|
);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
@ -100,7 +98,7 @@ public class Done extends SubCommand {
|
|||||||
plot.addRunning();
|
plot.addRunning();
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("web.generating_link"),
|
TranslatableCaption.of("web.generating_link"),
|
||||||
TagResolver.resolver("plot", Tag.inserting(Component.text(plot.getId().toString())))
|
Template.of("plot", plot.getId().toString())
|
||||||
);
|
);
|
||||||
final Settings.Auto_Clear doneRequirements = Settings.AUTO_CLEAR.get("done");
|
final Settings.Auto_Clear doneRequirements = Settings.AUTO_CLEAR.get("done");
|
||||||
if (ExpireManager.IMP == null || doneRequirements == null) {
|
if (ExpireManager.IMP == null || doneRequirements == null) {
|
||||||
@ -128,7 +126,7 @@ public class Done extends SubCommand {
|
|||||||
long flagValue = System.currentTimeMillis() / 1000;
|
long flagValue = System.currentTimeMillis() / 1000;
|
||||||
PlotFlag<?, ?> plotFlag = plot.getFlagContainer().getFlag(DoneFlag.class)
|
PlotFlag<?, ?> plotFlag = plot.getFlagContainer().getFlag(DoneFlag.class)
|
||||||
.createFlagInstance(Long.toString(flagValue));
|
.createFlagInstance(Long.toString(flagValue));
|
||||||
PlotFlagAddEvent event = eventDispatcher.callFlagAdd(plotFlag, plot);
|
PlotFlagAddEvent event = new PlotFlagAddEvent(plotFlag, plot);
|
||||||
if (event.getEventResult() == Result.DENY) {
|
if (event.getEventResult() == Result.DENY) {
|
||||||
player.sendMessage(TranslatableCaption.of("events.event_denied"));
|
player.sendMessage(TranslatableCaption.of("events.event_denied"));
|
||||||
return;
|
return;
|
||||||
|
|||||||
@ -41,9 +41,7 @@ import com.plotsquared.core.util.StringMan;
|
|||||||
import com.plotsquared.core.util.TabCompletions;
|
import com.plotsquared.core.util.TabCompletions;
|
||||||
import com.plotsquared.core.util.WorldUtil;
|
import com.plotsquared.core.util.WorldUtil;
|
||||||
import com.plotsquared.core.util.task.RunnableVal;
|
import com.plotsquared.core.util.task.RunnableVal;
|
||||||
import net.kyori.adventure.text.Component;
|
import net.kyori.adventure.text.minimessage.Template;
|
||||||
import net.kyori.adventure.text.minimessage.tag.Tag;
|
|
||||||
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
|
|
||||||
import org.checkerframework.checker.nullness.qual.NonNull;
|
import org.checkerframework.checker.nullness.qual.NonNull;
|
||||||
|
|
||||||
import java.net.URL;
|
import java.net.URL;
|
||||||
@ -123,10 +121,7 @@ public class Download extends SubCommand {
|
|||||||
if (!Permissions.hasPermission(player, Permission.PERMISSION_DOWNLOAD_WORLD)) {
|
if (!Permissions.hasPermission(player, Permission.PERMISSION_DOWNLOAD_WORLD)) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("permission.no_permission"),
|
TranslatableCaption.of("permission.no_permission"),
|
||||||
TagResolver.resolver(
|
Template.of("node", Permission.PERMISSION_DOWNLOAD_WORLD.toString())
|
||||||
"node",
|
|
||||||
Tag.inserting(Permission.PERMISSION_DOWNLOAD_WORLD)
|
|
||||||
)
|
|
||||||
);
|
);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@ -140,24 +135,18 @@ public class Download extends SubCommand {
|
|||||||
if (url == null) {
|
if (url == null) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("web.generating_link_failed"),
|
TranslatableCaption.of("web.generating_link_failed"),
|
||||||
TagResolver.resolver("plot", Tag.inserting(Component.text(plot.getId().toString())))
|
Template.of("plot", plot.getId().toString())
|
||||||
);
|
);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
player.sendMessage(
|
player.sendMessage(TranslatableCaption.of("web.generation_link_success_legacy_world"), Template.of("url", url.toString()));
|
||||||
TranslatableCaption.of("web.generation_link_success_legacy_world"),
|
|
||||||
TagResolver.resolver("url", Tag.inserting(Component.text(url.toString())))
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
sendUsage(player);
|
sendUsage(player);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
player.sendMessage(
|
player.sendMessage(TranslatableCaption.of("web.generating_link"), Template.of("plot", plot.getId().toString()));
|
||||||
TranslatableCaption.of("web.generating_link"),
|
|
||||||
TagResolver.resolver("plot", Tag.inserting(Component.text(plot.getId().toString())))
|
|
||||||
);
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -201,10 +190,8 @@ public class Download extends SubCommand {
|
|||||||
public void run(URL value) {
|
public void run(URL value) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("web.generation_link_success"),
|
TranslatableCaption.of("web.generation_link_success"),
|
||||||
TagResolver.builder()
|
Template.of("download", value.toString()),
|
||||||
.tag("download", Tag.preProcessParsed(value.toString()))
|
Template.of("delete", "Not available")
|
||||||
.tag("delete", Tag.preProcessParsed("Not available"))
|
|
||||||
.build()
|
|
||||||
);
|
);
|
||||||
player.sendMessage(StaticCaption.of(value.toString()));
|
player.sendMessage(StaticCaption.of(value.toString()));
|
||||||
}
|
}
|
||||||
@ -218,15 +205,13 @@ public class Download extends SubCommand {
|
|||||||
if (throwable != null || !result.isSuccess()) {
|
if (throwable != null || !result.isSuccess()) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("web.generating_link_failed"),
|
TranslatableCaption.of("web.generating_link_failed"),
|
||||||
TagResolver.resolver("plot", Tag.inserting(Component.text(plot.getId().toString())))
|
Template.of("plot", plot.getId().toString())
|
||||||
);
|
);
|
||||||
} else {
|
} else {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("web.generation_link_success"),
|
TranslatableCaption.of("web.generation_link_success"),
|
||||||
TagResolver.builder()
|
Template.of("download", result.getDownloadUrl()),
|
||||||
.tag("download", Tag.preProcessParsed(result.getDownloadUrl()))
|
Template.of("delete", result.getDeletionUrl())
|
||||||
.tag("delete", Tag.preProcessParsed(result.getDeletionUrl()))
|
|
||||||
.build()
|
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|||||||
@ -25,11 +25,11 @@
|
|||||||
*/
|
*/
|
||||||
package com.plotsquared.core.command;
|
package com.plotsquared.core.command;
|
||||||
|
|
||||||
import com.google.inject.Inject;
|
|
||||||
import com.plotsquared.core.PlotSquared;
|
import com.plotsquared.core.PlotSquared;
|
||||||
import com.plotsquared.core.configuration.Settings;
|
import com.plotsquared.core.configuration.Settings;
|
||||||
import com.plotsquared.core.configuration.caption.CaptionUtility;
|
import com.plotsquared.core.configuration.caption.CaptionUtility;
|
||||||
import com.plotsquared.core.configuration.caption.StaticCaption;
|
import com.plotsquared.core.configuration.caption.StaticCaption;
|
||||||
|
import com.plotsquared.core.configuration.caption.Templates;
|
||||||
import com.plotsquared.core.configuration.caption.TranslatableCaption;
|
import com.plotsquared.core.configuration.caption.TranslatableCaption;
|
||||||
import com.plotsquared.core.events.PlotFlagAddEvent;
|
import com.plotsquared.core.events.PlotFlagAddEvent;
|
||||||
import com.plotsquared.core.events.PlotFlagRemoveEvent;
|
import com.plotsquared.core.events.PlotFlagRemoveEvent;
|
||||||
@ -44,7 +44,6 @@ import com.plotsquared.core.plot.flag.InternalFlag;
|
|||||||
import com.plotsquared.core.plot.flag.PlotFlag;
|
import com.plotsquared.core.plot.flag.PlotFlag;
|
||||||
import com.plotsquared.core.plot.flag.types.IntegerFlag;
|
import com.plotsquared.core.plot.flag.types.IntegerFlag;
|
||||||
import com.plotsquared.core.plot.flag.types.ListFlag;
|
import com.plotsquared.core.plot.flag.types.ListFlag;
|
||||||
import com.plotsquared.core.util.EventDispatcher;
|
|
||||||
import com.plotsquared.core.util.MathMan;
|
import com.plotsquared.core.util.MathMan;
|
||||||
import com.plotsquared.core.util.Permissions;
|
import com.plotsquared.core.util.Permissions;
|
||||||
import com.plotsquared.core.util.StringComparison;
|
import com.plotsquared.core.util.StringComparison;
|
||||||
@ -54,9 +53,7 @@ import com.plotsquared.core.util.task.RunnableVal2;
|
|||||||
import com.plotsquared.core.util.task.RunnableVal3;
|
import com.plotsquared.core.util.task.RunnableVal3;
|
||||||
import net.kyori.adventure.text.Component;
|
import net.kyori.adventure.text.Component;
|
||||||
import net.kyori.adventure.text.TextComponent;
|
import net.kyori.adventure.text.TextComponent;
|
||||||
import net.kyori.adventure.text.format.Style;
|
import net.kyori.adventure.text.minimessage.Template;
|
||||||
import net.kyori.adventure.text.minimessage.tag.Tag;
|
|
||||||
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
|
|
||||||
import org.checkerframework.checker.nullness.qual.NonNull;
|
import org.checkerframework.checker.nullness.qual.NonNull;
|
||||||
import org.checkerframework.checker.nullness.qual.Nullable;
|
import org.checkerframework.checker.nullness.qual.Nullable;
|
||||||
|
|
||||||
@ -82,21 +79,14 @@ import java.util.stream.Stream;
|
|||||||
@SuppressWarnings("unused")
|
@SuppressWarnings("unused")
|
||||||
public final class FlagCommand extends Command {
|
public final class FlagCommand extends Command {
|
||||||
|
|
||||||
private final EventDispatcher eventDispatcher;
|
public FlagCommand() {
|
||||||
|
|
||||||
@Inject
|
|
||||||
public FlagCommand(final @NonNull EventDispatcher eventDispatcher) {
|
|
||||||
super(MainCommand.getInstance(), true);
|
super(MainCommand.getInstance(), true);
|
||||||
this.eventDispatcher = eventDispatcher;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private static boolean sendMessage(PlotPlayer<?> player) {
|
private static boolean sendMessage(PlotPlayer<?> player) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("commandconfig.command_syntax"),
|
TranslatableCaption.of("commandconfig.command_syntax"),
|
||||||
TagResolver.resolver(
|
Template.of("value", "/plot flag <set | remove | add | list | info> <flag> <value>")
|
||||||
"value",
|
|
||||||
Tag.inserting(Component.text("/plot flag <set | remove | add | list | info> <flag> <value>"))
|
|
||||||
)
|
|
||||||
);
|
);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
@ -122,9 +112,9 @@ public final class FlagCommand extends Command {
|
|||||||
if (!result) {
|
if (!result) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("permission.no_permission"),
|
TranslatableCaption.of("permission.no_permission"),
|
||||||
TagResolver.resolver(
|
Template.of(
|
||||||
"node",
|
"node",
|
||||||
Tag.inserting(Component.text(perm + "." + numeric))
|
perm + "." + numeric
|
||||||
)
|
)
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
@ -141,21 +131,16 @@ public final class FlagCommand extends Command {
|
|||||||
);
|
);
|
||||||
final boolean result = Permissions.hasPermission(player, permission);
|
final boolean result = Permissions.hasPermission(player, permission);
|
||||||
if (!result) {
|
if (!result) {
|
||||||
player.sendMessage(
|
player.sendMessage(TranslatableCaption.of("permission.no_permission"), Template.of("node", permission));
|
||||||
TranslatableCaption.of("permission.no_permission"),
|
|
||||||
TagResolver.resolver("node", Tag.inserting(Component.text(permission)))
|
|
||||||
);
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} catch (final FlagParseException e) {
|
} catch (final FlagParseException e) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("flag.flag_parse_error"),
|
TranslatableCaption.of("flag.flag_parse_error"),
|
||||||
TagResolver.builder()
|
Template.of("flag_name", flag.getName()),
|
||||||
.tag("flag_name", Tag.inserting(Component.text(flag.getName())))
|
Template.of("flag_value", e.getValue()),
|
||||||
.tag("flag_value", Tag.inserting(Component.text(e.getValue())))
|
Template.of("error", e.getErrorMessage().getComponent(player))
|
||||||
.tag("error", Tag.inserting(e.getErrorMessage().toComponent(player)))
|
|
||||||
.build()
|
|
||||||
);
|
);
|
||||||
return false;
|
return false;
|
||||||
} catch (final Exception e) {
|
} catch (final Exception e) {
|
||||||
@ -172,10 +157,7 @@ public final class FlagCommand extends Command {
|
|||||||
perm = basePerm;
|
perm = basePerm;
|
||||||
}
|
}
|
||||||
if (!result) {
|
if (!result) {
|
||||||
player.sendMessage(
|
player.sendMessage(TranslatableCaption.of("permission.no_permission"), Template.of("node", perm));
|
||||||
TranslatableCaption.of("permission.no_permission"),
|
|
||||||
TagResolver.resolver("node", Tag.inserting(Component.text(perm)))
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
@ -183,7 +165,7 @@ public final class FlagCommand extends Command {
|
|||||||
/**
|
/**
|
||||||
* Checks if the player is allowed to modify the flags at their current location
|
* Checks if the player is allowed to modify the flags at their current location
|
||||||
*
|
*
|
||||||
* @return {@code true} if the player is allowed to modify the flags at their current location
|
* @return true if the player is allowed to modify the flags at their current location
|
||||||
*/
|
*/
|
||||||
private static boolean checkRequirements(final @NonNull PlotPlayer<?> player) {
|
private static boolean checkRequirements(final @NonNull PlotPlayer<?> player) {
|
||||||
final Location location = player.getLocation();
|
final Location location = player.getLocation();
|
||||||
@ -200,7 +182,7 @@ public final class FlagCommand extends Command {
|
|||||||
.hasPermission(player, Permission.PERMISSION_SET_FLAG_OTHER)) {
|
.hasPermission(player, Permission.PERMISSION_SET_FLAG_OTHER)) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("permission.no_permission"),
|
TranslatableCaption.of("permission.no_permission"),
|
||||||
TagResolver.resolver("node", Tag.inserting(Permission.PERMISSION_SET_FLAG_OTHER))
|
Template.of("node", String.valueOf(Permission.PERMISSION_SET_FLAG_OTHER))
|
||||||
);
|
);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@ -235,7 +217,7 @@ public final class FlagCommand extends Command {
|
|||||||
if (best != null) {
|
if (best != null) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("flag.not_valid_flag_suggested"),
|
TranslatableCaption.of("flag.not_valid_flag_suggested"),
|
||||||
TagResolver.resolver("value", Tag.inserting(Component.text(best)))
|
Template.of("value", best)
|
||||||
);
|
);
|
||||||
suggested = true;
|
suggested = true;
|
||||||
}
|
}
|
||||||
@ -344,7 +326,7 @@ public final class FlagCommand extends Command {
|
|||||||
if (args.length < 2) {
|
if (args.length < 2) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("commandconfig.command_syntax"),
|
TranslatableCaption.of("commandconfig.command_syntax"),
|
||||||
TagResolver.resolver("value", Tag.inserting(Component.text("/plot flag set <flag> <value>")))
|
Template.of("value", "/plot flag set <flag> <value>")
|
||||||
);
|
);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@ -353,11 +335,11 @@ public final class FlagCommand extends Command {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
Plot plot = player.getLocation().getPlotAbs();
|
Plot plot = player.getLocation().getPlotAbs();
|
||||||
PlotFlagAddEvent event = eventDispatcher.callFlagAdd(plotFlag, plot);
|
PlotFlagAddEvent event = new PlotFlagAddEvent(plotFlag, plot);
|
||||||
if (event.getEventResult() == Result.DENY) {
|
if (event.getEventResult() == Result.DENY) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("events.event_denied"),
|
TranslatableCaption.of("events.event_denied"),
|
||||||
TagResolver.resolver("value", Tag.inserting(Component.text("Flag set")))
|
Template.of("value", "Flag set")
|
||||||
);
|
);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@ -373,21 +355,15 @@ public final class FlagCommand extends Command {
|
|||||||
} catch (final FlagParseException e) {
|
} catch (final FlagParseException e) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("flag.flag_parse_error"),
|
TranslatableCaption.of("flag.flag_parse_error"),
|
||||||
TagResolver.builder()
|
Template.of("flag_name", plotFlag.getName()),
|
||||||
.tag("flag_name", Tag.inserting(Component.text(plotFlag.getName())))
|
Template.of("flag_value", e.getValue()),
|
||||||
.tag("flag_value", Tag.inserting(Component.text(e.getValue())))
|
Template.of("error", e.getErrorMessage().getComponent(player))
|
||||||
.tag("error", Tag.inserting(e.getErrorMessage().toComponent(player)))
|
|
||||||
.build()
|
|
||||||
);
|
);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
plot.setFlag(parsed);
|
plot.setFlag(parsed);
|
||||||
player.sendMessage(
|
player.sendMessage(TranslatableCaption.of("flag.flag_added"), Template.of("flag", String.valueOf(args[0])),
|
||||||
TranslatableCaption.of("flag.flag_added"),
|
Template.of("value", String.valueOf(parsed))
|
||||||
TagResolver.builder()
|
|
||||||
.tag("flag", Tag.inserting(Component.text(args[0])))
|
|
||||||
.tag("value", Tag.inserting(Component.text(parsed.toString())))
|
|
||||||
.build()
|
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -409,7 +385,7 @@ public final class FlagCommand extends Command {
|
|||||||
if (args.length < 2) {
|
if (args.length < 2) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("commandconfig.command_syntax"),
|
TranslatableCaption.of("commandconfig.command_syntax"),
|
||||||
TagResolver.resolver("value", Tag.inserting(Component.text("/plot flag add <flag> <values>")))
|
Template.of("value", "/plot flag add <flag> <values>")
|
||||||
);
|
);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@ -418,11 +394,11 @@ public final class FlagCommand extends Command {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
Plot plot = player.getLocation().getPlotAbs();
|
Plot plot = player.getLocation().getPlotAbs();
|
||||||
PlotFlagAddEvent event = eventDispatcher.callFlagAdd(plotFlag, plot);
|
PlotFlagAddEvent event = new PlotFlagAddEvent(plotFlag, plot);
|
||||||
if (event.getEventResult() == Result.DENY) {
|
if (event.getEventResult() == Result.DENY) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("events.event_denied"),
|
TranslatableCaption.of("events.event_denied"),
|
||||||
TagResolver.resolver("value", Tag.inserting(Component.text("Flag add")))
|
Template.of("value", "Flag add")
|
||||||
);
|
);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@ -443,11 +419,9 @@ public final class FlagCommand extends Command {
|
|||||||
} catch (FlagParseException e) {
|
} catch (FlagParseException e) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("flag.flag_parse_error"),
|
TranslatableCaption.of("flag.flag_parse_error"),
|
||||||
TagResolver.builder()
|
Template.of("flag_name", plotFlag.getName()),
|
||||||
.tag("flag_name", Tag.inserting(Component.text(plotFlag.getName())))
|
Template.of("flag_value", e.getValue()),
|
||||||
.tag("flag_value", Tag.inserting(Component.text(e.getValue())))
|
Template.of("error", e.getErrorMessage().getComponent(player))
|
||||||
.tag("error", Tag.inserting(e.getErrorMessage().toComponent(player)))
|
|
||||||
.build()
|
|
||||||
);
|
);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@ -457,12 +431,8 @@ public final class FlagCommand extends Command {
|
|||||||
player.sendMessage(TranslatableCaption.of("flag.flag_not_added"));
|
player.sendMessage(TranslatableCaption.of("flag.flag_not_added"));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
player.sendMessage(
|
player.sendMessage(TranslatableCaption.of("flag.flag_added"), Template.of("flag", String.valueOf(args[0])),
|
||||||
TranslatableCaption.of("flag.flag_added"),
|
Template.of("value", String.valueOf(parsed))
|
||||||
TagResolver.builder()
|
|
||||||
.tag("flag", Tag.inserting(Component.text(args[0])))
|
|
||||||
.tag("value", Tag.inserting(Component.text(parsed.toString())))
|
|
||||||
.build()
|
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -484,7 +454,7 @@ public final class FlagCommand extends Command {
|
|||||||
if (args.length != 1 && args.length != 2) {
|
if (args.length != 1 && args.length != 2) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("commandconfig.command_syntax"),
|
TranslatableCaption.of("commandconfig.command_syntax"),
|
||||||
TagResolver.resolver("value", Tag.inserting(Component.text("/plot flag remove <flag> [values]")))
|
Template.of("value", "/plot flag remove <flag> [values]")
|
||||||
);
|
);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@ -493,11 +463,11 @@ public final class FlagCommand extends Command {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
final Plot plot = player.getLocation().getPlotAbs();
|
final Plot plot = player.getLocation().getPlotAbs();
|
||||||
PlotFlagRemoveEvent event = eventDispatcher.callFlagRemove(flag, plot);
|
PlotFlagRemoveEvent event = new PlotFlagRemoveEvent(flag, plot);
|
||||||
if (event.getEventResult() == Result.DENY) {
|
if (event.getEventResult() == Result.DENY) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("events.event_denied"),
|
TranslatableCaption.of("events.event_denied"),
|
||||||
TagResolver.resolver("value", Tag.inserting(Component.text("Flag remove")))
|
Template.of("value", "Flag remove")
|
||||||
);
|
);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@ -507,10 +477,7 @@ public final class FlagCommand extends Command {
|
|||||||
if (args.length != 2) {
|
if (args.length != 2) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("permission.no_permission"),
|
TranslatableCaption.of("permission.no_permission"),
|
||||||
TagResolver.resolver(
|
Template.of("node", Permission.PERMISSION_SET_FLAG_KEY.format(args[0].toLowerCase()))
|
||||||
"node",
|
|
||||||
Tag.inserting(Component.text(Permission.PERMISSION_SET_FLAG_KEY.format(args[0].toLowerCase())))
|
|
||||||
)
|
|
||||||
);
|
);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@ -525,11 +492,9 @@ public final class FlagCommand extends Command {
|
|||||||
} catch (final FlagParseException e) {
|
} catch (final FlagParseException e) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("flag.flag_parse_error"),
|
TranslatableCaption.of("flag.flag_parse_error"),
|
||||||
TagResolver.builder()
|
Template.of("flag_name", flag.getName()),
|
||||||
.tag("flag_name", Tag.inserting(Component.text(flag.getName())))
|
Template.of("flag_value", e.getValue()),
|
||||||
.tag("flag_value", Tag.inserting(Component.text(e.getValue())))
|
Template.of("error", String.valueOf(e.getErrorMessage()))
|
||||||
.tag("error", Tag.inserting(e.getErrorMessage().toComponent(player)))
|
|
||||||
.build()
|
|
||||||
);
|
);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@ -540,13 +505,10 @@ public final class FlagCommand extends Command {
|
|||||||
if (list.removeAll((List) parsedFlag.getValue())) {
|
if (list.removeAll((List) parsedFlag.getValue())) {
|
||||||
if (list.isEmpty()) {
|
if (list.isEmpty()) {
|
||||||
if (plot.removeFlag(flag)) {
|
if (plot.removeFlag(flag)) {
|
||||||
player.sendMessage(
|
player.sendMessage(TranslatableCaption.of("flag.flag_removed"), Template.of("flag", args[0]), Template.of(
|
||||||
TranslatableCaption.of("flag.flag_removed"),
|
"value",
|
||||||
TagResolver.builder()
|
String.valueOf(flag)
|
||||||
.tag("flag", Tag.inserting(Component.text(args[0])))
|
));
|
||||||
.tag("value", Tag.inserting(Component.text(flag.toString())))
|
|
||||||
.build()
|
|
||||||
);
|
|
||||||
return;
|
return;
|
||||||
} else {
|
} else {
|
||||||
player.sendMessage(TranslatableCaption.of("flag.flag_not_removed"));
|
player.sendMessage(TranslatableCaption.of("flag.flag_not_removed"));
|
||||||
@ -554,14 +516,11 @@ public final class FlagCommand extends Command {
|
|||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
PlotFlag<?, ?> plotFlag = parsedFlag.createFlagInstance(list);
|
PlotFlag<?, ?> plotFlag = parsedFlag.createFlagInstance(list);
|
||||||
PlotFlagAddEvent addEvent = eventDispatcher.callFlagAdd(plotFlag, plot);
|
PlotFlagAddEvent addEvent = new PlotFlagAddEvent(plotFlag, plot);
|
||||||
if (addEvent.getEventResult() == Result.DENY) {
|
if (addEvent.getEventResult() == Result.DENY) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("events.event_denied"),
|
TranslatableCaption.of("events.event_denied"),
|
||||||
TagResolver.resolver(
|
Template.of("value", "Re-addition of " + plotFlag.getName())
|
||||||
"value",
|
|
||||||
Tag.inserting(Component.text("Re-addition of " + plotFlag.getName()))
|
|
||||||
)
|
|
||||||
);
|
);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@ -584,13 +543,10 @@ public final class FlagCommand extends Command {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
player.sendMessage(
|
player.sendMessage(TranslatableCaption.of("flag.flag_removed"), Template.of("flag", args[0]), Template.of(
|
||||||
TranslatableCaption.of("flag.flag_removed"),
|
"value",
|
||||||
TagResolver.builder()
|
String.valueOf(flag)
|
||||||
.tag("flag", Tag.inserting(Component.text(args[0])))
|
));
|
||||||
.tag("value", Tag.inserting(Component.text(flag.toString())))
|
|
||||||
.build()
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@CommandDeclaration(command = "list",
|
@CommandDeclaration(command = "list",
|
||||||
@ -608,35 +564,34 @@ public final class FlagCommand extends Command {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
final Map<Component, ArrayList<String>> flags = new HashMap<>();
|
final Map<String, ArrayList<String>> flags = new HashMap<>();
|
||||||
for (PlotFlag<?, ?> plotFlag : GlobalFlagContainer.getInstance().getRecognizedPlotFlags()) {
|
for (PlotFlag<?, ?> plotFlag : GlobalFlagContainer.getInstance().getRecognizedPlotFlags()) {
|
||||||
if (plotFlag instanceof InternalFlag) {
|
if (plotFlag instanceof InternalFlag) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
final Component category = plotFlag.getFlagCategory().toComponent(player);
|
final String category = MINI_MESSAGE.stripTokens(plotFlag.getFlagCategory().getComponent(player));
|
||||||
final Collection<String> flagList = flags.computeIfAbsent(category, k -> new ArrayList<>());
|
final Collection<String> flagList =
|
||||||
|
flags.computeIfAbsent(category, k -> new ArrayList<>());
|
||||||
flagList.add(plotFlag.getName());
|
flagList.add(plotFlag.getName());
|
||||||
}
|
}
|
||||||
|
|
||||||
for (final Map.Entry<Component, ArrayList<String>> entry : flags.entrySet()) {
|
for (final Map.Entry<String, ArrayList<String>> entry : flags.entrySet()) {
|
||||||
Collections.sort(entry.getValue());
|
Collections.sort(entry.getValue());
|
||||||
Component category =
|
Component category =
|
||||||
MINI_MESSAGE.deserialize(
|
MINI_MESSAGE.parse(
|
||||||
TranslatableCaption.of("flag.flag_list_categories").getComponent(player),
|
TranslatableCaption.of("flag.flag_list_categories").getComponent(player),
|
||||||
TagResolver.resolver("category", Tag.inserting(entry.getKey().style(Style.empty())))
|
Template.of("category", entry.getKey())
|
||||||
);
|
);
|
||||||
TextComponent.Builder builder = Component.text().append(category);
|
TextComponent.Builder builder = Component.text().append(category);
|
||||||
final Iterator<String> flagIterator = entry.getValue().iterator();
|
final Iterator<String> flagIterator = entry.getValue().iterator();
|
||||||
while (flagIterator.hasNext()) {
|
while (flagIterator.hasNext()) {
|
||||||
final String flag = flagIterator.next();
|
final String flag = flagIterator.next();
|
||||||
builder.append(MINI_MESSAGE
|
builder.append(MINI_MESSAGE
|
||||||
.deserialize(
|
.parse(
|
||||||
TranslatableCaption.of("flag.flag_list_flag").getComponent(player),
|
TranslatableCaption.of("flag.flag_list_flag").getComponent(player),
|
||||||
TagResolver.builder()
|
Template.of("command", "/plot flag info " + flag),
|
||||||
.tag("command", Tag.preProcessParsed("/plot flag info " + flag))
|
Template.of("flag", flag),
|
||||||
.tag("flag", Tag.inserting(Component.text(flag)))
|
Template.of("suffix", flagIterator.hasNext() ? ", " : "")
|
||||||
.tag("suffix", Tag.inserting(Component.text(flagIterator.hasNext() ? ", " : "")))
|
|
||||||
.build()
|
|
||||||
));
|
));
|
||||||
}
|
}
|
||||||
player.sendMessage(StaticCaption.of(MINI_MESSAGE.serialize(builder.build())));
|
player.sendMessage(StaticCaption.of(MINI_MESSAGE.serialize(builder.build())));
|
||||||
@ -660,7 +615,7 @@ public final class FlagCommand extends Command {
|
|||||||
if (args.length < 1) {
|
if (args.length < 1) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("commandconfig.command_syntax"),
|
TranslatableCaption.of("commandconfig.command_syntax"),
|
||||||
TagResolver.resolver("value", Tag.inserting(Component.text("/plot flag info <flag>")))
|
Template.of("value", "/plot flag info <flag>")
|
||||||
);
|
);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@ -668,17 +623,11 @@ public final class FlagCommand extends Command {
|
|||||||
if (plotFlag != null) {
|
if (plotFlag != null) {
|
||||||
player.sendMessage(TranslatableCaption.of("flag.flag_info_header"));
|
player.sendMessage(TranslatableCaption.of("flag.flag_info_header"));
|
||||||
// Flag name
|
// Flag name
|
||||||
player.sendMessage(
|
player.sendMessage(TranslatableCaption.of("flag.flag_info_name"), Template.of("flag", plotFlag.getName()));
|
||||||
TranslatableCaption.of("flag.flag_info_name"),
|
|
||||||
TagResolver.resolver("flag", Tag.inserting(Component.text(plotFlag.getName())))
|
|
||||||
);
|
|
||||||
// Flag category
|
// Flag category
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("flag.flag_info_category"),
|
TranslatableCaption.of("flag.flag_info_category"),
|
||||||
TagResolver.resolver(
|
Templates.of(player, "value", plotFlag.getFlagCategory())
|
||||||
"value",
|
|
||||||
Tag.inserting(plotFlag.getFlagCategory().toComponent(player))
|
|
||||||
)
|
|
||||||
);
|
);
|
||||||
// Flag description
|
// Flag description
|
||||||
// TODO maybe merge and \n instead?
|
// TODO maybe merge and \n instead?
|
||||||
@ -687,18 +636,16 @@ public final class FlagCommand extends Command {
|
|||||||
// Flag example
|
// Flag example
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("flag.flag_info_example"),
|
TranslatableCaption.of("flag.flag_info_example"),
|
||||||
TagResolver.builder()
|
Template.of("command", "/plot flag set"),
|
||||||
.tag("command", Tag.preProcessParsed("/plot flag set"))
|
Template.of("flag", plotFlag.getName()),
|
||||||
.tag("flag", Tag.preProcessParsed(plotFlag.getName()))
|
Template.of("value", plotFlag.getExample())
|
||||||
.tag("value", Tag.preProcessParsed(plotFlag.getExample()))
|
|
||||||
.build()
|
|
||||||
);
|
);
|
||||||
// Default value
|
// Default value
|
||||||
final String defaultValue = player.getLocation().getPlotArea().getFlagContainer()
|
final String defaultValue = player.getLocation().getPlotArea().getFlagContainer()
|
||||||
.getFlagErased(plotFlag.getClass()).toString();
|
.getFlagErased(plotFlag.getClass()).toString();
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("flag.flag_info_default_value"),
|
TranslatableCaption.of("flag.flag_info_default_value"),
|
||||||
TagResolver.resolver("value", Tag.inserting(Component.text(defaultValue)))
|
Template.of("value", defaultValue)
|
||||||
);
|
);
|
||||||
// Footer. Done this way to prevent the duplicate-message-thingy from catching it
|
// Footer. Done this way to prevent the duplicate-message-thingy from catching it
|
||||||
player.sendMessage(TranslatableCaption.of("flag.flag_info_footer"));
|
player.sendMessage(TranslatableCaption.of("flag.flag_info_footer"));
|
||||||
|
|||||||
@ -40,9 +40,7 @@ import com.plotsquared.core.util.task.RunnableVal;
|
|||||||
import com.plotsquared.core.util.task.RunnableVal2;
|
import com.plotsquared.core.util.task.RunnableVal2;
|
||||||
import com.plotsquared.core.util.task.RunnableVal3;
|
import com.plotsquared.core.util.task.RunnableVal3;
|
||||||
import com.plotsquared.core.uuid.UUIDMapping;
|
import com.plotsquared.core.uuid.UUIDMapping;
|
||||||
import net.kyori.adventure.text.Component;
|
import net.kyori.adventure.text.minimessage.Template;
|
||||||
import net.kyori.adventure.text.minimessage.tag.Tag;
|
|
||||||
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
|
|
||||||
|
|
||||||
import java.util.Collection;
|
import java.util.Collection;
|
||||||
import java.util.Collections;
|
import java.util.Collections;
|
||||||
@ -73,7 +71,7 @@ public class Grant extends Command {
|
|||||||
checkTrue(
|
checkTrue(
|
||||||
args.length >= 1 && args.length <= 2,
|
args.length >= 1 && args.length <= 2,
|
||||||
TranslatableCaption.of("commandconfig.command_syntax"),
|
TranslatableCaption.of("commandconfig.command_syntax"),
|
||||||
TagResolver.resolver("value", Tag.inserting(Component.text("/plot grant <check | add> [player]")))
|
Template.of("value", "/plot grant <check | add> [player]")
|
||||||
);
|
);
|
||||||
final String arg0 = args[0].toLowerCase();
|
final String arg0 = args[0].toLowerCase();
|
||||||
switch (arg0) {
|
switch (arg0) {
|
||||||
@ -81,7 +79,7 @@ public class Grant extends Command {
|
|||||||
if (!Permissions.hasPermission(player, Permission.PERMISSION_GRANT.format(arg0))) {
|
if (!Permissions.hasPermission(player, Permission.PERMISSION_GRANT.format(arg0))) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("permission.no_permission"),
|
TranslatableCaption.of("permission.no_permission"),
|
||||||
TagResolver.resolver("node", Tag.inserting(Component.text(Permission.PERMISSION_GRANT.format(arg0))))
|
Template.of("node", Permission.PERMISSION_GRANT.format(arg0))
|
||||||
);
|
);
|
||||||
return CompletableFuture.completedFuture(false);
|
return CompletableFuture.completedFuture(false);
|
||||||
}
|
}
|
||||||
@ -94,7 +92,7 @@ public class Grant extends Command {
|
|||||||
} else if (throwable != null || uuids.size() != 1) {
|
} else if (throwable != null || uuids.size() != 1) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("errors.invalid_player"),
|
TranslatableCaption.of("errors.invalid_player"),
|
||||||
TagResolver.resolver("value", Tag.inserting(Component.text(String.valueOf(uuids))))
|
Template.of("value", String.valueOf(uuids))
|
||||||
);
|
);
|
||||||
} else {
|
} else {
|
||||||
final UUIDMapping uuid = uuids.toArray(new UUIDMapping[0])[0];
|
final UUIDMapping uuid = uuids.toArray(new UUIDMapping[0])[0];
|
||||||
@ -105,7 +103,7 @@ public class Grant extends Command {
|
|||||||
if (args[0].equalsIgnoreCase("check")) {
|
if (args[0].equalsIgnoreCase("check")) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("grants.granted_plots"),
|
TranslatableCaption.of("grants.granted_plots"),
|
||||||
TagResolver.resolver("amount", Tag.inserting(Component.text(access.get().orElse(0))))
|
Template.of("amount", String.valueOf(access.get().orElse(0)))
|
||||||
);
|
);
|
||||||
} else {
|
} else {
|
||||||
access.set(access.get().orElse(0) + 1);
|
access.set(access.get().orElse(0) + 1);
|
||||||
@ -125,7 +123,7 @@ public class Grant extends Command {
|
|||||||
}
|
}
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("grants.granted_plots"),
|
TranslatableCaption.of("grants.granted_plots"),
|
||||||
TagResolver.resolver("amount", Tag.inserting(Component.text(granted)))
|
Template.of("amount", String.valueOf(granted))
|
||||||
);
|
);
|
||||||
} else { // add
|
} else { // add
|
||||||
int amount;
|
int amount;
|
||||||
@ -140,7 +138,7 @@ public class Grant extends Command {
|
|||||||
DBFunc.addPersistentMeta(uuid.getUuid(), key, rawData, replace);
|
DBFunc.addPersistentMeta(uuid.getUuid(), key, rawData, replace);
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("grants.added"),
|
TranslatableCaption.of("grants.added"),
|
||||||
TagResolver.resolver("grants", Tag.inserting(Component.text(amount)))
|
Template.of("grants", String.valueOf(amount))
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -35,14 +35,13 @@ import com.plotsquared.core.util.task.RunnableVal2;
|
|||||||
import com.plotsquared.core.util.task.RunnableVal3;
|
import com.plotsquared.core.util.task.RunnableVal3;
|
||||||
import net.kyori.adventure.text.Component;
|
import net.kyori.adventure.text.Component;
|
||||||
import net.kyori.adventure.text.TextComponent;
|
import net.kyori.adventure.text.TextComponent;
|
||||||
import net.kyori.adventure.text.minimessage.tag.Tag;
|
import net.kyori.adventure.text.minimessage.Template;
|
||||||
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
|
|
||||||
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.Collection;
|
import java.util.Collection;
|
||||||
import java.util.List;
|
|
||||||
import java.util.Locale;
|
import java.util.Locale;
|
||||||
import java.util.concurrent.CompletableFuture;
|
import java.util.concurrent.CompletableFuture;
|
||||||
|
import java.util.stream.Collectors;
|
||||||
|
import java.util.stream.Stream;
|
||||||
|
|
||||||
@CommandDeclaration(command = "help",
|
@CommandDeclaration(command = "help",
|
||||||
aliases = "?",
|
aliases = "?",
|
||||||
@ -118,31 +117,24 @@ public class Help extends Command {
|
|||||||
}
|
}
|
||||||
if (cat == null && page == 0) {
|
if (cat == null && page == 0) {
|
||||||
TextComponent.Builder builder = Component.text();
|
TextComponent.Builder builder = Component.text();
|
||||||
builder.append(MINI_MESSAGE.deserialize(TranslatableCaption.of("help.help_header").getComponent(player)));
|
builder.append(MINI_MESSAGE.parse(TranslatableCaption.of("help.help_header").getComponent(player)));
|
||||||
for (CommandCategory c : CommandCategory.values()) {
|
for (CommandCategory c : CommandCategory.values()) {
|
||||||
if (!c.canAccess(player)) {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
builder.append(Component.newline()).append(MINI_MESSAGE
|
builder.append(Component.newline()).append(MINI_MESSAGE
|
||||||
.deserialize(
|
.parse(
|
||||||
TranslatableCaption.of("help.help_info_item").getComponent(player),
|
TranslatableCaption.of("help.help_info_item").getComponent(player),
|
||||||
TagResolver.builder()
|
Template.of("command", "/plot help"),
|
||||||
.tag("command", Tag.inserting(Component.text("/plot help")))
|
Template.of("category", c.name().toLowerCase()),
|
||||||
.tag("category", Tag.inserting(Component.text(c.name().toLowerCase())))
|
Template.of("category_desc", c.getComponent(player))
|
||||||
.tag("category_desc", Tag.inserting(c.toComponent(player)))
|
|
||||||
.build()
|
|
||||||
));
|
));
|
||||||
}
|
}
|
||||||
builder.append(Component.newline()).append(MINI_MESSAGE
|
builder.append(Component.newline()).append(MINI_MESSAGE
|
||||||
.deserialize(
|
.parse(
|
||||||
TranslatableCaption.of("help.help_info_item").getComponent(player),
|
TranslatableCaption.of("help.help_info_item").getComponent(player),
|
||||||
TagResolver.builder()
|
Template.of("command", "/plot help"),
|
||||||
.tag("command", Tag.inserting(Component.text("/plot help")))
|
Template.of("category", "all"),
|
||||||
.tag("category", Tag.inserting(Component.text("all")))
|
Template.of("category_desc", "Display all commands")
|
||||||
.tag("category_desc", Tag.inserting(Component.text("Display all commands")))
|
|
||||||
.build()
|
|
||||||
));
|
));
|
||||||
builder.append(Component.newline()).append(MINI_MESSAGE.deserialize(TranslatableCaption
|
builder.append(Component.newline()).append(MINI_MESSAGE.parse(TranslatableCaption
|
||||||
.of("help.help_footer")
|
.of("help.help_footer")
|
||||||
.getComponent(player)));
|
.getComponent(player)));
|
||||||
player.sendMessage(StaticCaption.of(MINI_MESSAGE.serialize(builder.asComponent())));
|
player.sendMessage(StaticCaption.of(MINI_MESSAGE.serialize(builder.asComponent())));
|
||||||
@ -160,26 +152,12 @@ public class Help extends Command {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Collection<Command> tab(PlotPlayer<?> player, String[] args, boolean space) {
|
public Collection<Command> tab(PlotPlayer<?> player, String[] args, boolean space) {
|
||||||
final String argument = args[0].toLowerCase(Locale.ENGLISH);
|
return Stream.of("claiming", "teleport", "settings", "chat", "schematic", "appearance", "info", "debug",
|
||||||
List<Command> result = new ArrayList<>();
|
"administration", "all"
|
||||||
|
)
|
||||||
for (final CommandCategory category : CommandCategory.values()) {
|
.filter(value -> value.startsWith(args[0].toLowerCase(Locale.ENGLISH)))
|
||||||
if (!category.canAccess(player)) {
|
.map(value -> new Command(null, false, value, "", RequiredType.NONE, null) {
|
||||||
continue;
|
}).collect(Collectors.toList());
|
||||||
}
|
|
||||||
String name = category.name().toLowerCase();
|
|
||||||
if (!name.startsWith(argument)) {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
result.add(new Command(null, false, name, "", RequiredType.NONE, null) {
|
|
||||||
});
|
|
||||||
}
|
|
||||||
// add the category "all"
|
|
||||||
if ("all".startsWith(argument)) {
|
|
||||||
result.add(new Command(null, false, "all", "", RequiredType.NONE, null) {
|
|
||||||
});
|
|
||||||
}
|
|
||||||
return result;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -42,9 +42,7 @@ import com.plotsquared.core.util.query.PlotQuery;
|
|||||||
import com.plotsquared.core.util.query.SortingStrategy;
|
import com.plotsquared.core.util.query.SortingStrategy;
|
||||||
import com.plotsquared.core.util.task.RunnableVal2;
|
import com.plotsquared.core.util.task.RunnableVal2;
|
||||||
import com.plotsquared.core.util.task.RunnableVal3;
|
import com.plotsquared.core.util.task.RunnableVal3;
|
||||||
import net.kyori.adventure.text.Component;
|
import net.kyori.adventure.text.minimessage.Template;
|
||||||
import net.kyori.adventure.text.minimessage.tag.Tag;
|
|
||||||
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
|
|
||||||
import org.checkerframework.checker.nullness.qual.NonNull;
|
import org.checkerframework.checker.nullness.qual.NonNull;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
@ -81,10 +79,8 @@ public class HomeCommand extends Command {
|
|||||||
} else if (plots.size() < page || page < 1) {
|
} else if (plots.size() < page || page < 1) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("invalid.number_not_in_range"),
|
TranslatableCaption.of("invalid.number_not_in_range"),
|
||||||
TagResolver.builder()
|
Template.of("min", "1"),
|
||||||
.tag("min", Tag.inserting(Component.text(1)))
|
Template.of("max", String.valueOf(plots.size()))
|
||||||
.tag("max", Tag.inserting(Component.text(plots.size())))
|
|
||||||
.build()
|
|
||||||
);
|
);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@ -119,7 +115,7 @@ public class HomeCommand extends Command {
|
|||||||
.hasPermission(player, Permission.PERMISSION_HOME)) {
|
.hasPermission(player, Permission.PERMISSION_HOME)) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("permission.no_permission"),
|
TranslatableCaption.of("permission.no_permission"),
|
||||||
TagResolver.resolver("node", Tag.inserting(Component.text(Permission.PERMISSION_VISIT_OWNED.toString())))
|
Template.of("node", Permission.PERMISSION_VISIT_OWNED.toString())
|
||||||
);
|
);
|
||||||
return CompletableFuture.completedFuture(false);
|
return CompletableFuture.completedFuture(false);
|
||||||
}
|
}
|
||||||
@ -141,7 +137,7 @@ public class HomeCommand extends Command {
|
|||||||
} catch (NumberFormatException ignored) {
|
} catch (NumberFormatException ignored) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("invalid.not_a_number"),
|
TranslatableCaption.of("invalid.not_a_number"),
|
||||||
TagResolver.resolver("value", Tag.inserting(Component.text(identifier)))
|
Template.of("value", identifier)
|
||||||
);
|
);
|
||||||
return CompletableFuture.completedFuture(false);
|
return CompletableFuture.completedFuture(false);
|
||||||
}
|
}
|
||||||
@ -182,7 +178,7 @@ public class HomeCommand extends Command {
|
|||||||
} catch (NumberFormatException ignored) {
|
} catch (NumberFormatException ignored) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("invalid.not_a_number"),
|
TranslatableCaption.of("invalid.not_a_number"),
|
||||||
TagResolver.resolver("value", Tag.inserting(Component.text(identifier)))
|
Template.of("value", identifier)
|
||||||
);
|
);
|
||||||
return CompletableFuture.completedFuture(false);
|
return CompletableFuture.completedFuture(false);
|
||||||
}
|
}
|
||||||
|
|||||||
@ -27,6 +27,7 @@ package com.plotsquared.core.command;
|
|||||||
|
|
||||||
import com.google.inject.TypeLiteral;
|
import com.google.inject.TypeLiteral;
|
||||||
import com.plotsquared.core.configuration.caption.StaticCaption;
|
import com.plotsquared.core.configuration.caption.StaticCaption;
|
||||||
|
import com.plotsquared.core.configuration.caption.Templates;
|
||||||
import com.plotsquared.core.configuration.caption.TranslatableCaption;
|
import com.plotsquared.core.configuration.caption.TranslatableCaption;
|
||||||
import com.plotsquared.core.permissions.Permission;
|
import com.plotsquared.core.permissions.Permission;
|
||||||
import com.plotsquared.core.player.MetaDataAccess;
|
import com.plotsquared.core.player.MetaDataAccess;
|
||||||
@ -42,8 +43,7 @@ import com.plotsquared.core.util.TabCompletions;
|
|||||||
import com.plotsquared.core.util.task.RunnableVal;
|
import com.plotsquared.core.util.task.RunnableVal;
|
||||||
import net.kyori.adventure.text.Component;
|
import net.kyori.adventure.text.Component;
|
||||||
import net.kyori.adventure.text.TextComponent;
|
import net.kyori.adventure.text.TextComponent;
|
||||||
import net.kyori.adventure.text.minimessage.tag.Tag;
|
import net.kyori.adventure.text.minimessage.Template;
|
||||||
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
|
|
||||||
|
|
||||||
import java.util.Collection;
|
import java.util.Collection;
|
||||||
import java.util.Collections;
|
import java.util.Collections;
|
||||||
@ -79,14 +79,9 @@ public class Inbox extends SubCommand {
|
|||||||
max = comments.length;
|
max = comments.length;
|
||||||
}
|
}
|
||||||
TextComponent.Builder builder = Component.text();
|
TextComponent.Builder builder = Component.text();
|
||||||
builder.append(MINI_MESSAGE.deserialize(
|
builder.append(MINI_MESSAGE.parse(TranslatableCaption.of("list.comment_list_header_paged").getComponent(player) + '\n',
|
||||||
TranslatableCaption.of("list.comment_list_header_paged").getComponent(player) + '\n',
|
Template.of("amount", String.valueOf(comments.length)), Template.of("cur", String.valueOf(page + 1)),
|
||||||
TagResolver.builder()
|
Template.of("max", String.valueOf(totalPages + 1)), Template.of("word", "all")
|
||||||
.tag("amount", Tag.inserting(Component.text(comments.length)))
|
|
||||||
.tag("cur", Tag.inserting(Component.text(page + 1)))
|
|
||||||
.tag("max", Tag.inserting(Component.text(totalPages + 1)))
|
|
||||||
.tag("word", Tag.inserting(Component.text("all")))
|
|
||||||
.build()
|
|
||||||
));
|
));
|
||||||
|
|
||||||
// This might work xD
|
// This might work xD
|
||||||
@ -95,28 +90,30 @@ public class Inbox extends SubCommand {
|
|||||||
Component commentColored;
|
Component commentColored;
|
||||||
if (player.getName().equals(comment.senderName)) {
|
if (player.getName().equals(comment.senderName)) {
|
||||||
commentColored = MINI_MESSAGE
|
commentColored = MINI_MESSAGE
|
||||||
.deserialize(
|
.parse(
|
||||||
TranslatableCaption.of("list.comment_list_by_lister").getComponent(player),
|
TranslatableCaption.of("list.comment_list_by_lister").getComponent(player),
|
||||||
TagResolver.resolver("comment", Tag.inserting(Component.text(comment.comment)))
|
Template.of("comment", comment.comment)
|
||||||
);
|
);
|
||||||
} else {
|
} else {
|
||||||
commentColored = MINI_MESSAGE
|
commentColored = MINI_MESSAGE
|
||||||
.deserialize(
|
.parse(
|
||||||
TranslatableCaption.of("list.comment_list_by_other").getComponent(player),
|
TranslatableCaption.of("list.comment_list_by_other").getComponent(player),
|
||||||
TagResolver.resolver("comment", Tag.inserting(Component.text(comment.comment)))
|
Template.of("comment", comment.comment)
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
TagResolver resolver = TagResolver.builder()
|
Template number = Template.of("number", String.valueOf(x));
|
||||||
.tag("number", Tag.inserting(Component.text(x)))
|
Template world = Template.of("world", comment.world);
|
||||||
.tag("world", Tag.inserting(Component.text(comment.world)))
|
Template plot_id = Template.of("plot_id", comment.id.getX() + ";" + comment.id.getY());
|
||||||
.tag("plot_id", Tag.inserting(Component.text(comment.id.getX() + ";" + comment.id.getY())))
|
Template commenter = Template.of("commenter", comment.senderName);
|
||||||
.tag("commenter", Tag.inserting(Component.text(comment.senderName)))
|
Template commentTemplate = Template.of("comment", commentColored);
|
||||||
.tag("comment", Tag.inserting(commentColored))
|
|
||||||
.build();
|
|
||||||
builder.append(MINI_MESSAGE
|
builder.append(MINI_MESSAGE
|
||||||
.deserialize(
|
.parse(
|
||||||
TranslatableCaption.of("list.comment_list_comment").getComponent(player),
|
TranslatableCaption.of("list.comment_list_comment").getComponent(player),
|
||||||
resolver
|
number,
|
||||||
|
world,
|
||||||
|
plot_id,
|
||||||
|
commenter,
|
||||||
|
commentTemplate
|
||||||
));
|
));
|
||||||
}
|
}
|
||||||
player.sendMessage(StaticCaption.of(MINI_MESSAGE.serialize(builder.build())));
|
player.sendMessage(StaticCaption.of(MINI_MESSAGE.serialize(builder.build())));
|
||||||
@ -153,23 +150,20 @@ public class Inbox extends SubCommand {
|
|||||||
if (total != 0) {
|
if (total != 0) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("comment.inbox_item"),
|
TranslatableCaption.of("comment.inbox_item"),
|
||||||
TagResolver.resolver(
|
Template.of("value", inbox + " (" + total + '/' + unread + ')')
|
||||||
"value",
|
|
||||||
Tag.inserting(Component.text(inbox + " (" + total + '/' + unread + ')'))
|
|
||||||
)
|
|
||||||
);
|
);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("comment.inbox_item"),
|
TranslatableCaption.of("comment.inbox_item"),
|
||||||
TagResolver.resolver("value", Tag.inserting(Component.text(inbox.toString())))
|
Template.of("value", inbox.toString())
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
})) {
|
})) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("comment.inbox_item"),
|
TranslatableCaption.of("comment.inbox_item"),
|
||||||
TagResolver.resolver("value", Tag.inserting(Component.text(inbox.toString())))
|
Template.of("value", inbox.toString())
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -180,10 +174,7 @@ public class Inbox extends SubCommand {
|
|||||||
if (inbox == null) {
|
if (inbox == null) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("comment.invalid_inbox"),
|
TranslatableCaption.of("comment.invalid_inbox"),
|
||||||
TagResolver.resolver(
|
Template.of("list", StringMan.join(CommentManager.inboxes.keySet(), ", "))
|
||||||
"list",
|
|
||||||
Tag.inserting(Component.text(StringMan.join(CommentManager.inboxes.keySet(), ", ")))
|
|
||||||
)
|
|
||||||
);
|
);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@ -206,10 +197,7 @@ public class Inbox extends SubCommand {
|
|||||||
if (args.length != 3) {
|
if (args.length != 3) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("commandconfig.command_syntax"),
|
TranslatableCaption.of("commandconfig.command_syntax"),
|
||||||
TagResolver.resolver(
|
Template.of("value", "/plot inbox " + inbox + " delete <index>")
|
||||||
"value",
|
|
||||||
Tag.inserting(Component.text("/plot inbox " + inbox + " delete <index>"))
|
|
||||||
)
|
|
||||||
);
|
);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
@ -219,17 +207,14 @@ public class Inbox extends SubCommand {
|
|||||||
if (index < 1) {
|
if (index < 1) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("comment.not_valid_inbox_index"),
|
TranslatableCaption.of("comment.not_valid_inbox_index"),
|
||||||
TagResolver.resolver("number", Tag.inserting(Component.text(index)))
|
Templates.of("number", index)
|
||||||
);
|
);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
} catch (NumberFormatException ignored) {
|
} catch (NumberFormatException ignored) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("commandconfig.command_syntax"),
|
TranslatableCaption.of("commandconfig.command_syntax"),
|
||||||
TagResolver.resolver(
|
Template.of("value", "/plot inbox " + inbox + " delete <index>")
|
||||||
"value",
|
|
||||||
Tag.inserting(Component.text("/plot inbox " + inbox + " delete <index>"))
|
|
||||||
)
|
|
||||||
);
|
);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@ -240,7 +225,7 @@ public class Inbox extends SubCommand {
|
|||||||
if (index > value.size()) {
|
if (index > value.size()) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("comment.not_valid_inbox_index"),
|
TranslatableCaption.of("comment.not_valid_inbox_index"),
|
||||||
TagResolver.resolver("number", Tag.inserting(Component.text(index)))
|
Templates.of("number", index)
|
||||||
);
|
);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@ -250,7 +235,7 @@ public class Inbox extends SubCommand {
|
|||||||
if (success) {
|
if (success) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("comment.comment_removed_success"),
|
TranslatableCaption.of("comment.comment_removed_success"),
|
||||||
TagResolver.resolver("value", Tag.inserting(Component.text(comment.comment)))
|
Template.of("value", comment.comment)
|
||||||
);
|
);
|
||||||
} else {
|
} else {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
@ -271,7 +256,7 @@ public class Inbox extends SubCommand {
|
|||||||
if (!comments.isEmpty()) {
|
if (!comments.isEmpty()) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("comment.comment_removed_success"),
|
TranslatableCaption.of("comment.comment_removed_success"),
|
||||||
TagResolver.resolver("value", Tag.inserting(Component.text("*")))
|
Template.of("value", String.valueOf(comments))
|
||||||
);
|
);
|
||||||
plot.getPlotCommentContainer().removeComments(comments);
|
plot.getPlotCommentContainer().removeComments(comments);
|
||||||
}
|
}
|
||||||
|
|||||||
@ -36,9 +36,7 @@ import com.plotsquared.core.plot.Plot;
|
|||||||
import com.plotsquared.core.plot.flag.implementations.HideInfoFlag;
|
import com.plotsquared.core.plot.flag.implementations.HideInfoFlag;
|
||||||
import com.plotsquared.core.util.Permissions;
|
import com.plotsquared.core.util.Permissions;
|
||||||
import com.plotsquared.core.util.TabCompletions;
|
import com.plotsquared.core.util.TabCompletions;
|
||||||
import net.kyori.adventure.text.Component;
|
import net.kyori.adventure.text.minimessage.Template;
|
||||||
import net.kyori.adventure.text.minimessage.tag.Tag;
|
|
||||||
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
|
|
||||||
|
|
||||||
import java.util.Collection;
|
import java.util.Collection;
|
||||||
import java.util.Collections;
|
import java.util.Collections;
|
||||||
@ -100,10 +98,7 @@ public class Info extends SubCommand {
|
|||||||
.hasPermission(Permission.PERMISSION_AREA_INFO_FORCE.toString())) {
|
.hasPermission(Permission.PERMISSION_AREA_INFO_FORCE.toString())) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("permission.no_permission"),
|
TranslatableCaption.of("permission.no_permission"),
|
||||||
TagResolver.resolver(
|
Template.of("node", Permission.PERMISSION_AREA_INFO_FORCE.toString())
|
||||||
"node",
|
|
||||||
Tag.inserting(Permission.PERMISSION_AREA_INFO_FORCE)
|
|
||||||
)
|
|
||||||
);
|
);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
@ -125,10 +120,7 @@ public class Info extends SubCommand {
|
|||||||
if (!hasOwner && !containsEveryone && !trustedEveryone) {
|
if (!hasOwner && !containsEveryone && !trustedEveryone) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("info.plot_info_unclaimed"),
|
TranslatableCaption.of("info.plot_info_unclaimed"),
|
||||||
TagResolver.resolver(
|
Template.of("plot", plot.getId().getX() + ";" + plot.getId().getY())
|
||||||
"plot",
|
|
||||||
Tag.inserting(Component.text(plot.getId().getX() + ";" + plot.getId().getY()))
|
|
||||||
)
|
|
||||||
);
|
);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -38,9 +38,7 @@ import com.plotsquared.core.util.Permissions;
|
|||||||
import com.plotsquared.core.util.PlayerManager;
|
import com.plotsquared.core.util.PlayerManager;
|
||||||
import com.plotsquared.core.util.TabCompletions;
|
import com.plotsquared.core.util.TabCompletions;
|
||||||
import com.plotsquared.core.util.WorldUtil;
|
import com.plotsquared.core.util.WorldUtil;
|
||||||
import net.kyori.adventure.text.Component;
|
import net.kyori.adventure.text.minimessage.Template;
|
||||||
import net.kyori.adventure.text.minimessage.tag.Tag;
|
|
||||||
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
|
|
||||||
import org.checkerframework.checker.nullness.qual.NonNull;
|
import org.checkerframework.checker.nullness.qual.NonNull;
|
||||||
|
|
||||||
import java.util.Collection;
|
import java.util.Collection;
|
||||||
@ -91,7 +89,7 @@ public class Kick extends SubCommand {
|
|||||||
} else if (throwable != null || uuids.isEmpty()) {
|
} else if (throwable != null || uuids.isEmpty()) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("errors.invalid_player"),
|
TranslatableCaption.of("errors.invalid_player"),
|
||||||
TagResolver.resolver("value", Tag.inserting(Component.text(args[0])))
|
Template.of("value", args[0])
|
||||||
);
|
);
|
||||||
} else {
|
} else {
|
||||||
Set<PlotPlayer<?>> players = new HashSet<>();
|
Set<PlotPlayer<?>> players = new HashSet<>();
|
||||||
@ -115,7 +113,7 @@ public class Kick extends SubCommand {
|
|||||||
if (players.isEmpty()) {
|
if (players.isEmpty()) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("errors.invalid_player"),
|
TranslatableCaption.of("errors.invalid_player"),
|
||||||
TagResolver.resolver("value", Tag.inserting(Component.text(args[0])))
|
Template.of("value", args[0])
|
||||||
);
|
);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@ -123,14 +121,14 @@ public class Kick extends SubCommand {
|
|||||||
if (!plot.equals(player2.getCurrentPlot())) {
|
if (!plot.equals(player2.getCurrentPlot())) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("errors.invalid_player"),
|
TranslatableCaption.of("errors.invalid_player"),
|
||||||
TagResolver.resolver("value", Tag.inserting(Component.text(args[0])))
|
Template.of("value", args[0])
|
||||||
);
|
);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (Permissions.hasPermission(player2, Permission.PERMISSION_ADMIN_ENTRY_DENIED)) {
|
if (Permissions.hasPermission(player2, Permission.PERMISSION_ADMIN_ENTRY_DENIED)) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("cluster.cannot_kick_player"),
|
TranslatableCaption.of("cluster.cannot_kick_player"),
|
||||||
TagResolver.resolver("name", Tag.inserting(Component.text(player2.getName())))
|
Template.of("name", player2.getName())
|
||||||
);
|
);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -32,9 +32,7 @@ import com.plotsquared.core.plot.Plot;
|
|||||||
import com.plotsquared.core.util.EventDispatcher;
|
import com.plotsquared.core.util.EventDispatcher;
|
||||||
import com.plotsquared.core.util.task.RunnableVal2;
|
import com.plotsquared.core.util.task.RunnableVal2;
|
||||||
import com.plotsquared.core.util.task.RunnableVal3;
|
import com.plotsquared.core.util.task.RunnableVal3;
|
||||||
import net.kyori.adventure.text.Component;
|
import net.kyori.adventure.text.minimessage.Template;
|
||||||
import net.kyori.adventure.text.minimessage.tag.Tag;
|
|
||||||
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
|
|
||||||
import org.checkerframework.checker.nullness.qual.NonNull;
|
import org.checkerframework.checker.nullness.qual.NonNull;
|
||||||
|
|
||||||
import java.util.UUID;
|
import java.util.UUID;
|
||||||
@ -76,7 +74,7 @@ public class Leave extends Command {
|
|||||||
}
|
}
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("member.plot_left"),
|
TranslatableCaption.of("member.plot_left"),
|
||||||
TagResolver.resolver("player", Tag.inserting(Component.text(player.getName())))
|
Template.of("player", player.getName())
|
||||||
);
|
);
|
||||||
} else {
|
} else {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
|
|||||||
@ -41,9 +41,7 @@ import com.plotsquared.core.util.Permissions;
|
|||||||
import com.plotsquared.core.util.TabCompletions;
|
import com.plotsquared.core.util.TabCompletions;
|
||||||
import com.plotsquared.core.util.query.PlotQuery;
|
import com.plotsquared.core.util.query.PlotQuery;
|
||||||
import com.plotsquared.core.util.task.TaskManager;
|
import com.plotsquared.core.util.task.TaskManager;
|
||||||
import net.kyori.adventure.text.Component;
|
import net.kyori.adventure.text.minimessage.Template;
|
||||||
import net.kyori.adventure.text.minimessage.tag.Tag;
|
|
||||||
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
|
|
||||||
import org.checkerframework.checker.nullness.qual.NonNull;
|
import org.checkerframework.checker.nullness.qual.NonNull;
|
||||||
|
|
||||||
import java.util.Collection;
|
import java.util.Collection;
|
||||||
@ -162,7 +160,7 @@ public class Like extends SubCommand {
|
|||||||
if (oldRating != null) {
|
if (oldRating != null) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("ratings.rating_already_exists"),
|
TranslatableCaption.of("ratings.rating_already_exists"),
|
||||||
TagResolver.resolver("plot", Tag.inserting(Component.text(plot.getId().toString())))
|
Template.of("plot", plot.getId().toString())
|
||||||
);
|
);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@ -180,12 +178,12 @@ public class Like extends SubCommand {
|
|||||||
if (like) {
|
if (like) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("ratings.rating_liked"),
|
TranslatableCaption.of("ratings.rating_liked"),
|
||||||
TagResolver.resolver("plot", Tag.inserting(Component.text(plot.getId().toString())))
|
Template.of("plot", plot.getId().toString())
|
||||||
);
|
);
|
||||||
} else {
|
} else {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("ratings.rating_disliked"),
|
TranslatableCaption.of("ratings.rating_disliked"),
|
||||||
TagResolver.resolver("plot", Tag.inserting(Component.text(plot.getId().toString())))
|
Template.of("plot", plot.getId().toString())
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -30,8 +30,8 @@ import com.plotsquared.core.PlotSquared;
|
|||||||
import com.plotsquared.core.configuration.Settings;
|
import com.plotsquared.core.configuration.Settings;
|
||||||
import com.plotsquared.core.configuration.caption.Caption;
|
import com.plotsquared.core.configuration.caption.Caption;
|
||||||
import com.plotsquared.core.configuration.caption.CaptionHolder;
|
import com.plotsquared.core.configuration.caption.CaptionHolder;
|
||||||
|
import com.plotsquared.core.configuration.caption.Templates;
|
||||||
import com.plotsquared.core.configuration.caption.TranslatableCaption;
|
import com.plotsquared.core.configuration.caption.TranslatableCaption;
|
||||||
import com.plotsquared.core.database.DBFunc;
|
|
||||||
import com.plotsquared.core.permissions.Permission;
|
import com.plotsquared.core.permissions.Permission;
|
||||||
import com.plotsquared.core.player.PlotPlayer;
|
import com.plotsquared.core.player.PlotPlayer;
|
||||||
import com.plotsquared.core.plot.Plot;
|
import com.plotsquared.core.plot.Plot;
|
||||||
@ -39,7 +39,6 @@ import com.plotsquared.core.plot.PlotArea;
|
|||||||
import com.plotsquared.core.plot.expiration.ExpireManager;
|
import com.plotsquared.core.plot.expiration.ExpireManager;
|
||||||
import com.plotsquared.core.plot.flag.implementations.DoneFlag;
|
import com.plotsquared.core.plot.flag.implementations.DoneFlag;
|
||||||
import com.plotsquared.core.plot.flag.implementations.PriceFlag;
|
import com.plotsquared.core.plot.flag.implementations.PriceFlag;
|
||||||
import com.plotsquared.core.plot.flag.implementations.ServerPlotFlag;
|
|
||||||
import com.plotsquared.core.plot.world.PlotAreaManager;
|
import com.plotsquared.core.plot.world.PlotAreaManager;
|
||||||
import com.plotsquared.core.util.EconHandler;
|
import com.plotsquared.core.util.EconHandler;
|
||||||
import com.plotsquared.core.util.MathMan;
|
import com.plotsquared.core.util.MathMan;
|
||||||
@ -54,8 +53,7 @@ import com.plotsquared.core.util.task.RunnableVal3;
|
|||||||
import com.plotsquared.core.uuid.UUIDMapping;
|
import com.plotsquared.core.uuid.UUIDMapping;
|
||||||
import net.kyori.adventure.text.Component;
|
import net.kyori.adventure.text.Component;
|
||||||
import net.kyori.adventure.text.TextComponent;
|
import net.kyori.adventure.text.TextComponent;
|
||||||
import net.kyori.adventure.text.minimessage.tag.Tag;
|
import net.kyori.adventure.text.minimessage.Template;
|
||||||
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
|
|
||||||
import org.checkerframework.checker.nullness.qual.NonNull;
|
import org.checkerframework.checker.nullness.qual.NonNull;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
@ -132,7 +130,7 @@ public class ListCmd extends SubCommand {
|
|||||||
public void noArgs(PlotPlayer<?> player) {
|
public void noArgs(PlotPlayer<?> player) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("commandconfig.subcommand_set_options_header"),
|
TranslatableCaption.of("commandconfig.subcommand_set_options_header"),
|
||||||
TagResolver.resolver("values", Tag.inserting(Component.text(Arrays.toString(getArgumentList(player)))))
|
Templates.of("values", Arrays.toString(getArgumentList(player)))
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -168,14 +166,9 @@ public class ListCmd extends SubCommand {
|
|||||||
if (query == null) {
|
if (query == null) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("commandconfig.did_you_mean"),
|
TranslatableCaption.of("commandconfig.did_you_mean"),
|
||||||
TagResolver.resolver(
|
Template.of(
|
||||||
"value",
|
"value",
|
||||||
Tag.inserting(Component.text(
|
new StringComparison<>(args[0], new String[]{"mine", "shared", "world", "all"}).getBestMatch()
|
||||||
new StringComparison<>(
|
|
||||||
args[0],
|
|
||||||
new String[]{"mine", "shared", "world", "all"}
|
|
||||||
).getBestMatch()
|
|
||||||
))
|
|
||||||
)
|
)
|
||||||
);
|
);
|
||||||
return;
|
return;
|
||||||
@ -203,7 +196,7 @@ public class ListCmd extends SubCommand {
|
|||||||
if (!Permissions.hasPermission(player, Permission.PERMISSION_LIST_MINE)) {
|
if (!Permissions.hasPermission(player, Permission.PERMISSION_LIST_MINE)) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("permission.no_permission"),
|
TranslatableCaption.of("permission.no_permission"),
|
||||||
TagResolver.resolver("node", Tag.inserting(Component.text("plots.list.mine")))
|
Templates.of("node", "plots.list.mine")
|
||||||
);
|
);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@ -218,7 +211,7 @@ public class ListCmd extends SubCommand {
|
|||||||
if (!Permissions.hasPermission(player, Permission.PERMISSION_LIST_SHARED)) {
|
if (!Permissions.hasPermission(player, Permission.PERMISSION_LIST_SHARED)) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("permission.no_permission"),
|
TranslatableCaption.of("permission.no_permission"),
|
||||||
TagResolver.resolver("node", Tag.inserting(Component.text("plots.list.shared")))
|
Templates.of("node", "plots.list.shared")
|
||||||
);
|
);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@ -231,14 +224,14 @@ public class ListCmd extends SubCommand {
|
|||||||
if (!Permissions.hasPermission(player, Permission.PERMISSION_LIST_WORLD)) {
|
if (!Permissions.hasPermission(player, Permission.PERMISSION_LIST_WORLD)) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("permission.no_permission"),
|
TranslatableCaption.of("permission.no_permission"),
|
||||||
TagResolver.resolver("node", Tag.inserting(Component.text("plots.list.world")))
|
Templates.of("node", "plots.list.world")
|
||||||
);
|
);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
if (!Permissions.hasPermission(player, "plots.list.world." + world)) {
|
if (!Permissions.hasPermission(player, "plots.list.world." + world)) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("permission.no_permission"),
|
TranslatableCaption.of("permission.no_permission"),
|
||||||
TagResolver.resolver("node", Tag.inserting(Component.text("plots.list.world." + world)))
|
Templates.of("node", "plots.list.world." + world)
|
||||||
);
|
);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@ -248,7 +241,7 @@ public class ListCmd extends SubCommand {
|
|||||||
if (!Permissions.hasPermission(player, Permission.PERMISSION_LIST_EXPIRED)) {
|
if (!Permissions.hasPermission(player, Permission.PERMISSION_LIST_EXPIRED)) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("permission.no_permission"),
|
TranslatableCaption.of("permission.no_permission"),
|
||||||
TagResolver.resolver("node", Tag.inserting(Component.text("plots.list.expired")))
|
Templates.of("node", "plots.list.expired")
|
||||||
);
|
);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@ -262,14 +255,14 @@ public class ListCmd extends SubCommand {
|
|||||||
if (!Permissions.hasPermission(player, Permission.PERMISSION_LIST_AREA)) {
|
if (!Permissions.hasPermission(player, Permission.PERMISSION_LIST_AREA)) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("permission.no_permission"),
|
TranslatableCaption.of("permission.no_permission"),
|
||||||
TagResolver.resolver("node", Tag.inserting(Component.text("plots.list.area")))
|
Templates.of("node", "plots.list.area")
|
||||||
);
|
);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
if (!Permissions.hasPermission(player, "plots.list.world." + world)) {
|
if (!Permissions.hasPermission(player, "plots.list.world." + world)) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("permission.no_permission"),
|
TranslatableCaption.of("permission.no_permission"),
|
||||||
TagResolver.resolver("node", Tag.inserting(Component.text("plots.list.world." + world)))
|
Templates.of("node", "plots.list.world." + world)
|
||||||
);
|
);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@ -283,7 +276,7 @@ public class ListCmd extends SubCommand {
|
|||||||
if (!Permissions.hasPermission(player, Permission.PERMISSION_LIST_ALL)) {
|
if (!Permissions.hasPermission(player, Permission.PERMISSION_LIST_ALL)) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("permission.no_permission"),
|
TranslatableCaption.of("permission.no_permission"),
|
||||||
TagResolver.resolver("node", Tag.inserting(Component.text("plots.list.all")))
|
Templates.of("node", "plots.list.all")
|
||||||
);
|
);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@ -293,7 +286,7 @@ public class ListCmd extends SubCommand {
|
|||||||
if (!Permissions.hasPermission(player, Permission.PERMISSION_LIST_DONE)) {
|
if (!Permissions.hasPermission(player, Permission.PERMISSION_LIST_DONE)) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("permission.no_permission"),
|
TranslatableCaption.of("permission.no_permission"),
|
||||||
TagResolver.resolver("node", Tag.inserting(Component.text("plots.list.done")))
|
Templates.of("node", "plots.list.done")
|
||||||
);
|
);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@ -308,7 +301,7 @@ public class ListCmd extends SubCommand {
|
|||||||
if (!Permissions.hasPermission(player, Permission.PERMISSION_LIST_TOP)) {
|
if (!Permissions.hasPermission(player, Permission.PERMISSION_LIST_TOP)) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("permission.no_permission"),
|
TranslatableCaption.of("permission.no_permission"),
|
||||||
TagResolver.resolver("node", Tag.inserting(Component.text("plots.list.top")))
|
Templates.of("node", "plots.list.top")
|
||||||
);
|
);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@ -319,7 +312,7 @@ public class ListCmd extends SubCommand {
|
|||||||
if (!Permissions.hasPermission(player, Permission.PERMISSION_LIST_FOR_SALE)) {
|
if (!Permissions.hasPermission(player, Permission.PERMISSION_LIST_FOR_SALE)) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("permission.no_permission"),
|
TranslatableCaption.of("permission.no_permission"),
|
||||||
TagResolver.resolver("node", Tag.inserting(Component.text("plots.list.forsale")))
|
Templates.of("node", "plots.list.forsale")
|
||||||
);
|
);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@ -332,7 +325,7 @@ public class ListCmd extends SubCommand {
|
|||||||
if (!Permissions.hasPermission(player, Permission.PERMISSION_LIST_UNOWNED)) {
|
if (!Permissions.hasPermission(player, Permission.PERMISSION_LIST_UNOWNED)) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("permission.no_permission"),
|
TranslatableCaption.of("permission.no_permission"),
|
||||||
TagResolver.resolver("node", Tag.inserting(Component.text("plots.list.unowned")))
|
Templates.of("node", "plots.list.unowned")
|
||||||
);
|
);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@ -342,14 +335,14 @@ public class ListCmd extends SubCommand {
|
|||||||
if (!Permissions.hasPermission(player, Permission.PERMISSION_LIST_FUZZY)) {
|
if (!Permissions.hasPermission(player, Permission.PERMISSION_LIST_FUZZY)) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("permission.no_permission"),
|
TranslatableCaption.of("permission.no_permission"),
|
||||||
TagResolver.resolver("node", Tag.inserting(Component.text("plots.list.fuzzy")))
|
Templates.of("node", "plots.list.fuzzy")
|
||||||
);
|
);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
if (args.length < (page == -1 ? 2 : 3)) {
|
if (args.length < (page == -1 ? 2 : 3)) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("commandconfig.command_syntax"),
|
TranslatableCaption.of("commandconfig.command_syntax"),
|
||||||
TagResolver.resolver("value", Tag.inserting(Component.text("/plot list fuzzy <search...> [#]")))
|
Templates.of("value", "/plot list fuzzy <search...> [#]")
|
||||||
);
|
);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@ -367,14 +360,14 @@ public class ListCmd extends SubCommand {
|
|||||||
if (!Permissions.hasPermission(player, Permission.PERMISSION_LIST_WORLD)) {
|
if (!Permissions.hasPermission(player, Permission.PERMISSION_LIST_WORLD)) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("permission.no_permission"),
|
TranslatableCaption.of("permission.no_permission"),
|
||||||
TagResolver.resolver("node", Tag.inserting(Component.text("plots.list.world")))
|
Templates.of("node", "plots.list.world")
|
||||||
);
|
);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
if (!Permissions.hasPermission(player, "plots.list.world." + args[0])) {
|
if (!Permissions.hasPermission(player, "plots.list.world." + args[0])) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("permission.no_permission"),
|
TranslatableCaption.of("permission.no_permission"),
|
||||||
TagResolver.resolver("node", Tag.inserting(Component.text("plots.list.world." + args[0])))
|
Templates.of("node", "plots.list.world." + args[0])
|
||||||
);
|
);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@ -393,15 +386,12 @@ public class ListCmd extends SubCommand {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (uuid == null) {
|
if (uuid == null) {
|
||||||
player.sendMessage(
|
player.sendMessage(TranslatableCaption.of("errors.invalid_player"), Templates.of("value", args[0]));
|
||||||
TranslatableCaption.of("errors.invalid_player"),
|
|
||||||
TagResolver.resolver("value", Tag.inserting(Component.text(args[0])))
|
|
||||||
);
|
|
||||||
} else {
|
} else {
|
||||||
if (!Permissions.hasPermission(player, Permission.PERMISSION_LIST_PLAYER)) {
|
if (!Permissions.hasPermission(player, Permission.PERMISSION_LIST_PLAYER)) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("permission.no_permission"),
|
TranslatableCaption.of("permission.no_permission"),
|
||||||
TagResolver.resolver("node", Tag.inserting(Component.text("plots.list.player")))
|
Templates.of("node", "plots.list.player")
|
||||||
);
|
);
|
||||||
} else {
|
} else {
|
||||||
sort[0] = false;
|
sort[0] = false;
|
||||||
@ -428,7 +418,7 @@ public class ListCmd extends SubCommand {
|
|||||||
Caption color;
|
Caption color;
|
||||||
if (plot.getOwner() == null) {
|
if (plot.getOwner() == null) {
|
||||||
color = TranslatableCaption.of("info.plot_list_no_owner");
|
color = TranslatableCaption.of("info.plot_list_no_owner");
|
||||||
} else if (plot.isOwner(player.getUUID()) || plot.getOwner().equals(DBFunc.EVERYONE)) {
|
} else if (plot.isOwner(player.getUUID())) {
|
||||||
color = TranslatableCaption.of("info.plot_list_owned_by");
|
color = TranslatableCaption.of("info.plot_list_owned_by");
|
||||||
} else if (plot.isAdded(player.getUUID())) {
|
} else if (plot.isAdded(player.getUUID())) {
|
||||||
color = TranslatableCaption.of("info.plot_list_added_to");
|
color = TranslatableCaption.of("info.plot_list_added_to");
|
||||||
@ -437,97 +427,70 @@ public class ListCmd extends SubCommand {
|
|||||||
} else {
|
} else {
|
||||||
color = TranslatableCaption.of("info.plot_list_default");
|
color = TranslatableCaption.of("info.plot_list_default");
|
||||||
}
|
}
|
||||||
Component trusted = MINI_MESSAGE.deserialize(
|
Component trusted = MINI_MESSAGE.parse(
|
||||||
TranslatableCaption.of("info.plot_info_trusted").getComponent(player),
|
TranslatableCaption.of("info.plot_info_trusted").getComponent(player),
|
||||||
TagResolver.resolver("trusted", Tag.inserting(PlayerManager.getPlayerList(plot.getTrusted(), player)))
|
Template.of("trusted", PlayerManager.getPlayerList(plot.getTrusted(), player))
|
||||||
);
|
);
|
||||||
Component members = MINI_MESSAGE.deserialize(
|
Component members = MINI_MESSAGE.parse(
|
||||||
TranslatableCaption.of("info.plot_info_members").getComponent(player),
|
TranslatableCaption.of("info.plot_info_members").getComponent(player),
|
||||||
TagResolver.resolver("members", Tag.inserting(PlayerManager.getPlayerList(plot.getMembers(), player)))
|
Template.of("members", PlayerManager.getPlayerList(plot.getMembers(), player))
|
||||||
);
|
);
|
||||||
TagResolver.Builder finalResolver = TagResolver.builder();
|
Template command_tp = Template.of("command_tp", "/plot visit " + plot.getArea() + ";" + plot.getId());
|
||||||
finalResolver.tag(
|
Template command_info = Template.of("command_info", "/plot info " + plot.getArea() + ";" + plot.getId());
|
||||||
"command_tp",
|
Template hover_info =
|
||||||
Tag.preProcessParsed("/plot visit " + plot.getArea() + ";" + plot.getId())
|
Template.of(
|
||||||
|
"hover_info",
|
||||||
|
MINI_MESSAGE.serialize(Component
|
||||||
|
.text()
|
||||||
|
.append(trusted)
|
||||||
|
.append(Component.newline())
|
||||||
|
.append(members)
|
||||||
|
.asComponent())
|
||||||
|
);
|
||||||
|
Template numberTemplate = Template.of("number", String.valueOf(i));
|
||||||
|
Template plotTemplate = Template.of(
|
||||||
|
"plot",
|
||||||
|
MINI_MESSAGE.parse(color.getComponent(player), Template.of("plot", plot.toString()))
|
||||||
);
|
);
|
||||||
finalResolver.tag(
|
|
||||||
"command_info",
|
|
||||||
Tag.preProcessParsed("/plot info " + plot.getArea() + ";" + plot.getId())
|
|
||||||
);
|
|
||||||
finalResolver.tag("hover_info", Tag.inserting(
|
|
||||||
Component.text()
|
|
||||||
.append(trusted)
|
|
||||||
.append(Component.newline())
|
|
||||||
.append(members)
|
|
||||||
.asComponent()
|
|
||||||
));
|
|
||||||
finalResolver.tag("number", Tag.inserting(Component.text(i)));
|
|
||||||
finalResolver.tag("plot", Tag.inserting(MINI_MESSAGE.deserialize(
|
|
||||||
color.getComponent(player), TagResolver.resolver("plot", Tag.inserting(Component.text(plot.toString())))
|
|
||||||
)));
|
|
||||||
String prefix = "";
|
String prefix = "";
|
||||||
String online = TranslatableCaption.of("info.plot_list_player_online").getComponent(player);
|
String online = TranslatableCaption.of("info.plot_list_player_online").getComponent(player);
|
||||||
String offline = TranslatableCaption.of("info.plot_list_player_offline").getComponent(player);
|
String offline = TranslatableCaption.of("info.plot_list_player_offline").getComponent(player);
|
||||||
String unknown = TranslatableCaption.of("info.plot_list_player_unknown").getComponent(player);
|
|
||||||
String server = TranslatableCaption.of("info.plot_list_player_server").getComponent(player);
|
|
||||||
String everyone = TranslatableCaption.of("info.plot_list_player_everyone").getComponent(player);
|
|
||||||
TextComponent.Builder builder = Component.text();
|
TextComponent.Builder builder = Component.text();
|
||||||
if (plot.getFlag(ServerPlotFlag.class)) {
|
try {
|
||||||
TagResolver serverResolver = TagResolver.resolver(
|
final List<UUIDMapping> names = PlotSquared.get().getImpromptuUUIDPipeline().getNames(plot.getOwners())
|
||||||
"info.server",
|
.get(Settings.UUID.BLOCKING_TIMEOUT, TimeUnit.MILLISECONDS);
|
||||||
Tag.inserting(TranslatableCaption.of("info.server").toComponent(player))
|
for (final UUIDMapping uuidMapping : names) {
|
||||||
);
|
PlotPlayer<?> pp = PlotSquared.platform().playerManager().getPlayerIfExists(uuidMapping.getUuid());
|
||||||
builder.append(MINI_MESSAGE.deserialize(server, serverResolver));
|
Template prefixTemplate = Template.of("prefix", prefix);
|
||||||
} else {
|
Template playerTemplate = Template.of("player", uuidMapping.getUsername());
|
||||||
try {
|
|
||||||
final List<UUIDMapping> names = PlotSquared.get().getImpromptuUUIDPipeline().getNames(plot.getOwners())
|
|
||||||
.get(Settings.UUID.BLOCKING_TIMEOUT, TimeUnit.MILLISECONDS);
|
|
||||||
for (final UUIDMapping uuidMapping : names) {
|
|
||||||
PlotPlayer<?> pp = PlotSquared.platform().playerManager().getPlayerIfExists(uuidMapping.getUuid());
|
|
||||||
TagResolver resolver = TagResolver.builder()
|
|
||||||
.tag("prefix", Tag.inserting(Component.text(prefix)))
|
|
||||||
.tag("player", Tag.inserting(Component.text(uuidMapping.getUsername())))
|
|
||||||
.build();
|
|
||||||
if (pp != null) {
|
if (pp != null) {
|
||||||
builder.append(MINI_MESSAGE.deserialize(online, resolver));
|
builder.append(MINI_MESSAGE.parse(online, prefixTemplate, playerTemplate));
|
||||||
} else if (uuidMapping.getUsername().equalsIgnoreCase("unknown")) {
|
} else {
|
||||||
TagResolver unknownResolver = TagResolver.resolver(
|
builder.append(MINI_MESSAGE.parse(offline, prefixTemplate, playerTemplate));
|
||||||
"info.unknown",
|
|
||||||
Tag.inserting(TranslatableCaption.of("info.unknown").toComponent(player))
|
|
||||||
);
|
|
||||||
builder.append(MINI_MESSAGE.deserialize(unknown, unknownResolver));
|
|
||||||
} else if (uuidMapping.getUuid().equals(DBFunc.EVERYONE)) {
|
|
||||||
TagResolver everyoneResolver = TagResolver.resolver(
|
|
||||||
"info.everyone",
|
|
||||||
Tag.inserting(TranslatableCaption.of("info.everyone").toComponent(player))
|
|
||||||
);
|
|
||||||
builder.append(MINI_MESSAGE.deserialize(everyone, everyoneResolver));
|
|
||||||
} else {
|
|
||||||
builder.append(MINI_MESSAGE.deserialize(offline, resolver));
|
|
||||||
}
|
|
||||||
prefix = ", ";
|
|
||||||
}
|
}
|
||||||
} catch (InterruptedException | ExecutionException e) {
|
prefix = ", ";
|
||||||
final StringBuilder playerBuilder = new StringBuilder();
|
|
||||||
final Iterator<UUID> uuidIterator = plot.getOwners().iterator();
|
|
||||||
while (uuidIterator.hasNext()) {
|
|
||||||
final UUID uuid = uuidIterator.next();
|
|
||||||
playerBuilder.append(uuid);
|
|
||||||
if (uuidIterator.hasNext()) {
|
|
||||||
playerBuilder.append(", ");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
player.sendMessage(
|
|
||||||
TranslatableCaption.of("errors.invalid_player"),
|
|
||||||
TagResolver.resolver("value", Tag.inserting(Component.text(playerBuilder.toString())))
|
|
||||||
);
|
|
||||||
} catch (TimeoutException e) {
|
|
||||||
player.sendMessage(TranslatableCaption.of("players.fetching_players_timeout"));
|
|
||||||
}
|
}
|
||||||
|
} catch (InterruptedException | ExecutionException e) {
|
||||||
|
final StringBuilder playerBuilder = new StringBuilder();
|
||||||
|
final Iterator<UUID> uuidIterator = plot.getOwners().iterator();
|
||||||
|
while (uuidIterator.hasNext()) {
|
||||||
|
final UUID uuid = uuidIterator.next();
|
||||||
|
playerBuilder.append(uuid);
|
||||||
|
if (uuidIterator.hasNext()) {
|
||||||
|
playerBuilder.append(", ");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
player.sendMessage(
|
||||||
|
TranslatableCaption.of("errors.invalid_player"),
|
||||||
|
Templates.of("value", playerBuilder.toString())
|
||||||
|
);
|
||||||
|
} catch (TimeoutException e) {
|
||||||
|
player.sendMessage(TranslatableCaption.of("players.fetching_players_timeout"));
|
||||||
}
|
}
|
||||||
finalResolver.tag("players", Tag.inserting(builder.asComponent()));
|
Template players = Template.of("players", builder.asComponent());
|
||||||
caption.set(TranslatableCaption.of("info.plot_list_item"));
|
caption.set(TranslatableCaption.of("info.plot_list_item"));
|
||||||
caption.setTagResolvers(finalResolver.build());
|
caption.setTemplates(command_tp, command_info, hover_info, numberTemplate, plotTemplate, players);
|
||||||
}
|
}
|
||||||
}, "/plot list " + args[0], TranslatableCaption.of("list.plot_list_header_paged"));
|
}, "/plot list " + args[0], TranslatableCaption.of("list.plot_list_header_paged"));
|
||||||
}
|
}
|
||||||
|
|||||||
@ -40,12 +40,9 @@ import com.plotsquared.core.plot.schematic.Schematic;
|
|||||||
import com.plotsquared.core.plot.world.PlotAreaManager;
|
import com.plotsquared.core.plot.world.PlotAreaManager;
|
||||||
import com.plotsquared.core.util.Permissions;
|
import com.plotsquared.core.util.Permissions;
|
||||||
import com.plotsquared.core.util.SchematicHandler;
|
import com.plotsquared.core.util.SchematicHandler;
|
||||||
import com.plotsquared.core.util.TimeUtil;
|
|
||||||
import com.plotsquared.core.util.task.RunnableVal;
|
import com.plotsquared.core.util.task.RunnableVal;
|
||||||
import com.plotsquared.core.util.task.TaskManager;
|
import com.plotsquared.core.util.task.TaskManager;
|
||||||
import net.kyori.adventure.text.Component;
|
import net.kyori.adventure.text.minimessage.Template;
|
||||||
import net.kyori.adventure.text.minimessage.tag.Tag;
|
|
||||||
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
|
|
||||||
import org.checkerframework.checker.nullness.qual.NonNull;
|
import org.checkerframework.checker.nullness.qual.NonNull;
|
||||||
|
|
||||||
import java.net.MalformedURLException;
|
import java.net.MalformedURLException;
|
||||||
@ -108,7 +105,7 @@ public class Load extends SubCommand {
|
|||||||
// No schematics found:
|
// No schematics found:
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("web.load_null"),
|
TranslatableCaption.of("web.load_null"),
|
||||||
TagResolver.resolver("command", Tag.inserting(Component.text("/plot load")))
|
Template.of("command", "/plot load")
|
||||||
);
|
);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@ -119,7 +116,7 @@ public class Load extends SubCommand {
|
|||||||
// use /plot load <index>
|
// use /plot load <index>
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("invalid.not_valid_number"),
|
TranslatableCaption.of("invalid.not_valid_number"),
|
||||||
TagResolver.resolver("value", Tag.inserting(Component.text("(1, " + schematics.size() + ')')))
|
Template.of("value", "(1, " + schematics.size() + ')')
|
||||||
);
|
);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@ -139,10 +136,7 @@ public class Load extends SubCommand {
|
|||||||
plot.removeRunning();
|
plot.removeRunning();
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("schematics.schematic_invalid"),
|
TranslatableCaption.of("schematics.schematic_invalid"),
|
||||||
TagResolver.resolver(
|
Template.of("reason", "non-existent or not in gzip format")
|
||||||
"reason",
|
|
||||||
Tag.inserting(Component.text("non-existent or not in gzip format"))
|
|
||||||
)
|
|
||||||
);
|
);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@ -173,7 +167,7 @@ public class Load extends SubCommand {
|
|||||||
plot.removeRunning();
|
plot.removeRunning();
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("commandconfig.command_syntax"),
|
TranslatableCaption.of("commandconfig.command_syntax"),
|
||||||
TagResolver.resolver("value", Tag.inserting(Component.text("/plot load <index>")))
|
Template.of("value", "/plot load <index>")
|
||||||
);
|
);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@ -211,7 +205,7 @@ public class Load extends SubCommand {
|
|||||||
if (split.length < 5) {
|
if (split.length < 5) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
String time = TimeUtil.secToTime((System.currentTimeMillis() / 1000) - Long.parseLong(split[0]));
|
String time = secToTime((System.currentTimeMillis() / 1000) - Long.parseLong(split[0]));
|
||||||
String world = split[1];
|
String world = split[1];
|
||||||
PlotId id = PlotId.fromString(split[2] + ';' + split[3]);
|
PlotId id = PlotId.fromString(split[2] + ';' + split[3]);
|
||||||
String size = split[4];
|
String size = split[4];
|
||||||
@ -224,15 +218,11 @@ public class Load extends SubCommand {
|
|||||||
}
|
}
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("web.load_list"),
|
TranslatableCaption.of("web.load_list"),
|
||||||
TagResolver.resolver("command", Tag.inserting(Component.text("/plot load #")))
|
Template.of("command", "/plot load #")
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* @deprecated Use {@link TimeUtil#secToTime(long)}
|
|
||||||
*/
|
|
||||||
@Deprecated(forRemoval = true, since = "6.6.2")
|
|
||||||
public String secToTime(long time) {
|
public String secToTime(long time) {
|
||||||
StringBuilder toreturn = new StringBuilder();
|
StringBuilder toreturn = new StringBuilder();
|
||||||
if (time >= 33868800) {
|
if (time >= 33868800) {
|
||||||
|
|||||||
@ -43,9 +43,6 @@ import com.plotsquared.core.util.Permissions;
|
|||||||
import com.plotsquared.core.util.PlotExpression;
|
import com.plotsquared.core.util.PlotExpression;
|
||||||
import com.plotsquared.core.util.task.RunnableVal2;
|
import com.plotsquared.core.util.task.RunnableVal2;
|
||||||
import com.plotsquared.core.util.task.RunnableVal3;
|
import com.plotsquared.core.util.task.RunnableVal3;
|
||||||
import net.kyori.adventure.text.Component;
|
|
||||||
import net.kyori.adventure.text.minimessage.tag.Tag;
|
|
||||||
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
|
|
||||||
import org.apache.logging.log4j.LogManager;
|
import org.apache.logging.log4j.LogManager;
|
||||||
import org.apache.logging.log4j.Logger;
|
import org.apache.logging.log4j.Logger;
|
||||||
|
|
||||||
@ -321,7 +318,7 @@ public class MainCommand extends Command {
|
|||||||
if (message != null) {
|
if (message != null) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("errors.error"),
|
TranslatableCaption.of("errors.error"),
|
||||||
TagResolver.resolver("value", Tag.inserting(Component.text(message)))
|
net.kyori.adventure.text.minimessage.Template.of("value", message)
|
||||||
);
|
);
|
||||||
} else {
|
} else {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
|
|||||||
@ -42,9 +42,7 @@ import com.plotsquared.core.util.EventDispatcher;
|
|||||||
import com.plotsquared.core.util.Permissions;
|
import com.plotsquared.core.util.Permissions;
|
||||||
import com.plotsquared.core.util.PlotExpression;
|
import com.plotsquared.core.util.PlotExpression;
|
||||||
import com.plotsquared.core.util.StringMan;
|
import com.plotsquared.core.util.StringMan;
|
||||||
import net.kyori.adventure.text.Component;
|
import net.kyori.adventure.text.minimessage.Template;
|
||||||
import net.kyori.adventure.text.minimessage.tag.Tag;
|
|
||||||
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
|
|
||||||
import org.checkerframework.checker.nullness.qual.NonNull;
|
import org.checkerframework.checker.nullness.qual.NonNull;
|
||||||
|
|
||||||
import java.util.UUID;
|
import java.util.UUID;
|
||||||
@ -124,13 +122,11 @@ public class Merge extends SubCommand {
|
|||||||
if (direction == null) {
|
if (direction == null) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("commandconfig.command_syntax"),
|
TranslatableCaption.of("commandconfig.command_syntax"),
|
||||||
TagResolver.resolver("value", Tag.inserting(Component.text(
|
Template.of("value", "/plot merge <" + StringMan.join(values, " | ") + "> [removeroads]")
|
||||||
"/plot merge <" + StringMan.join(values, " | ") + "> [removeroads]"
|
|
||||||
)))
|
|
||||||
);
|
);
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("help.direction"),
|
TranslatableCaption.of("help.direction"),
|
||||||
TagResolver.resolver("dir", Tag.inserting(Component.text(direction(location.getYaw()))))
|
Template.of("dir", direction(location.getYaw()))
|
||||||
);
|
);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@ -141,7 +137,7 @@ public class Merge extends SubCommand {
|
|||||||
if (event.getEventResult() == Result.DENY) {
|
if (event.getEventResult() == Result.DENY) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("events.event_denied"),
|
TranslatableCaption.of("events.event_denied"),
|
||||||
TagResolver.resolver("value", Tag.inserting(Component.text("Merge")))
|
Template.of("value", "Merge")
|
||||||
);
|
);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@ -152,7 +148,7 @@ public class Merge extends SubCommand {
|
|||||||
if (!force && size - 1 > maxSize) {
|
if (!force && size - 1 > maxSize) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("permission.no_permission"),
|
TranslatableCaption.of("permission.no_permission"),
|
||||||
TagResolver.resolver("node", Tag.inserting(Component.text(Permission.PERMISSION_MERGE + "." + (size + 1))))
|
Template.of("node", Permission.PERMISSION_MERGE + "." + (size + 1))
|
||||||
);
|
);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@ -179,10 +175,7 @@ public class Merge extends SubCommand {
|
|||||||
.hasPermission(player, Permission.PERMISSION_MERGE_KEEP_ROAD)) {
|
.hasPermission(player, Permission.PERMISSION_MERGE_KEEP_ROAD)) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("permission.no_permission"),
|
TranslatableCaption.of("permission.no_permission"),
|
||||||
TagResolver.resolver(
|
Template.of("node", String.valueOf(Permission.PERMISSION_MERGE_KEEP_ROAD))
|
||||||
"node",
|
|
||||||
Tag.inserting(Permission.PERMISSION_MERGE_KEEP_ROAD)
|
|
||||||
)
|
|
||||||
);
|
);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
@ -191,11 +184,8 @@ public class Merge extends SubCommand {
|
|||||||
this.econHandler.withdrawMoney(player, price);
|
this.econHandler.withdrawMoney(player, price);
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("economy.removed_balance"),
|
TranslatableCaption.of("economy.removed_balance"),
|
||||||
TagResolver.resolver("money", Tag.inserting(Component.text(this.econHandler.format(price)))),
|
Template.of("money", this.econHandler.format(price)),
|
||||||
TagResolver.resolver(
|
Template.of("balance", this.econHandler.format(this.econHandler.getMoney(player)))
|
||||||
"balance",
|
|
||||||
Tag.inserting(Component.text(this.econHandler.format(this.econHandler.getMoney(player))))
|
|
||||||
)
|
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
player.sendMessage(TranslatableCaption.of("merge.success_merge"));
|
player.sendMessage(TranslatableCaption.of("merge.success_merge"));
|
||||||
@ -209,7 +199,7 @@ public class Merge extends SubCommand {
|
|||||||
&& this.econHandler.getMoney(player) < price) {
|
&& this.econHandler.getMoney(player) < price) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("economy.cannot_afford_merge"),
|
TranslatableCaption.of("economy.cannot_afford_merge"),
|
||||||
TagResolver.resolver("money", Tag.inserting(Component.text(this.econHandler.format(price))))
|
Template.of("money", this.econHandler.format(price))
|
||||||
);
|
);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@ -223,7 +213,7 @@ public class Merge extends SubCommand {
|
|||||||
.hasPermission(player, Permission.PERMISSION_MERGE_KEEP_ROAD)) {
|
.hasPermission(player, Permission.PERMISSION_MERGE_KEEP_ROAD)) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("permission.no_permission"),
|
TranslatableCaption.of("permission.no_permission"),
|
||||||
TagResolver.resolver("node", Tag.inserting(Permission.PERMISSION_MERGE_KEEP_ROAD))
|
Template.of("node", String.valueOf(Permission.PERMISSION_MERGE_KEEP_ROAD))
|
||||||
);
|
);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
@ -232,7 +222,7 @@ public class Merge extends SubCommand {
|
|||||||
this.econHandler.withdrawMoney(player, price);
|
this.econHandler.withdrawMoney(player, price);
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("economy.removed_balance"),
|
TranslatableCaption.of("economy.removed_balance"),
|
||||||
TagResolver.resolver("money", Tag.inserting(Component.text(this.econHandler.format(price))))
|
Template.of("money", this.econHandler.format(price))
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
player.sendMessage(TranslatableCaption.of("merge.success_merge"));
|
player.sendMessage(TranslatableCaption.of("merge.success_merge"));
|
||||||
@ -248,7 +238,7 @@ public class Merge extends SubCommand {
|
|||||||
if (!force && !Permissions.hasPermission(player, Permission.PERMISSION_MERGE_OTHER)) {
|
if (!force && !Permissions.hasPermission(player, Permission.PERMISSION_MERGE_OTHER)) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("permission.no_permission"),
|
TranslatableCaption.of("permission.no_permission"),
|
||||||
TagResolver.resolver("node", Tag.inserting(Permission.PERMISSION_MERGE_OTHER))
|
Template.of("node", String.valueOf(Permission.PERMISSION_MERGE_OTHER))
|
||||||
);
|
);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@ -273,14 +263,14 @@ public class Merge extends SubCommand {
|
|||||||
if (!force && this.econHandler.getMoney(player) < price) {
|
if (!force && this.econHandler.getMoney(player) < price) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("economy.cannot_afford_merge"),
|
TranslatableCaption.of("economy.cannot_afford_merge"),
|
||||||
TagResolver.resolver("money", Tag.inserting(Component.text(this.econHandler.format(price))))
|
Template.of("money", this.econHandler.format(price))
|
||||||
);
|
);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
this.econHandler.withdrawMoney(player, price);
|
this.econHandler.withdrawMoney(player, price);
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("economy.removed_balance"),
|
TranslatableCaption.of("economy.removed_balance"),
|
||||||
TagResolver.resolver("money", Tag.inserting(Component.text(this.econHandler.format(price))))
|
Template.of("money", this.econHandler.format(price))
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
player.sendMessage(TranslatableCaption.of("merge.success_merge"));
|
player.sendMessage(TranslatableCaption.of("merge.success_merge"));
|
||||||
@ -288,15 +278,10 @@ public class Merge extends SubCommand {
|
|||||||
};
|
};
|
||||||
if (!force && hasConfirmation(player)) {
|
if (!force && hasConfirmation(player)) {
|
||||||
CmdConfirm.addPending(accepter, MINI_MESSAGE.serialize(MINI_MESSAGE
|
CmdConfirm.addPending(accepter, MINI_MESSAGE.serialize(MINI_MESSAGE
|
||||||
.deserialize(
|
.parse(
|
||||||
TranslatableCaption.of("merge.merge_request_confirm").getComponent(player),
|
TranslatableCaption.of("merge.merge_request_confirm").getComponent(player),
|
||||||
TagResolver.builder()
|
Template.of("player", player.getName()),
|
||||||
.tag("player", Tag.inserting(Component.text(player.getName())))
|
Template.of("location", plot.getWorldName() + ";" + plot.getId())
|
||||||
.tag(
|
|
||||||
"location",
|
|
||||||
Tag.inserting(Component.text(plot.getWorldName() + " " + plot.getId()))
|
|
||||||
)
|
|
||||||
.build()
|
|
||||||
)),
|
)),
|
||||||
run
|
run
|
||||||
);
|
);
|
||||||
|
|||||||
@ -36,9 +36,7 @@ import com.plotsquared.core.plot.world.PlotAreaManager;
|
|||||||
import com.plotsquared.core.util.Permissions;
|
import com.plotsquared.core.util.Permissions;
|
||||||
import com.plotsquared.core.util.task.RunnableVal2;
|
import com.plotsquared.core.util.task.RunnableVal2;
|
||||||
import com.plotsquared.core.util.task.RunnableVal3;
|
import com.plotsquared.core.util.task.RunnableVal3;
|
||||||
import net.kyori.adventure.text.Component;
|
import net.kyori.adventure.text.minimessage.Template;
|
||||||
import net.kyori.adventure.text.minimessage.tag.Tag;
|
|
||||||
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
|
|
||||||
import org.checkerframework.checker.nullness.qual.NonNull;
|
import org.checkerframework.checker.nullness.qual.NonNull;
|
||||||
|
|
||||||
import java.util.concurrent.CompletableFuture;
|
import java.util.concurrent.CompletableFuture;
|
||||||
@ -116,10 +114,8 @@ public class Move extends SubCommand {
|
|||||||
if (result) {
|
if (result) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("move.move_success"),
|
TranslatableCaption.of("move.move_success"),
|
||||||
TagResolver.builder()
|
Template.of("origin", p1),
|
||||||
.tag("origin", Tag.inserting(Component.text(p1)))
|
Template.of("target", p2)
|
||||||
.tag("target", Tag.inserting(Component.text(p2)))
|
|
||||||
.build()
|
|
||||||
);
|
);
|
||||||
return true;
|
return true;
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
@ -38,15 +38,10 @@ import com.plotsquared.core.plot.PlotInventory;
|
|||||||
import com.plotsquared.core.plot.PlotItemStack;
|
import com.plotsquared.core.plot.PlotItemStack;
|
||||||
import com.plotsquared.core.plot.flag.PlotFlag;
|
import com.plotsquared.core.plot.flag.PlotFlag;
|
||||||
import com.plotsquared.core.plot.flag.implementations.MusicFlag;
|
import com.plotsquared.core.plot.flag.implementations.MusicFlag;
|
||||||
import com.plotsquared.core.util.EventDispatcher;
|
|
||||||
import com.plotsquared.core.util.InventoryUtil;
|
import com.plotsquared.core.util.InventoryUtil;
|
||||||
import com.plotsquared.core.util.Permissions;
|
import com.plotsquared.core.util.Permissions;
|
||||||
import com.sk89q.worldedit.world.item.ItemType;
|
|
||||||
import com.sk89q.worldedit.world.item.ItemTypes;
|
import com.sk89q.worldedit.world.item.ItemTypes;
|
||||||
import net.kyori.adventure.text.Component;
|
import net.kyori.adventure.text.minimessage.Template;
|
||||||
import net.kyori.adventure.text.minimessage.tag.Tag;
|
|
||||||
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
|
|
||||||
import org.checkerframework.checker.nullness.qual.NonNull;
|
|
||||||
|
|
||||||
import javax.annotation.Nullable;
|
import javax.annotation.Nullable;
|
||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
@ -68,12 +63,10 @@ public class Music extends SubCommand {
|
|||||||
);
|
);
|
||||||
|
|
||||||
private final InventoryUtil inventoryUtil;
|
private final InventoryUtil inventoryUtil;
|
||||||
private final EventDispatcher eventDispatcher;
|
|
||||||
|
|
||||||
@Inject
|
@Inject
|
||||||
public Music(final @Nullable InventoryUtil inventoryUtil, final @NonNull EventDispatcher eventDispatcher) {
|
public Music(final @Nullable InventoryUtil inventoryUtil) {
|
||||||
this.inventoryUtil = inventoryUtil;
|
this.inventoryUtil = inventoryUtil;
|
||||||
this.eventDispatcher = eventDispatcher;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@ -92,10 +85,7 @@ public class Music extends SubCommand {
|
|||||||
.hasPermission(player, Permission.PERMISSION_ADMIN_MUSIC_OTHER)) {
|
.hasPermission(player, Permission.PERMISSION_ADMIN_MUSIC_OTHER)) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("permission.no_permission"),
|
TranslatableCaption.of("permission.no_permission"),
|
||||||
TagResolver.resolver(
|
Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_MUSIC_OTHER))
|
||||||
"node",
|
|
||||||
Tag.inserting(Permission.PERMISSION_ADMIN_MUSIC_OTHER)
|
|
||||||
)
|
|
||||||
);
|
);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
@ -114,40 +104,34 @@ public class Music extends SubCommand {
|
|||||||
if (item.getType() == ItemTypes.BEDROCK) {
|
if (item.getType() == ItemTypes.BEDROCK) {
|
||||||
PlotFlag<?, ?> plotFlag = plot.getFlagContainer().getFlag(MusicFlag.class)
|
PlotFlag<?, ?> plotFlag = plot.getFlagContainer().getFlag(MusicFlag.class)
|
||||||
.createFlagInstance(item.getType());
|
.createFlagInstance(item.getType());
|
||||||
PlotFlagRemoveEvent event = eventDispatcher.callFlagRemove(plotFlag, plot);
|
PlotFlagRemoveEvent event = new PlotFlagRemoveEvent(plotFlag, plot);
|
||||||
if (event.getEventResult() == Result.DENY) {
|
if (event.getEventResult() == Result.DENY) {
|
||||||
getPlayer().sendMessage(
|
getPlayer().sendMessage(
|
||||||
TranslatableCaption.of("events.event_denied"),
|
TranslatableCaption.of("events.event_denied"),
|
||||||
TagResolver.resolver("value", Tag.inserting(Component.text("Music removal")))
|
Template.of("value", "Music removal")
|
||||||
);
|
);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
plot.removeFlag(event.getFlag());
|
plot.removeFlag(event.getFlag());
|
||||||
getPlayer().sendMessage(
|
getPlayer().sendMessage(
|
||||||
TranslatableCaption.of("flag.flag_removed"),
|
TranslatableCaption.of("flag.flag_removed"),
|
||||||
TagResolver.builder()
|
Template.of("flag", "music"),
|
||||||
.tag("flag", Tag.inserting(Component.text("music")))
|
Template.of("value", "music_disc")
|
||||||
.tag("value", Tag.inserting(Component.text("music_disc")))
|
|
||||||
.build()
|
|
||||||
);
|
);
|
||||||
} else if (item.getName().toLowerCase(Locale.ENGLISH).contains("disc")) {
|
} else if (item.getName().toLowerCase(Locale.ENGLISH).contains("disc")) {
|
||||||
PlotFlag<?, ?> plotFlag = plot.getFlagContainer().getFlag(MusicFlag.class)
|
PlotFlag<?, ?> plotFlag = plot.getFlagContainer().getFlag(MusicFlag.class)
|
||||||
.createFlagInstance(item.getType());
|
.createFlagInstance(item.getType());
|
||||||
PlotFlagAddEvent event = eventDispatcher.callFlagAdd(plotFlag, plot);
|
PlotFlagAddEvent event = new PlotFlagAddEvent(plotFlag, plot);
|
||||||
if (event.getEventResult() == Result.DENY) {
|
if (event.getEventResult() == Result.DENY) {
|
||||||
getPlayer().sendMessage(
|
getPlayer().sendMessage(
|
||||||
TranslatableCaption.of("events.event_denied"),
|
TranslatableCaption.of("events.event_denied"),
|
||||||
TagResolver.resolver("value", Tag.inserting(Component.text("Music addition")))
|
Template.of("value", "Music addition")
|
||||||
);
|
);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
plot.setFlag(event.getFlag());
|
plot.setFlag(event.getFlag());
|
||||||
getPlayer().sendMessage(
|
getPlayer().sendMessage(TranslatableCaption.of("flag.flag_added"), Template.of("flag", "music"),
|
||||||
TranslatableCaption.of("flag.flag_added"),
|
Template.of("value", String.valueOf(event.getFlag().getValue()))
|
||||||
TagResolver.builder()
|
|
||||||
.tag("flag", Tag.inserting(Component.text("music")))
|
|
||||||
.tag("value", Tag.inserting(Component.text(event.getFlag().getValue().toString())))
|
|
||||||
.build()
|
|
||||||
);
|
);
|
||||||
} else {
|
} else {
|
||||||
getPlayer().sendMessage(TranslatableCaption.of("flag.flag_not_added"));
|
getPlayer().sendMessage(TranslatableCaption.of("flag.flag_not_added"));
|
||||||
@ -160,14 +144,8 @@ public class Music extends SubCommand {
|
|||||||
for (final String disc : DISCS) {
|
for (final String disc : DISCS) {
|
||||||
final String name = String.format("<gold>%s</gold>", disc);
|
final String name = String.format("<gold>%s</gold>", disc);
|
||||||
final String[] lore = {TranslatableCaption.of("plotjukebox.click_to_play").getComponent(player)};
|
final String[] lore = {TranslatableCaption.of("plotjukebox.click_to_play").getComponent(player)};
|
||||||
ItemType type = ItemTypes.get(disc);
|
final PlotItemStack item = new PlotItemStack(disc, 1, name, lore);
|
||||||
if (type == null) {
|
inv.setItem(index++, item);
|
||||||
continue;
|
|
||||||
}
|
|
||||||
final PlotItemStack item = new PlotItemStack(type, 1, name, lore);
|
|
||||||
if (inv.setItemChecked(index, item)) {
|
|
||||||
index++;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Always add the cancel button
|
// Always add the cancel button
|
||||||
|
|||||||
@ -31,9 +31,7 @@ import com.plotsquared.core.plot.Plot;
|
|||||||
import com.plotsquared.core.util.StringMan;
|
import com.plotsquared.core.util.StringMan;
|
||||||
import com.plotsquared.core.util.task.RunnableVal2;
|
import com.plotsquared.core.util.task.RunnableVal2;
|
||||||
import com.plotsquared.core.util.task.RunnableVal3;
|
import com.plotsquared.core.util.task.RunnableVal3;
|
||||||
import net.kyori.adventure.text.Component;
|
import net.kyori.adventure.text.minimessage.Template;
|
||||||
import net.kyori.adventure.text.minimessage.tag.Tag;
|
|
||||||
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
|
|
||||||
|
|
||||||
import java.util.concurrent.CompletableFuture;
|
import java.util.concurrent.CompletableFuture;
|
||||||
|
|
||||||
@ -57,7 +55,7 @@ public class Near extends Command {
|
|||||||
final Plot plot = check(player.getCurrentPlot(), TranslatableCaption.of("errors.not_in_plot"));
|
final Plot plot = check(player.getCurrentPlot(), TranslatableCaption.of("errors.not_in_plot"));
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("near.plot_near"),
|
TranslatableCaption.of("near.plot_near"),
|
||||||
TagResolver.resolver("list", Tag.inserting(Component.text(StringMan.join(plot.getPlayersInPlot(), ", "))))
|
Template.of("list", StringMan.join(plot.getPlayersInPlot(), ", "))
|
||||||
);
|
);
|
||||||
return CompletableFuture.completedFuture(true);
|
return CompletableFuture.completedFuture(true);
|
||||||
}
|
}
|
||||||
|
|||||||
@ -42,9 +42,7 @@ import com.plotsquared.core.util.Permissions;
|
|||||||
import com.plotsquared.core.util.PlayerManager;
|
import com.plotsquared.core.util.PlayerManager;
|
||||||
import com.plotsquared.core.util.TabCompletions;
|
import com.plotsquared.core.util.TabCompletions;
|
||||||
import com.plotsquared.core.util.task.TaskManager;
|
import com.plotsquared.core.util.task.TaskManager;
|
||||||
import net.kyori.adventure.text.Component;
|
import net.kyori.adventure.text.minimessage.Template;
|
||||||
import net.kyori.adventure.text.minimessage.tag.Tag;
|
|
||||||
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
|
|
||||||
import org.checkerframework.checker.nullness.qual.NonNull;
|
import org.checkerframework.checker.nullness.qual.NonNull;
|
||||||
import org.checkerframework.checker.nullness.qual.Nullable;
|
import org.checkerframework.checker.nullness.qual.Nullable;
|
||||||
|
|
||||||
@ -75,7 +73,7 @@ public class Owner extends SetCommand {
|
|||||||
if (value == null || value.isEmpty()) {
|
if (value == null || value.isEmpty()) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("commandconfig.command_syntax"),
|
TranslatableCaption.of("commandconfig.command_syntax"),
|
||||||
TagResolver.resolver("value", Tag.inserting(Component.text("/plot setowner <owner>")))
|
Template.of("value", "/plot setowner <owner>")
|
||||||
);
|
);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@ -87,7 +85,7 @@ public class Owner extends SetCommand {
|
|||||||
&& !value.equalsIgnoreCase("-")) {
|
&& !value.equalsIgnoreCase("-")) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("errors.invalid_player"),
|
TranslatableCaption.of("errors.invalid_player"),
|
||||||
TagResolver.resolver("value", Tag.inserting(Component.text(value)))
|
Template.of("value", value)
|
||||||
);
|
);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@ -101,7 +99,7 @@ public class Owner extends SetCommand {
|
|||||||
if (event.getEventResult() == Result.DENY) {
|
if (event.getEventResult() == Result.DENY) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("events.event_denied"),
|
TranslatableCaption.of("events.event_denied"),
|
||||||
TagResolver.resolver("value", Tag.inserting(Component.text("Owner change")))
|
Template.of("value", "Owner change")
|
||||||
);
|
);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@ -124,7 +122,7 @@ public class Owner extends SetCommand {
|
|||||||
if (unlinkEvent.getEventResult() == Result.DENY) {
|
if (unlinkEvent.getEventResult() == Result.DENY) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("events.event_denied"),
|
TranslatableCaption.of("events.event_denied"),
|
||||||
TagResolver.resolver("value", Tag.inserting(Component.text("Unlink on owner change")))
|
Template.of("value", "Unlink on owner change")
|
||||||
);
|
);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@ -144,10 +142,7 @@ public class Owner extends SetCommand {
|
|||||||
if (plot.isOwner(uuid)) {
|
if (plot.isOwner(uuid)) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("member.already_owner"),
|
TranslatableCaption.of("member.already_owner"),
|
||||||
TagResolver.resolver(
|
Template.of("player", PlayerManager.resolveName(uuid, false).getComponent(player))
|
||||||
"player",
|
|
||||||
Tag.inserting(PlayerManager.resolveName(uuid, false).toComponent(player))
|
|
||||||
)
|
|
||||||
);
|
);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@ -156,10 +151,7 @@ public class Owner extends SetCommand {
|
|||||||
if (other == null) {
|
if (other == null) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("errors.invalid_player_offline"),
|
TranslatableCaption.of("errors.invalid_player_offline"),
|
||||||
TagResolver.resolver(
|
Template.of("player", PlayerManager.resolveName(uuid).getComponent(player))
|
||||||
"player",
|
|
||||||
Tag.inserting(PlayerManager.resolveName(uuid).toComponent(player))
|
|
||||||
)
|
|
||||||
);
|
);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@ -195,10 +187,7 @@ public class Owner extends SetCommand {
|
|||||||
if (other != null) {
|
if (other != null) {
|
||||||
other.sendMessage(
|
other.sendMessage(
|
||||||
TranslatableCaption.of("owner.now_owner"),
|
TranslatableCaption.of("owner.now_owner"),
|
||||||
TagResolver.resolver(
|
Template.of("plot", plot.getArea() + ";" + plot.getId())
|
||||||
"plot",
|
|
||||||
Tag.inserting(Component.text(plot.getArea() + ";" + plot.getId()))
|
|
||||||
)
|
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
@ -30,9 +30,7 @@ import com.plotsquared.core.configuration.caption.StaticCaption;
|
|||||||
import com.plotsquared.core.player.PlotPlayer;
|
import com.plotsquared.core.player.PlotPlayer;
|
||||||
import com.plotsquared.core.util.PremiumVerification;
|
import com.plotsquared.core.util.PremiumVerification;
|
||||||
import com.plotsquared.core.util.task.TaskManager;
|
import com.plotsquared.core.util.task.TaskManager;
|
||||||
import net.kyori.adventure.text.Component;
|
import net.kyori.adventure.text.minimessage.Template;
|
||||||
import net.kyori.adventure.text.minimessage.tag.Tag;
|
|
||||||
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
|
|
||||||
|
|
||||||
@CommandDeclaration(command = "plugin",
|
@CommandDeclaration(command = "plugin",
|
||||||
permission = "plots.use",
|
permission = "plots.use",
|
||||||
@ -48,17 +46,17 @@ public class PluginCmd extends SubCommand {
|
|||||||
StaticCaption.of("<gray>>> </gray><gold><bold>" + PlotSquared
|
StaticCaption.of("<gray>>> </gray><gold><bold>" + PlotSquared
|
||||||
.platform()
|
.platform()
|
||||||
.pluginName() + " <reset><gray>(<gold>Version</gold><gray>: </gray><gold><version></gold><gray>)</gray>"),
|
.pluginName() + " <reset><gray>(<gold>Version</gold><gray>: </gray><gold><version></gold><gray>)</gray>"),
|
||||||
TagResolver.resolver("version", Tag.inserting(Component.text(String.valueOf(PlotSquared.get().getVersion()))))
|
Template.of("version", String.valueOf(PlotSquared.get().getVersion()))
|
||||||
);
|
);
|
||||||
player.sendMessage(StaticCaption.of(
|
player.sendMessage(StaticCaption.of(
|
||||||
"<gray>>> </gray><gold><bold>Authors<reset><gray>: </gray><gold>Citymonstret </gold><gray>& </gray><gold>Empire92 </gold><gray>& </gray><gold>MattBDev </gold><gray>& </gray><gold>dordsor21 </gold><gray>& </gray><gold>NotMyFault </gold><gray>& </gray><gold>SirYwell</gold>"));
|
"<gray>>> </gray><gold><bold>Authors<reset><gray>: </gray><gold>Citymonstret </gold><gray>& </gray><gold>Empire92 </gold><gray>& </gray><gold>MattBDev </gold><gray>& </gray><gold>dordsor21 </gold><gray>& </gray><gold>NotMyFault </gold><gray>& </gray><gold>SirYwell</gold>"));
|
||||||
player.sendMessage(StaticCaption.of(
|
player.sendMessage(StaticCaption.of(
|
||||||
"<gray>>> </gray><gold><bold>Wiki<reset><gray>: </gray><gold><click:open_url:https://intellectualsites.github.io/plotsquared-documentation/>https://intellectualsites.github.io/plotsquared-documentation/</gold>"));
|
"<gray>>> </gray><gold><bold>Wiki<reset><gray>: </gray><gold><click:open_url:https://github.com/IntellectualSites/PlotSquared-Documentation/wiki>https://github.com/IntellectualSites/PlotSquared-Documentation/wiki</gold>"));
|
||||||
player.sendMessage(StaticCaption.of(
|
player.sendMessage(StaticCaption.of(
|
||||||
"<gray>>> </gray><gold><bold>Discord<reset><gray>: </gray><gold><click:open_url:https://discord.gg/intellectualsites>https://discord.gg/intellectualsites</gold>"));
|
"<gray>>> </gray><gold><bold>Discord<reset><gray>: </gray><gold><click:open_url:https://discord.gg/intellectualsites>https://discord.gg/intellectualsites</gold>"));
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
StaticCaption.of("<gray>>> </gray><gold><bold>Premium<reset><gray>: <gold><value></gold>"),
|
StaticCaption.of("<gray>>> </gray><gold><bold>Premium<reset><gray>: <gold><value></gold>"),
|
||||||
TagResolver.resolver("value", Tag.inserting(Component.text(PremiumVerification.isPremium())))
|
Template.of("value", String.valueOf(PremiumVerification.isPremium()))
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
return true;
|
return true;
|
||||||
|
|||||||
@ -40,9 +40,7 @@ import com.plotsquared.core.util.StringMan;
|
|||||||
import com.plotsquared.core.util.query.PlotQuery;
|
import com.plotsquared.core.util.query.PlotQuery;
|
||||||
import com.plotsquared.core.util.task.TaskManager;
|
import com.plotsquared.core.util.task.TaskManager;
|
||||||
import com.plotsquared.core.uuid.UUIDMapping;
|
import com.plotsquared.core.uuid.UUIDMapping;
|
||||||
import net.kyori.adventure.text.Component;
|
import net.kyori.adventure.text.minimessage.Template;
|
||||||
import net.kyori.adventure.text.minimessage.tag.Tag;
|
|
||||||
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
|
|
||||||
import org.apache.logging.log4j.LogManager;
|
import org.apache.logging.log4j.LogManager;
|
||||||
import org.apache.logging.log4j.Logger;
|
import org.apache.logging.log4j.Logger;
|
||||||
import org.checkerframework.checker.nullness.qual.NonNull;
|
import org.checkerframework.checker.nullness.qual.NonNull;
|
||||||
@ -107,7 +105,7 @@ public class Purge extends SubCommand {
|
|||||||
if (area == null) {
|
if (area == null) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("errors.not_valid_plot_world"),
|
TranslatableCaption.of("errors.not_valid_plot_world"),
|
||||||
TagResolver.resolver("value", Tag.inserting(Component.text(split[1])))
|
Template.of("value", split[1])
|
||||||
);
|
);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@ -119,7 +117,7 @@ public class Purge extends SubCommand {
|
|||||||
} catch (IllegalArgumentException ignored) {
|
} catch (IllegalArgumentException ignored) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("invalid.not_valid_plot_id"),
|
TranslatableCaption.of("invalid.not_valid_plot_id"),
|
||||||
TagResolver.resolver("value", Tag.inserting(Component.text(split[1])))
|
Template.of("value", split[1])
|
||||||
);
|
);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@ -130,7 +128,7 @@ public class Purge extends SubCommand {
|
|||||||
if (ownerMapping == null) {
|
if (ownerMapping == null) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("errors.invalid_player"),
|
TranslatableCaption.of("errors.invalid_player"),
|
||||||
TagResolver.resolver("value", Tag.inserting(Component.text(split[1])))
|
Template.of("value", split[1])
|
||||||
);
|
);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@ -142,7 +140,7 @@ public class Purge extends SubCommand {
|
|||||||
if (addedMapping == null) {
|
if (addedMapping == null) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("errors.invalid_player"),
|
TranslatableCaption.of("errors.invalid_player"),
|
||||||
TagResolver.resolver("value", Tag.inserting(Component.text(split[1])))
|
Template.of("value", split[1])
|
||||||
);
|
);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@ -267,10 +265,7 @@ public class Purge extends SubCommand {
|
|||||||
DBFunc.purgeIds(ids);
|
DBFunc.purgeIds(ids);
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("purge.purge_success"),
|
TranslatableCaption.of("purge.purge_success"),
|
||||||
TagResolver.resolver(
|
Template.of("amount", ids.size() + "/" + toDelete.size())
|
||||||
"amount",
|
|
||||||
Tag.inserting(Component.text(ids.size() + "/" + toDelete.size()))
|
|
||||||
)
|
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|||||||
@ -45,9 +45,7 @@ import com.plotsquared.core.util.Permissions;
|
|||||||
import com.plotsquared.core.util.TabCompletions;
|
import com.plotsquared.core.util.TabCompletions;
|
||||||
import com.plotsquared.core.util.query.PlotQuery;
|
import com.plotsquared.core.util.query.PlotQuery;
|
||||||
import com.plotsquared.core.util.task.TaskManager;
|
import com.plotsquared.core.util.task.TaskManager;
|
||||||
import net.kyori.adventure.text.Component;
|
import net.kyori.adventure.text.minimessage.Template;
|
||||||
import net.kyori.adventure.text.minimessage.tag.Tag;
|
|
||||||
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
|
|
||||||
import org.checkerframework.checker.nullness.qual.NonNull;
|
import org.checkerframework.checker.nullness.qual.NonNull;
|
||||||
|
|
||||||
import java.util.Collection;
|
import java.util.Collection;
|
||||||
@ -157,7 +155,7 @@ public class Rate extends SubCommand {
|
|||||||
if (plot.getRatings().containsKey(player.getUUID())) {
|
if (plot.getRatings().containsKey(player.getUUID())) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("ratings.rating_already_exists"),
|
TranslatableCaption.of("ratings.rating_already_exists"),
|
||||||
TagResolver.resolver("plot", Tag.inserting(Component.text(plot.getId().toString())))
|
Template.of("plot", plot.getId().toString())
|
||||||
);
|
);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@ -177,7 +175,7 @@ public class Rate extends SubCommand {
|
|||||||
plot.addRating(this.getPlayer().getUUID(), event.getRating());
|
plot.addRating(this.getPlayer().getUUID(), event.getRating());
|
||||||
getPlayer().sendMessage(
|
getPlayer().sendMessage(
|
||||||
TranslatableCaption.of("ratings.rating_applied"),
|
TranslatableCaption.of("ratings.rating_applied"),
|
||||||
TagResolver.resolver("plot", Tag.inserting(Component.text(plot.getId().toString())))
|
Template.of("plot", plot.getId().toString())
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
@ -250,7 +248,7 @@ public class Rate extends SubCommand {
|
|||||||
if (plot.getRatings().containsKey(uuid)) {
|
if (plot.getRatings().containsKey(uuid)) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("ratings.rating_already_exists"),
|
TranslatableCaption.of("ratings.rating_already_exists"),
|
||||||
TagResolver.resolver("plot", Tag.inserting(Component.text(plot.getId().toString())))
|
Template.of("plot", plot.getId().toString())
|
||||||
);
|
);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@ -260,7 +258,7 @@ public class Rate extends SubCommand {
|
|||||||
plot.addRating(uuid, event.getRating());
|
plot.addRating(uuid, event.getRating());
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("ratings.rating_applied"),
|
TranslatableCaption.of("ratings.rating_applied"),
|
||||||
TagResolver.resolver("plot", Tag.inserting(Component.text(plot.getId().toString())))
|
Template.of("plot", plot.getId().toString())
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|||||||
@ -33,9 +33,7 @@ import com.plotsquared.core.player.PlotPlayer;
|
|||||||
import com.plotsquared.core.plot.PlotArea;
|
import com.plotsquared.core.plot.PlotArea;
|
||||||
import com.plotsquared.core.plot.PlotManager;
|
import com.plotsquared.core.plot.PlotManager;
|
||||||
import com.plotsquared.core.plot.world.PlotAreaManager;
|
import com.plotsquared.core.plot.world.PlotAreaManager;
|
||||||
import net.kyori.adventure.text.Component;
|
import net.kyori.adventure.text.minimessage.Template;
|
||||||
import net.kyori.adventure.text.minimessage.tag.Tag;
|
|
||||||
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
|
|
||||||
import org.checkerframework.checker.nullness.qual.NonNull;
|
import org.checkerframework.checker.nullness.qual.NonNull;
|
||||||
|
|
||||||
@CommandDeclaration(command = "regenallroads",
|
@CommandDeclaration(command = "regenallroads",
|
||||||
@ -67,18 +65,18 @@ public class RegenAllRoads extends SubCommand {
|
|||||||
} catch (NumberFormatException ignored) {
|
} catch (NumberFormatException ignored) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("invalid.not_valid_number"),
|
TranslatableCaption.of("invalid.not_valid_number"),
|
||||||
TagResolver.resolver("value", Tag.inserting(Component.text("(0, 256)")))
|
Template.of("value", "(0, 256)")
|
||||||
);
|
);
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("commandconfig.command_syntax"),
|
TranslatableCaption.of("commandconfig.command_syntax"),
|
||||||
TagResolver.resolver("value", Tag.inserting(Component.text("/plot regenallroads <world> [height]")))
|
Template.of("value", "/plot regenallroads <world> [height]")
|
||||||
);
|
);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
} else if (args.length != 1) {
|
} else if (args.length != 1) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("commandconfig.command_syntax"),
|
TranslatableCaption.of("commandconfig.command_syntax"),
|
||||||
TagResolver.resolver("value", Tag.inserting(Component.text("/plot regenallroads <world> [height]")))
|
Template.of("value", "/plot regenallroads <world> [height]")
|
||||||
);
|
);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@ -86,7 +84,7 @@ public class RegenAllRoads extends SubCommand {
|
|||||||
if (area == null) {
|
if (area == null) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("errors.not_valid_plot_world"),
|
TranslatableCaption.of("errors.not_valid_plot_world"),
|
||||||
TagResolver.resolver("value", Tag.inserting(Component.text(args[0])))
|
Template.of("value", args[0])
|
||||||
);
|
);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@ -97,7 +95,7 @@ public class RegenAllRoads extends SubCommand {
|
|||||||
}
|
}
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("debugroadregen.schematic"),
|
TranslatableCaption.of("debugroadregen.schematic"),
|
||||||
TagResolver.resolver("command", Tag.inserting(Component.text("/plot createroadschematic")))
|
Template.of("command", "/plot createroadschematic")
|
||||||
);
|
);
|
||||||
player.sendMessage(TranslatableCaption.of("debugroadregen.regenallroads_started"));
|
player.sendMessage(TranslatableCaption.of("debugroadregen.regenallroads_started"));
|
||||||
boolean result = this.hybridUtils.scheduleRoadUpdate(area, height);
|
boolean result = this.hybridUtils.scheduleRoadUpdate(area, height);
|
||||||
|
|||||||
@ -36,9 +36,7 @@ import com.plotsquared.core.util.EventDispatcher;
|
|||||||
import com.plotsquared.core.util.Permissions;
|
import com.plotsquared.core.util.Permissions;
|
||||||
import com.plotsquared.core.util.PlayerManager;
|
import com.plotsquared.core.util.PlayerManager;
|
||||||
import com.plotsquared.core.util.TabCompletions;
|
import com.plotsquared.core.util.TabCompletions;
|
||||||
import net.kyori.adventure.text.Component;
|
import net.kyori.adventure.text.minimessage.Template;
|
||||||
import net.kyori.adventure.text.minimessage.tag.Tag;
|
|
||||||
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
|
|
||||||
import org.checkerframework.checker.nullness.qual.NonNull;
|
import org.checkerframework.checker.nullness.qual.NonNull;
|
||||||
|
|
||||||
import java.util.Collection;
|
import java.util.Collection;
|
||||||
@ -88,7 +86,7 @@ public class Remove extends SubCommand {
|
|||||||
} else if (throwable != null) {
|
} else if (throwable != null) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("errors.invalid_player"),
|
TranslatableCaption.of("errors.invalid_player"),
|
||||||
TagResolver.resolver("value", Tag.inserting(Component.text(args[0])))
|
Template.of("value", args[0])
|
||||||
);
|
);
|
||||||
return;
|
return;
|
||||||
} else if (!uuids.isEmpty()) {
|
} else if (!uuids.isEmpty()) {
|
||||||
@ -125,12 +123,12 @@ public class Remove extends SubCommand {
|
|||||||
if (count == 0) {
|
if (count == 0) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("errors.invalid_player"),
|
TranslatableCaption.of("errors.invalid_player"),
|
||||||
TagResolver.resolver("value", Tag.inserting(Component.text(args[0])))
|
Template.of("value", args[0])
|
||||||
);
|
);
|
||||||
} else {
|
} else {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("member.removed_players"),
|
TranslatableCaption.of("member.removed_players"),
|
||||||
TagResolver.resolver("amount", Tag.inserting(Component.text(count)))
|
Template.of("amount", count + "")
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|||||||
@ -39,9 +39,7 @@ import com.plotsquared.core.util.Permissions;
|
|||||||
import com.plotsquared.core.util.SchematicHandler;
|
import com.plotsquared.core.util.SchematicHandler;
|
||||||
import com.plotsquared.core.util.task.RunnableVal;
|
import com.plotsquared.core.util.task.RunnableVal;
|
||||||
import com.plotsquared.core.util.task.TaskManager;
|
import com.plotsquared.core.util.task.TaskManager;
|
||||||
import net.kyori.adventure.text.Component;
|
import net.kyori.adventure.text.minimessage.Template;
|
||||||
import net.kyori.adventure.text.minimessage.tag.Tag;
|
|
||||||
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
|
|
||||||
import org.checkerframework.checker.nullness.qual.NonNull;
|
import org.checkerframework.checker.nullness.qual.NonNull;
|
||||||
|
|
||||||
import java.net.URL;
|
import java.net.URL;
|
||||||
@ -52,7 +50,7 @@ import java.util.UUID;
|
|||||||
* @deprecated In favor of "/plot download" (Arkitektonika) and scheduled
|
* @deprecated In favor of "/plot download" (Arkitektonika) and scheduled
|
||||||
* for removal within the next major release.
|
* for removal within the next major release.
|
||||||
*/
|
*/
|
||||||
@Deprecated(forRemoval = true, since = "6.0.9")
|
@Deprecated(forRemoval = true)
|
||||||
@CommandDeclaration(command = "save",
|
@CommandDeclaration(command = "save",
|
||||||
category = CommandCategory.SCHEMATIC,
|
category = CommandCategory.SCHEMATIC,
|
||||||
requiredType = RequiredType.NONE,
|
requiredType = RequiredType.NONE,
|
||||||
@ -106,8 +104,8 @@ public class Save extends SubCommand {
|
|||||||
TaskManager.runTaskAsync(() -> {
|
TaskManager.runTaskAsync(() -> {
|
||||||
String time = (System.currentTimeMillis() / 1000) + "";
|
String time = (System.currentTimeMillis() / 1000) + "";
|
||||||
Location[] corners = plot.getCorners();
|
Location[] corners = plot.getCorners();
|
||||||
corners[0] = corners[0].withY(plot.getArea().getMinBuildHeight());
|
corners[0] = corners[0].withY(0);
|
||||||
corners[1] = corners[1].withY(plot.getArea().getMaxBuildHeight());
|
corners[1] = corners[1].withY(255);
|
||||||
int size = (corners[1].getX() - corners[0].getX()) + 1;
|
int size = (corners[1].getX() - corners[0].getX()) + 1;
|
||||||
PlotId id = plot.getId();
|
PlotId id = plot.getId();
|
||||||
String world1 = plot.getArea().toString().replaceAll(";", "-")
|
String world1 = plot.getArea().toString().replaceAll(";", "-")
|
||||||
@ -125,7 +123,7 @@ public class Save extends SubCommand {
|
|||||||
player.sendMessage(TranslatableCaption.of("web.save_success"));
|
player.sendMessage(TranslatableCaption.of("web.save_success"));
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("errors.deprecated_commands"),
|
TranslatableCaption.of("errors.deprecated_commands"),
|
||||||
TagResolver.resolver("replacement", Tag.inserting(Component.text("/plot download")))
|
Template.of("replacement", "/plot download")
|
||||||
);
|
);
|
||||||
try (final MetaDataAccess<List<String>> schematicAccess =
|
try (final MetaDataAccess<List<String>> schematicAccess =
|
||||||
player.accessTemporaryMetaData(PlayerMetaDataKeys.TEMPORARY_SCHEMATICS)) {
|
player.accessTemporaryMetaData(PlayerMetaDataKeys.TEMPORARY_SCHEMATICS)) {
|
||||||
|
|||||||
@ -43,9 +43,7 @@ import com.plotsquared.core.util.StringMan;
|
|||||||
import com.plotsquared.core.util.TabCompletions;
|
import com.plotsquared.core.util.TabCompletions;
|
||||||
import com.plotsquared.core.util.task.RunnableVal;
|
import com.plotsquared.core.util.task.RunnableVal;
|
||||||
import com.plotsquared.core.util.task.TaskManager;
|
import com.plotsquared.core.util.task.TaskManager;
|
||||||
import net.kyori.adventure.text.Component;
|
import net.kyori.adventure.text.minimessage.Template;
|
||||||
import net.kyori.adventure.text.minimessage.tag.Tag;
|
|
||||||
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
|
|
||||||
import org.checkerframework.checker.nullness.qual.NonNull;
|
import org.checkerframework.checker.nullness.qual.NonNull;
|
||||||
|
|
||||||
import java.net.URL;
|
import java.net.URL;
|
||||||
@ -82,7 +80,7 @@ public class SchematicCmd extends SubCommand {
|
|||||||
if (args.length < 1) {
|
if (args.length < 1) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("commandconfig.command_syntax"),
|
TranslatableCaption.of("commandconfig.command_syntax"),
|
||||||
TagResolver.resolver("value", Tag.inserting(Component.text("Possible values: save, paste, exportall, list")))
|
Template.of("value", "Possible values: save, paste, exportall, list")
|
||||||
);
|
);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
@ -92,20 +90,14 @@ public class SchematicCmd extends SubCommand {
|
|||||||
if (!Permissions.hasPermission(player, Permission.PERMISSION_SCHEMATIC_PASTE)) {
|
if (!Permissions.hasPermission(player, Permission.PERMISSION_SCHEMATIC_PASTE)) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("permission.no_permission"),
|
TranslatableCaption.of("permission.no_permission"),
|
||||||
TagResolver.resolver(
|
Template.of("node", String.valueOf(Permission.PERMISSION_SCHEMATIC_PASTE))
|
||||||
"node",
|
|
||||||
Tag.inserting(Permission.PERMISSION_SCHEMATIC_PASTE)
|
|
||||||
)
|
|
||||||
);
|
);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
if (args.length < 2) {
|
if (args.length < 2) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("commandconfig.command_syntax"),
|
TranslatableCaption.of("commandconfig.command_syntax"),
|
||||||
TagResolver.resolver(
|
Template.of("value", "Possible values: save, paste, exportall, list")
|
||||||
"value",
|
|
||||||
Tag.inserting(Component.text("Possible values: save, paste, exportall, list"))
|
|
||||||
)
|
|
||||||
);
|
);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@ -146,10 +138,7 @@ public class SchematicCmd extends SubCommand {
|
|||||||
e.printStackTrace();
|
e.printStackTrace();
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("schematics.schematic_invalid"),
|
TranslatableCaption.of("schematics.schematic_invalid"),
|
||||||
TagResolver.resolver(
|
Template.of("reason", "non-existent url: " + location)
|
||||||
"reason",
|
|
||||||
Tag.inserting(Component.text("non-existent url: " + location))
|
|
||||||
)
|
|
||||||
);
|
);
|
||||||
SchematicCmd.this.running = false;
|
SchematicCmd.this.running = false;
|
||||||
return;
|
return;
|
||||||
@ -165,10 +154,7 @@ public class SchematicCmd extends SubCommand {
|
|||||||
SchematicCmd.this.running = false;
|
SchematicCmd.this.running = false;
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("schematics.schematic_invalid"),
|
TranslatableCaption.of("schematics.schematic_invalid"),
|
||||||
TagResolver.resolver(
|
Template.of("reason", "non-existent or not in gzip format")
|
||||||
"reason",
|
|
||||||
Tag.inserting(Component.text("non-existent or not in gzip format"))
|
|
||||||
)
|
|
||||||
);
|
);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@ -203,10 +189,7 @@ public class SchematicCmd extends SubCommand {
|
|||||||
player.sendMessage(TranslatableCaption.of("schematics.schematic_exportall_world_args"));
|
player.sendMessage(TranslatableCaption.of("schematics.schematic_exportall_world_args"));
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("commandconfig.command_syntax"),
|
TranslatableCaption.of("commandconfig.command_syntax"),
|
||||||
TagResolver.resolver(
|
Template.of("value", "Use /plot schematic exportall <area>")
|
||||||
"value",
|
|
||||||
Tag.inserting(Component.text("Use /plot schematic exportall <area>"))
|
|
||||||
)
|
|
||||||
);
|
);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@ -214,7 +197,7 @@ public class SchematicCmd extends SubCommand {
|
|||||||
if (area == null) {
|
if (area == null) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("errors.not_valid_plot_world"),
|
TranslatableCaption.of("errors.not_valid_plot_world"),
|
||||||
TagResolver.resolver("value", Tag.inserting(Component.text(args[1])))
|
Template.of("value", args[1])
|
||||||
);
|
);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@ -223,7 +206,7 @@ public class SchematicCmd extends SubCommand {
|
|||||||
player.sendMessage(TranslatableCaption.of("schematic.schematic_exportall_world"));
|
player.sendMessage(TranslatableCaption.of("schematic.schematic_exportall_world"));
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("commandconfig.command_syntax"),
|
TranslatableCaption.of("commandconfig.command_syntax"),
|
||||||
TagResolver.resolver("value", Tag.inserting(Component.text("Use /plot sch exportall <area>")))
|
Template.of("value", "Use /plot sch exportall <area>")
|
||||||
);
|
);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@ -237,7 +220,7 @@ public class SchematicCmd extends SubCommand {
|
|||||||
player.sendMessage(TranslatableCaption.of("schematics.schematic_exportall_started"));
|
player.sendMessage(TranslatableCaption.of("schematics.schematic_exportall_started"));
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("schematics.plot_to_schem"),
|
TranslatableCaption.of("schematics.plot_to_schem"),
|
||||||
TagResolver.resolver("amount", Tag.inserting(Component.text(plots.size())))
|
Template.of("amount", String.valueOf(plots.size()))
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -245,10 +228,7 @@ public class SchematicCmd extends SubCommand {
|
|||||||
if (!Permissions.hasPermission(player, Permission.PERMISSION_SCHEMATIC_SAVE)) {
|
if (!Permissions.hasPermission(player, Permission.PERMISSION_SCHEMATIC_SAVE)) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("permission.no_permission"),
|
TranslatableCaption.of("permission.no_permission"),
|
||||||
TagResolver.resolver(
|
Template.of("node", String.valueOf(Permission.PERMISSION_SCHEMATIC_SAVE))
|
||||||
"node",
|
|
||||||
Tag.inserting(Permission.PERMISSION_SCHEMATIC_SAVE)
|
|
||||||
)
|
|
||||||
);
|
);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@ -291,22 +271,19 @@ public class SchematicCmd extends SubCommand {
|
|||||||
if (!Permissions.hasPermission(player, Permission.PERMISSION_SCHEMATIC_LIST)) {
|
if (!Permissions.hasPermission(player, Permission.PERMISSION_SCHEMATIC_LIST)) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("permission.no_permission"),
|
TranslatableCaption.of("permission.no_permission"),
|
||||||
TagResolver.resolver(
|
Template.of("node", String.valueOf(Permission.PERMISSION_SCHEMATIC_LIST))
|
||||||
"node",
|
|
||||||
Tag.inserting(Permission.PERMISSION_SCHEMATIC_LIST)
|
|
||||||
)
|
|
||||||
);
|
);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
final String string = StringMan.join(this.schematicHandler.getSchematicNames(), "$2, $1");
|
final String string = StringMan.join(this.schematicHandler.getSchematicNames(), "$2, $1");
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("schematics.schematic_list"),
|
TranslatableCaption.of("schematics.schematic_list"),
|
||||||
TagResolver.resolver("list", Tag.inserting(Component.text(string)))
|
Template.of("list", string)
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
default -> player.sendMessage(
|
default -> player.sendMessage(
|
||||||
TranslatableCaption.of("commandconfig.command_syntax"),
|
TranslatableCaption.of("commandconfig.command_syntax"),
|
||||||
TagResolver.resolver("value", Tag.inserting(Component.text("Possible values: save, paste, exportall, list")))
|
Template.of("value", "Possible values: save, paste, exportall, list")
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
|
|||||||
@ -47,9 +47,7 @@ import com.sk89q.worldedit.function.pattern.Pattern;
|
|||||||
import com.sk89q.worldedit.world.block.BlockCategory;
|
import com.sk89q.worldedit.world.block.BlockCategory;
|
||||||
import com.sk89q.worldedit.world.block.BlockType;
|
import com.sk89q.worldedit.world.block.BlockType;
|
||||||
import com.sk89q.worldedit.world.block.BlockTypes;
|
import com.sk89q.worldedit.world.block.BlockTypes;
|
||||||
import net.kyori.adventure.text.Component;
|
import net.kyori.adventure.text.minimessage.Template;
|
||||||
import net.kyori.adventure.text.minimessage.tag.Tag;
|
|
||||||
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
|
|
||||||
import org.checkerframework.checker.nullness.qual.NonNull;
|
import org.checkerframework.checker.nullness.qual.NonNull;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
@ -132,7 +130,7 @@ public class Set extends SubCommand {
|
|||||||
}
|
}
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("invalid.component_illegal_block"),
|
TranslatableCaption.of("invalid.component_illegal_block"),
|
||||||
TagResolver.resolver("value", Tag.inserting(Component.text(forbiddenType)))
|
Template.of("value", forbiddenType)
|
||||||
);
|
);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
@ -144,10 +142,7 @@ public class Set extends SubCommand {
|
|||||||
if (!Permissions.hasPermission(player, Permission.PERMISSION_SET_COMPONENT.format(component))) {
|
if (!Permissions.hasPermission(player, Permission.PERMISSION_SET_COMPONENT.format(component))) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("permission.no_permission"),
|
TranslatableCaption.of("permission.no_permission"),
|
||||||
TagResolver.resolver(
|
Template.of("node", Permission.PERMISSION_SET_COMPONENT.format(component))
|
||||||
"node",
|
|
||||||
Tag.inserting(Component.text(Permission.PERMISSION_SET_COMPONENT.format(component)))
|
|
||||||
)
|
|
||||||
);
|
);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@ -170,7 +165,7 @@ public class Set extends SubCommand {
|
|||||||
plot.removeRunning();
|
plot.removeRunning();
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
TranslatableCaption.of("working.component_complete"),
|
TranslatableCaption.of("working.component_complete"),
|
||||||
TagResolver.resolver("plot", Tag.inserting(Component.text(plot.getId().toString())))
|
Template.of("plot", plot.getId().toString())
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
if (Settings.QUEUE.NOTIFY_PROGRESS) {
|
if (Settings.QUEUE.NOTIFY_PROGRESS) {
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user