Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to 100.0.11 #1

Merged
merged 27 commits into from
Dec 21, 2023
Merged

Update to 100.0.11 #1

merged 27 commits into from
Dec 21, 2023

Conversation

CorruptedGreed
Copy link
Member

Description:


New Nodes/Commands/ConfigOptions:


Relevant Towny Issue ticket:


  • I have tested this pull request for defects on a server.

By making this pull request, I represent that I have the right to waive copyright and related rights to my contribution, and agree that all copyright and related rights in my contributions are waived, and I acknowledge that the TownyAdvanced organization has the copyright to use and modify my contribution under the Towny License for perpetuity.

dependabot bot and others added 27 commits November 27, 2023 17:19
Bumps net.tnemc:Reserve from 0.1.5.0 to 0.1.5.4.

---
updated-dependencies:
- dependency-name: net.tnemc:Reserve
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Bumps org.apache.logging.log4j:log4j-core from 2.21.1 to 2.22.0.

---
updated-dependencies:
- dependency-name: org.apache.logging.log4j:log4j-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Bumps [org.apache.maven.plugins:maven-javadoc-plugin](https://github.com/apache/maven-javadoc-plugin) from 3.6.2 to 3.6.3.
- [Release notes](https://github.com/apache/maven-javadoc-plugin/releases)
- [Commits](apache/maven-javadoc-plugin@maven-javadoc-plugin-3.6.2...maven-javadoc-plugin-3.6.3)

---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-javadoc-plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Bumps [com.github.seeseemelk:MockBukkit-v1.20](https://github.com/MockBukkit/MockBukkit) from 3.47.0 to 3.56.0.
- [Commits](MockBukkit/MockBukkit@v3.47.0...v3.56.0)

---
updated-dependencies:
- dependency-name: com.github.seeseemelk:MockBukkit-v1.20
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
* New translations en-us.yml (Chinese Simplified)

* New translations en-us.yml (Classical Chinese)

* New translations en-us.yml (Ukrainian)

* New translations en-us.yml (Ukrainian)

* New translations en-us.yml (Chinese Traditional)

* New translations en-us.yml (Chinese Traditional)

* New translations en-us.yml (Chinese Traditional)

* New translations en-us.yml (Ukrainian)

* New translations en-us.yml (Vietnamese)

* New translations en-us.yml (Chinese Traditional)

* New translations en-us.yml (Ukrainian)

* New translations en-us.yml (Ukrainian)

* New translations en-us.yml (Ukrainian)

* New translations en-us.yml (Lithuanian)
…he.logging.log4j-log4j-core-2.22.0

Bump org.apache.logging.log4j:log4j-core from 2.21.1 to 2.22.0
…he.maven.plugins-maven-javadoc-plugin-3.6.3

Bump org.apache.maven.plugins:maven-javadoc-plugin from 3.6.2 to 3.6.3
…ub.seeseemelk-MockBukkit-v1.20-3.56.0

Bump com.github.seeseemelk:MockBukkit-v1.20 from 3.47.0 to 3.56.0
…c-Reserve-0.1.5.4

Bump net.tnemc:Reserve from 0.1.5.0 to 0.1.5.4
  - Bump org.apache.maven.plugins:maven-javadoc-plugin from 3.6.2 to
3.6.3.
  - Bump com.github.seeseemelk:MockBukkit-v1.20 from 3.47.0 to 3.56.0.
  - Bump net.tnemc:Reserve from 0.1.5.0 to 0.1.5.4.
    - A placeholder that shows how much a resident will pay daily in
taxes.
    - This number is the total of any town tax as well as any plot taxes
they owe.
    - Taxes owed are cached for a period of time using the config's
economy.bank_account_cache_timeou setting.
    - A placeholder that shows how much a resident will pay daily in
taxes, but unformatted, just a raw number.
* New translations en-us.yml (Lithuanian)

* New translations en-us.yml (Lithuanian)

* New translations en-us.yml (Lithuanian)

* New translations en-us.yml (Lithuanian)

* New translations en-us.yml (Lithuanian)

* New translations en-us.yml (Lithuanian)

* New translations en-us.yml (Lithuanian)

* New translations en-us.yml (Lithuanian)

* New translations en-us.yml (Lithuanian)

* New translations en-us.yml (Portuguese, Brazilian)

* New translations en-us.yml (Chinese Simplified)

* New translations en-us.yml (Chinese Simplified)

* New translations en-us.yml (Portuguese)

* New translations en-us.yml (Classical Chinese)
…ws. (#7122)

* Fix fire arrows lighting campfires when perms should be denied.

Closes #7120.

* Add campfires to blocks we care about, refactor things for readability.
    - A useful method that an Economy plugin can use in order to get the
correct UUID associated with Towny objects' economy accounts.
* Enhance Nation Requires Proximity Feature

Optionally, towns in a nation can grant nearby towns the ability to
bypass the proximity-to-the-nation-capital value.

Also Optionally, there can be a hard-cap on how far a town can be from
the nation capital, even when a nation-town is nearby, preventing
nations going "wide."

Renames/moves the config settings into the Global Nation Settings
section & migrates old configs' settings.

Adds a new ProximityUtil where all the heavy lifting is done.

Spruced up the code in the various methods that used the proximity
settings.

* Re-jiggers things to use recursion in order remove towns correctly.

Towns parsed over early could have been allowed to stay in the nation
because of a town which isn't removed until later.

This uses a while loop that runs until no further towns are removed, to
assure that the nation doesn't end up cut into two or more pieces
because of interior-towns being removed, while incorrectly allowing
far-away towns to remain in the nation.

* Account for change to ProximityUtil method in Town object.

* Make things a bit tidier.

* Fixes for problems found in testing.
* New translations en-us.yml (Spanish, Chile)

* New translations en-us.yml (Spanish, Chile)

* New translations en-us.yml (Ukrainian)

* New translations en-us.yml (German)

* New translations en-us.yml (German)

* New translations en-us.yml (Chinese Simplified)

* New translations en-us.yml (Chinese Simplified)
    - The Nations-require-proximity feature that makes Towns' homeblocks
stick close to their Nation's homeblock has had a major overhaul.
    - It is now possible for the towns within a nation to add more
distance to the normal proximity, allowing nations to "go wide".
    - This means that towns can be outside of the nation's homeblock
proximity as long as they are within a range of another of the nation's
towns' homeblocks.
    - Additionally it is possible to make a cap on just how far nations'
towns can boost that distance, with a new absolute cap on the proximity
to the nation's homeblock.
    - This is controlled with the following new config entries:
  - Moved Config Option: global_town_settings.nation_requires_proximity
-> global_nation_settings.proximity.nation_proximity_to_capital_city
    - Your config's setting value will be transferred to the new
location.
    - Default: 0.0
    - The maximum number of townblocks a town's homeblock can be away
from their nation capital's homeblock.
    - Automatically precludes towns from one world joining a nation in
another world.
    - If the number is 0, towns will not require a proximity to a
nation.
  - New Config Option:
global_nation_settings.proximity.nation_proximity_to_other_nation_towns
    - Default: 0.0
    - The maximum number of townblocks a town's homeblock can be away
from other towns's homeblocks in the nation.
    - This setting is only used when nation_proximity_to_capital_city is
above 0.
    - When used, and a town is out of range of their capital city, the
remaining towns in the nation will be parsed, if one of those
      towns' homeblocks is close enough to the town's homeblock, the
town can remain in the nation.
    - Leave this setting at 0.0 in order to de-activate nations' towns
granting further range for towns in the nation.
  - New Config Option:
global_nation_settings.proximity.absolute_distance_from_capital
    - Default: 0.0
    - The maximum number of townblocks a town's homeblock can be away
from their nation's capital's homeblock, when the town is
      being allowed to go further out from the capital because of the
nation_proximity_to_other_nation_towns setting above.
    - This setting is what will stop a nation being able to go
incredibly wide due to towns 'chaining' together.
    - This setting is only used when nation_proximity_to_capital_city is
above 0.
    - Leave this setting at 0.0 in order to allow nations to chain towns
together to go as wide as they like.
@Warriorrrr Warriorrrr merged commit 43a67cc into EarthMC:fork Dec 21, 2023
3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants