Expand City and bound plot search

This commit is contained in:
2026-09-27 08:40:04 -07:00
parent 99f6195542
commit 4e459ec9fa
8 changed files with 244 additions and 17 deletions

View File

@@ -0,0 +1,44 @@
/*
This file is part of Metropolis.
Metropolis is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
Metropolis is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Affero General Public License for more details.
You should have received a copy of the GNU Affero General Public License
along with Metropolis. If not, see <https://www.gnu.org/licenses/agpl-3.0.txt>.
*/
package com.majinnaibu.bukkitplugins.metropolis;
import static org.junit.jupiter.api.Assertions.assertEquals;
import java.util.List;
import org.junit.jupiter.api.Test;
class CityRegionBoundsTest {
@Test
void expandsExistingCityToIncludeElevatedHomesAndSpawnWithoutShrinking() {
Cuboid existingCity = new Cuboid(-20, 62, -20, 20, 71, 20);
Cuboid requestedCity = new Cuboid(-40, 62, -40, 40, 71, 40);
Cuboid elevatedHome = new Cuboid(10, 104, 10, 41, 113, 41);
Cuboid spawn = new Cuboid(2, 62, 2, 69, 81, 69);
Cuboid expanded =
CityRegionBounds.expandToContain(existingCity, requestedCity, List.of(elevatedHome, spawn));
assertEquals(-40, expanded.minX);
assertEquals(62, expanded.minY);
assertEquals(-40, expanded.minZ);
assertEquals(69, expanded.maxX);
assertEquals(113, expanded.maxY);
assertEquals(69, expanded.maxZ);
}
}

View File

@@ -0,0 +1,45 @@
/*
This file is part of Metropolis.
Metropolis is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
Metropolis is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Affero General Public License for more details.
You should have received a copy of the GNU Affero General Public License
along with Metropolis. If not, see <https://www.gnu.org/licenses/agpl-3.0.txt>.
*/
package com.majinnaibu.bukkitplugins.metropolis;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
import org.junit.jupiter.api.Test;
class PlotWorldBorderBoundsTest {
@Test
void searchBoundFollowsTheWorldBorderInsteadOfAnArbitraryRingCount() {
int maximumRing = PlotWorldBorderBounds.maximumSearchRing(60_000_000, 0, 0, 0, 0, 36, 36, 1);
assertTrue(maximumRing > 256);
}
@Test
void accountsForAnOffsetBorderCenterAndMultiplier() {
int maximumRing = PlotWorldBorderBounds.maximumSearchRing(512, 100, -100, 64, -32, 36, 34, 2);
assertTrue(maximumRing > 10);
}
@Test
void requiresTheCompleteGridFootprintInsideTheBorder() {
assertTrue(PlotWorldBorderBounds.contains(new Cuboid(-9, 0, -9, 9, 10, 9), 20, 0, 0));
assertFalse(PlotWorldBorderBounds.contains(new Cuboid(-11, 0, -9, 9, 10, 9), 20, 0, 0));
}
}