Decouple island location from island center. #1659

tastybento · 2021-01-23T19:21:49Z

This PR enables the protection area to move anywhere within the island boundaries. This is required to enable a new game mode I'm working on where the island protection zone starts small and increases based on achievements/challenges. I need a way to move the protection zone anywhere within the island boundaries and not be locked to the center.

I added an admin command to enable manual setting of the island location. I also expanded the info command to show the island location.

In summary, the island location is the center of the protection area. It is usually the center of the island but can be moved. The protection area will not go outside the island range. However, as it is possible for the island location to be right on the edge of the island range, the protection range value can now be up to the diameter of the island, i.e., 2 * island range.

This enables the protection area to move anywhere within the island boundaries

BONNe · 2021-01-23T19:25:42Z

:D Nice...

BONNe · 2021-01-23T19:29:36Z

src/main/java/world/bentobox/bentobox/listeners/JoinLeaveListener.java

-                // Range cannot be greater than the island distance
-                range = Math.min(range, plugin.getIWM().getIslandDistance(island.getWorld()));
+                // Range cannot be greater than the island distance * 2
+                range = Math.min(range, 2 * plugin.getIWM().getIslandDistance(island.getWorld()));


I am not sure if this is a correct way how to do it.

I would prefer to calculate by offset from the actual island center.

The protection range is now relative to the protection center location, so if the player is to be given the ability to use all of their island area, then their protection range must be able to go up to 2x island distance away from that point.

For example:

Island range = 400
Island center = 0,0
Island location = 399, 0
Island protection range = 800

This last value will enable them to operate anywhere with all of the island space.

tastybento · 2021-01-23T21:17:31Z

I still need to fix the tests, but I don't expect any issue there.

Poslovitch · 2021-01-23T21:28:05Z

However, as it is possible for the island location to be right on the edge of the island range, the protection range value can now be up to the diameter of the island, i.e., 2 * island range.

I didn't review the PR yet, but want to discuss what this implies.

Will the island protection zone "bleed" into the "inter-island space" if the island location is located right at the edge of the island range ?

Could you please elaborate what the use case would be for this ?

How could we make sure this does not get confusing ? I'm already a tad confused by the island center / island location / protection range / island range stuff. Who's who ? 🙂

Poslovitch · 2021-01-29T10:04:13Z

@tastybento Could you please check #1659 (comment) ?

tastybento · 2021-01-29T15:27:21Z

Will the island protection zone "bleed" into the "inter-island space" if the island location is located right at the edge of the island range ?

No. The protection zone is all in the Island class if you want to check it.

Could you please elaborate what the use case would be for this ?

In the new game mode you start with a tiny island, ie., a tiny protection area. There is a game mechanic where you can throw an enderpearl to move your island to another location to obtain better resources. A player can move the island anywhere within the island distance multiple times. The protection zone can grow over time so it would be possible for a player to move the location to a spot near the edge of their island maximum.

All that is really happening is that we are now able to move the protection area around inside the island space instead of having it locked to the center point.

How could we make sure this does not get confusing ? I'm already a tad confused by the island center / island location / protection range / island range stuff. Who's who ? 🙂

This is primarily for programmers, but it is logical:

Island center - the center of the island space. Never moves. It's the dot on the grid.
Island range - the distance between islands.
Island location - the spot inside the island range where the island actually is. This may be the same as the island center but does not have to be.
Protection zone - the area around the island's location that is protected. Defined by the protection range. The protection zone never extends further than the island range.

A diagram would make this easier to understand so that could be added to the docs.

tastybento · 2021-01-29T16:21:55Z

One change to make it clearer could be to use protectionCenter so it would be getProtectionCenter() instead of getLocation().

tastybento · 2021-02-03T01:17:56Z

@Poslovitch Any thoughts on the above? ^^^

The speed option was doing nothing except causing repeated actions on the same chunks.

Conflicts: src/main/java/world/bentobox/bentobox/util/DeleteIslandChunks.java

Poslovitch · 2021-02-07T16:56:07Z

One change to make it clearer could be to use protectionCenter so it would be getProtectionCenter() instead of getLocation().

I agree to that.

Please also resolve the conflict 😉

Poslovitch · 2021-02-07T16:59:50Z

And thanks for your explanation. They indeed make the PR easier to understand. It might be worth creating a page on the Wiki for this. We have tons of things to explain about that already, and this new "layer" is surely going to confuse admins.

Poslovitch

Everything looks good. Do not forget to rename the placeholders and the commands appropriately, to keep up with the suggested change.

Thanks for your work, and sorry for the time it took me to finally leave a review.

Added logic to expand the deletion area based on moving the island protection location and range instead of just deleting everything. This will keep deletion time to a minimum for BSkyBlock, etc.

Conflicts resolved: src/test/java/world/bentobox/bentobox/listeners/PortalTeleportationListenerTest.java

tastybento added 5 commits January 23, 2021 11:00

Decouple island location from island center.

3ea4b58

This enables the protection area to move anywhere within the island boundaries

Paste island at island location.

20ba4b8

Move visitors to the island location

46e223a

Added island location placeholders

d95c318

Use island location instead of island center

bfb50ae

tastybento added the Type: Enhancement Improvement or modification which is usually a new feature. label Jan 23, 2021

tastybento requested review from BONNe and Poslovitch January 23, 2021 19:21

BONNe reviewed Jan 23, 2021

View reviewed changes

tastybento added 2 commits January 23, 2021 14:01

Fix tests

1386757

Allow radius 1 islands.

4f435de

BONNe mentioned this pull request Jan 30, 2021

Blueprint island offset #1667

Open

tastybento added 2 commits January 30, 2021 10:20

Correct admin range set limit

b18df47

Debug in progress

88f0029

tastybento added 3 commits February 5, 2021 18:40

Fix island deletion.

77ae27e

The speed option was doing nothing except causing repeated actions on the same chunks.

Soft depend for WorldGeneratorApi for Boxed game mode

6304d2c

Merge remote-tracking branch 'origin/develop' into island_location

a076393

Conflicts: src/main/java/world/bentobox/bentobox/util/DeleteIslandChunks.java

Poslovitch added the Status: Need review Waiting for a review to be made on this Pull Request label Feb 7, 2021

Poslovitch added this to the 1.16.0 - Home sweet home... milestone Feb 7, 2021

Poslovitch approved these changes Feb 7, 2021

View reviewed changes

Poslovitch removed the Status: Need review Waiting for a review to be made on this Pull Request label Feb 7, 2021

Poslovitch added the Status: Need revision Waiting for a revision to be made on this Pull Request label Feb 7, 2021

tastybento added 3 commits February 7, 2021 11:28

Changed to "protectionCenter".

1600618

Added logic to expand the deletion area based on moving the island protection location and range instead of just deleting everything. This will keep deletion time to a minimum for BSkyBlock, etc.

Merge branch 'develop' into island_location

a321556

Conflicts resolved: src/test/java/world/bentobox/bentobox/listeners/PortalTeleportationListenerTest.java

Fix tests.

ad3c7d1

tastybento removed the Status: Need revision Waiting for a revision to be made on this Pull Request label Feb 13, 2021

tastybento merged commit 1d9ce72 into develop Feb 13, 2021

tastybento deleted the island_location branch February 13, 2021 18:19

dependabot bot mentioned this pull request Mar 8, 2021

Bump bentobox from 1.15.5 to 1.16.0 xHexed/Oregen3#6

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Decouple island location from island center. #1659

Decouple island location from island center. #1659

tastybento commented Jan 23, 2021

BONNe commented Jan 23, 2021

BONNe Jan 23, 2021

tastybento Jan 30, 2021

tastybento commented Jan 23, 2021

Poslovitch commented Jan 23, 2021

Poslovitch commented Jan 29, 2021

tastybento commented Jan 29, 2021

tastybento commented Jan 29, 2021

tastybento commented Feb 3, 2021

Poslovitch commented Feb 7, 2021

Poslovitch commented Feb 7, 2021

Poslovitch left a comment

Decouple island location from island center. #1659

Decouple island location from island center. #1659

Conversation

tastybento commented Jan 23, 2021

BONNe commented Jan 23, 2021

BONNe Jan 23, 2021

Choose a reason for hiding this comment

tastybento Jan 30, 2021

Choose a reason for hiding this comment

tastybento commented Jan 23, 2021

Poslovitch commented Jan 23, 2021

Poslovitch commented Jan 29, 2021

tastybento commented Jan 29, 2021

tastybento commented Jan 29, 2021

tastybento commented Feb 3, 2021

Poslovitch commented Feb 7, 2021

Poslovitch commented Feb 7, 2021

Poslovitch left a comment

Choose a reason for hiding this comment