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 0.100.1.3 #5

Merged
merged 75 commits into from
Jan 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
75 commits
Select commit Hold shift + click to select a range
f977557
- Add option to prevent players depositing/withdrawing in their
LlmDl Jan 4, 2024
501beea
Improve last commit's error messaging to match the new rule.
LlmDl Jan 4, 2024
b5e3563
- Fix plots not losing their trusted residents when the owner of the
LlmDl Jan 4, 2024
01c63d1
New Crowdin updates (#7160)
LlmDl Jan 4, 2024
6e4c0f2
- Make /ta town new [townname] bypass the proximity/claiming rules.
LlmDl Jan 4, 2024
cad326f
- Fix outsiders being charged money for plotgroups they cannot
LlmDl Jan 4, 2024
f122c95
- Fix non-standard minecarts being unprotected.
LlmDl Jan 4, 2024
7ed7313
- Hide /ta ? from the /towny ? screen when players are not admins.
LlmDl Jan 6, 2024
95947d4
- Add /t create and /n create tab completions.
LlmDl Jan 6, 2024
7b4d856
Remove unneeded deprecation warning.
LlmDl Jan 6, 2024
415f904
Render border particles under leaves.
LlmDl Jan 6, 2024
76014b7
Merge pull request #7170 from TownyAdvanced/feat/border_particles_ren…
LlmDl Jan 7, 2024
90f895b
- Render border particles under leaves.
LlmDl Jan 7, 2024
1e3ed43
- Fix PlayerChangePlotEvent reactions running too early.
LlmDl Jan 7, 2024
4bdcee5
Add an isOverClaim property to TownClaimEvent and TownUnclaimEvent (#…
jwkerr Jan 7, 2024
ecedd1d
- Add an isOverClaim property to TownClaimEvent and TownUnclaimEvent,
LlmDl Jan 7, 2024
08d243f
New Crowdin updates (#7167)
LlmDl Jan 7, 2024
bd34127
- Refactor PermHud class.
LlmDl Jan 7, 2024
7a5b3ae
- Fix jail bail amounts not being applied correctly.
LlmDl Jan 8, 2024
641f4c9
- Fix a couple places where the adminbypass mode would not stop admins
LlmDl Jan 8, 2024
2d4f713
- API: add TownIsTownOverClaimedEvent.
LlmDl Jan 8, 2024
6e9c4ba
- Add plot costs and plot group information to the /plot perm hud when
LlmDl Jan 8, 2024
be2ce23
Prevent the drops that spawn from problem blocks which can be duped i…
LlmDl Jan 8, 2024
4b3c645
Add claiming particles. (#7171)
LlmDl Jan 8, 2024
1bc2d6a
- Prevent the drops that spawn from problem blocks which can be duped
LlmDl Jan 8, 2024
7510c70
Command Addon API for /town buy (#7177)
lexiccn Jan 9, 2024
eb36c8c
- API: New CommandAddonAPI for /town buy, courtesy of lexiccn with
LlmDl Jan 9, 2024
64fb8ed
Bump com.github.seeseemelk:MockBukkit-v1.20 from 3.58.0 to 3.60.0 (#7…
dependabot[bot] Jan 9, 2024
65423fc
Bump net.coreprotect:coreprotect from 22.2 to 22.3 (#7174)
dependabot[bot] Jan 9, 2024
c140cbb
- Bump com.github.seeseemelk:MockBukkit-v1.20 from 3.58.0 to 3.60.0.
LlmDl Jan 9, 2024
397350a
New Crowdin updates (#7172)
LlmDl Jan 9, 2024
094075e
Show help when we cannot match a /t buy subcommand.
LlmDl Jan 9, 2024
018b43a
Update default dev mode name.
LlmDl Jan 9, 2024
5da1432
- Small refactor to the parseJailCommand class.
LlmDl Jan 9, 2024
9bf3935
- Refactor the parseTownClaimCommand method.
LlmDl Jan 9, 2024
b851fe0
- Fix new outlaws being teleported when they have in fact left the
LlmDl Jan 9, 2024
d216eba
- Fix residents being able to see vanished online players who are in
LlmDl Jan 9, 2024
24f5345
- Refactor the townRank method.
LlmDl Jan 9, 2024
78bbf07
- Add claiming particle effect when new towns are made.
LlmDl Jan 9, 2024
cad7580
Make showing claiming particles on new town obey the config setting.
LlmDl Jan 10, 2024
5672b85
New Crowdin updates (#7178)
LlmDl Jan 10, 2024
74e63dd
- Bump version for release.
LlmDl Jan 10, 2024
4b1c485
Refactor town join command, which was not able to be run from the (#7…
LlmDl Jan 10, 2024
9e0c53d
Refactor the TownyWorldCommand. (#7181)
LlmDl Jan 10, 2024
31f72fa
Refactor townAddResident. (#7180)
LlmDl Jan 10, 2024
674a6ee
Refactor townSet and the subcommands. (#7179)
LlmDl Jan 10, 2024
6adb90c
Refactor the plot claim task to not be a mess. (#7166)
LlmDl Jan 10, 2024
1ec4de0
- Refactor parts of the TownCommand class:
LlmDl Jan 10, 2024
759e349
Add method to ProximityUtil to determine ability to claim land, (#7151)
LlmDl Jan 10, 2024
4cfbb93
- API: Added new methods to TownyAPI class to determine claim-ability:
LlmDl Jan 10, 2024
2747668
- Create Town object methods for determining if a town has enough
LlmDl Jan 10, 2024
6b4fa13
- Remove some verbose boolean returns.
LlmDl Jan 10, 2024
60a6c50
Swap l for L.
LlmDl Jan 10, 2024
cd9da79
Remove bonus ;
LlmDl Jan 10, 2024
85de0c3
- Fix issues discovered in HealthRegenTimerTask where saturation gain
LlmDl Jan 11, 2024
b7e4842
Update the town kicking method, and decouple the admin version of tow…
LlmDl Jan 11, 2024
c6a4115
- Refactor the TownCommand's town kicking method, and decouple the
LlmDl Jan 11, 2024
08df609
New Crowdin updates (#7187)
LlmDl Jan 11, 2024
e1f2574
Errant ;
LlmDl Jan 11, 2024
12899c3
- Fix non-mayors being able to add non-kickable-ranked residents as
LlmDl Jan 12, 2024
4f08eae
- Refactor MapHUD class.
LlmDl Jan 12, 2024
d189e93
- Refactor onEntityChangeBlockEvent method.
LlmDl Jan 12, 2024
f17b801
Increase granularity of the getUUIDPercent() method.
LlmDl Jan 14, 2024
37fb72d
- Fix returning null in the relational placeholder code, returning the
LlmDl Jan 15, 2024
eabbc6e
- Refactor some of TownyFormatter's methods, mainly moving some
LlmDl Jan 15, 2024
16d1727
- Move max allies test into NationUtil.
LlmDl Jan 15, 2024
02099af
- Add more nation-joining tests to the NationUtil.
LlmDl Jan 15, 2024
ccfca86
Refactor townAdd method to better handle adding and revoking invites.…
LlmDl Jan 16, 2024
5916aab
- Refactor townAdd method to better handle adding and revoking
LlmDl Jan 16, 2024
0d14db8
Add a configurable amount of bonus townblocks given to new towns. (#7…
LlmDl Jan 16, 2024
a1043c7
New Crowdin updates (#7189)
LlmDl Jan 16, 2024
0aca4f1
- New Config Option: claiming.new_town_bonus_claims
LlmDl Jan 16, 2024
18ce06b
Refactor max residents per town code into TownUtil accessed via a new…
LlmDl Jan 18, 2024
838339f
Bump org.apache.maven.plugins:maven-surefire-plugin from 3.2.3 to 3.2…
dependabot[bot] Jan 18, 2024
a002e07
- Refactor max residents per town code into TownUtil accessed via a
LlmDl Jan 18, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ ___

<table>
<tr><th> Minecraft Version</th><th>Towny Version</th></tr>
<tr align=center><td> MC 1.20.* </td><td rowspan=5> Use <a href=https://github.com/TownyAdvanced/Towny/releases/tag/0.100.0.0>0.100.0.0</a> or the <a href=https://github.com/TownyAdvanced/Towny/releases>the Latest Pre-Release.</a></td>
<tr align=center><td> MC 1.20.* </td><td rowspan=5> Use <a href=https://github.com/TownyAdvanced/Towny/releases/tag/0.100.1.0>0.100.1.0</a> or the <a href=https://github.com/TownyAdvanced/Towny/releases>the Latest Pre-Release.</a></td>
<tr align=center><td> MC 1.19.* </td>
<tr align=center><td> MC 1.18.* </td>
<tr align=center><td> MC 1.17.* </td>
Expand Down
10 changes: 5 additions & 5 deletions Towny/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

<artifactId>towny</artifactId>
<packaging>jar</packaging>
<version>0.100.0.18</version>
<version>0.100.1.4</version>

<licenses>
<license>
Expand Down Expand Up @@ -84,7 +84,7 @@
<dependency>
<groupId>org.spigotmc</groupId>
<artifactId>spigot-api</artifactId>
<version>1.20.2-R0.1-SNAPSHOT</version>
<version>1.20.4-R0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -250,13 +250,13 @@
<dependency>
<groupId>net.coreprotect</groupId>
<artifactId>coreprotect</artifactId>
<version>22.2</version>
<version>22.3</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.github.seeseemelk</groupId>
<artifactId>MockBukkit-v1.20</artifactId>
<version>3.58.0</version>
<version>3.65.0</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down Expand Up @@ -472,7 +472,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.2.3</version>
<version>3.2.5</version>
<configuration>
<skipTests>${skipTests}</skipTests>
</configuration>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -492,6 +492,11 @@ public enum ConfigNodes {
GTOWN_SETTINGS_REGEN_ENABLE(
"global_town_settings.health_regen.enable",
"true"),
GTOWN_SETTINGS_REGEN_PREVENT_SATURATION_LOSS(
"global_town_settings.saturation_regen.also_prevent_saturation_loss",
"true",
"",
"# When true players cannot become hungrier when in their own or an allied town."),

GTOWN_SETTINGS_PVP_COOLDOWN_TIMER(
"global_town_settings.pvp_cooldown_time",
Expand Down Expand Up @@ -985,6 +990,12 @@ public enum ConfigNodes {
"# The maximum townblocks available to a town is (numResidents * ratio).",
"# Setting this value to 0 will instead use the level based jump values determined in the town level config.",
"# Setting this to -1 will result in every town having unlimited claims."),
CLAIMING_DEF_BONUS_CLAIMS(
"claiming.new_town_bonus_claims",
"0",
"",
"# An amount of additional townblocks that a town will receive when it is first created, in addition to any amount given via the town_block_ratio or town_levels.",
"# As an example: This can be used to add 10 townblocks to a town when it is made so the borders can be grown a bit more before the mayor has to seek out residents."),
CLAIMING_TOWN_BLOCK_LIMIT(
"claiming.town_block_limit",
"0",
Expand All @@ -1000,6 +1011,11 @@ public enum ConfigNodes {
"# at the cost of more work setting up. Also, extremely small values will render the caching done useless.",
"# Each cell is (town_block_size * town_block_size * height-of-the-world) in size, with height-of-the-world",
"# being from the bottom to the top of the build-able world."),
CLAIMING_SHOW_CLAIM_PARTICLES(
"claiming.show_claiming_particles",
"true",
"",
"# When false players will not see the particle flood effect when they claim townblocks."),
CLAIMING_MIN_ADJACENT_BLOCKS(
"claiming.min_adjacent_blocks",
"-1",
Expand Down Expand Up @@ -1553,7 +1569,7 @@ public enum ConfigNodes {
"",
"# Spams the player named in dev_name with all messages related to towny."),
PLUGIN_DEV_MODE_ENABLE("plugin.dev_mode.enable", "false"),
PLUGIN_DEV_MODE_DEV_NAME("plugin.dev_mode.dev_name", "ElgarL"),
PLUGIN_DEV_MODE_DEV_NAME("plugin.dev_mode.dev_name", "LlmDl"),
PLUGIN_RESET_LOG_ON_BOOT(
"plugin.reset_log_on_boot",
"true",
Expand Down Expand Up @@ -3025,6 +3041,12 @@ public enum ConfigNodes {
"",
"# If true players will only be able to use /t deposit, /t withdraw, /n deposit & /n withdraw while inside bank plots belonging to the town or nation capital respectively.",
"# Home plots will also allow deposit and withdraw commands."),
BANK_BANK_PLOTS_STOP_HOME_BLOCK_BEING_USED(
"bank.do_homeblocks_not_work_when_a_town_has_bank_plots",
"false",
"",
"# If true, towns which have one or more bank plots will no longer be able to use their homeblock for withdraw/depositing.",
"# Requires the above is_banking_limited_to_bank_plots to be true as well."),

TOWN_RUINING_HEADER("town_ruining", "", "", "",
"############################################################",
Expand Down
34 changes: 34 additions & 0 deletions Towny/src/main/java/com/palmergames/bukkit/towny/TownyAPI.java
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import com.palmergames.bukkit.towny.permissions.PermissionNodes;
import com.palmergames.bukkit.towny.tasks.TeleportWarmupTimerTask;
import com.palmergames.bukkit.towny.utils.CombatUtil;
import com.palmergames.bukkit.towny.utils.ProximityUtil;
import com.palmergames.bukkit.util.BukkitTools;
import com.palmergames.util.MathUtil;

Expand Down Expand Up @@ -932,4 +933,37 @@ public void testPlotOwnerOrThrow(@NotNull Resident resident, @NotNull TownBlock
// Nothing to complain about, this resident is the owner of the townblock's town or an admin.
}
}

/**
* Test a WorldCoord to see if Towny would allow the area to be claimed by the
* given town.
*
* @param town Town who would become owner of the land.
* @param coordToClaim WorldCoord which is to be claimed.
* @param outpost whether this would be an outpost, with no connected town
* land.
* @param newTown whether this would be a brand new town claiming their
* first plot.
* @throws TownyException thrown when Towny would not allow the claim, with
* message for the reason why.
*/
public void testTownClaimOrThrow(Town town, WorldCoord coordToClaim, boolean outpost, boolean newTown) throws TownyException {
if (newTown)
ProximityUtil.allowTownHomeBlockOrThrow(coordToClaim.getTownyWorld(), coordToClaim, town, true);

ProximityUtil.allowTownClaimOrThrow(coordToClaim.getTownyWorld(), coordToClaim, town, outpost);
}

/**
* Test a WorldCoord to see if Towny would allow the area to be unclaimed by the
* given town.
*
* @param town Town that would unclaim the land.
* @param coordToUnclaim WorldCoord which is to be unclaimed.
* @throws TownyException thrown when Towny would not allow the unclaim, with
* message for the reason why.
*/
public void testTownUnclaimOrThrow(Town town, WorldCoord coordToUnclaim) throws TownyException {
ProximityUtil.allowTownUnclaimOrThrow(coordToUnclaim.getTownyWorld(), coordToUnclaim, town);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ public enum CommandType {
NATION_SET,
NATION_TOGGLE,
TOWN,
TOWN_BUY,
TOWN_SET,
TOWN_TOGGLE,
PLOT,
Expand Down
Loading