maj/Metropolis
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add upper-road stairwell generation

Browse Source
This commit is contained in:
Tom Hicks
2026-09-27 06:55:39 -07:00
parent 04a0c1d959
commit fd5bf785d3
9 changed files with 465 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

95
src/test/java/com/majinnaibu/bukkitplugins/metropolis/AvenueStairwayBuilderTest.java Normal file
View File

@@ -0,0 +1,95 @@
/*
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.assertNotNull;
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import java.util.HashMap;
import java.util.Map;
import com.majinnaibu.bukkitplugins.metropolis.AvenueStairwayLayout.Flight;
import com.majinnaibu.bukkitplugins.metropolis.AvenueStairwayLayout.Step;
import org.bukkit.Material;
import org.bukkit.World;
import org.bukkit.block.Block;
import org.bukkit.block.BlockFace;
import org.bukkit.block.data.Bisected;
import org.bukkit.block.data.type.Stairs;
import org.junit.jupiter.api.Test;
class AvenueStairwayBuilderTest {
@Test
void buildsAscendingAndInvertedStairsAndClearsOnlyThePlannedOpening() {
Cuboid plot = new Cuboid(2, 62, 2, 33, 71, 33);
Flight flight = AvenueStairwayLayout.forUpperRoad(plot, 4, 2, 62, 14, 3);
World world = mock(World.class);
Map<Step, Block> blocks = new HashMap<>();
Map<Step, Stairs> blockData = new HashMap<>();
when(world.getBlockAt(anyInt(), anyInt(), anyInt()))
.thenAnswer(
invocation -> {
Step position =
new Step(
invocation.getArgument(0),
invocation.getArgument(1),
invocation.getArgument(2));
return blocks.computeIfAbsent(
position,
ignored -> {
Block block = mock(Block.class);
Stairs stairs = mock(Stairs.class);
when(block.getBlockData()).thenReturn(stairs);
blockData.put(position, stairs);
return block;
});
});
AvenueStairwayBuilder.build(world, flight, Material.COBBLESTONE_STAIRS);
for (Step stair : flight.stairBlocks()) {
verify(blocks.get(stair)).setType(Material.COBBLESTONE_STAIRS, false);
}
for (Step backing : flight.invertedBackingBlocks()) {
verify(blocks.get(backing)).setType(Material.COBBLESTONE_STAIRS, false);
}
for (Step opening : flight.roadOpenings()) {
verify(blocks.get(opening)).setType(Material.AIR, false);
}
Step firstStair = flight.stairBlocks().getFirst();
Stairs firstStairData = blockData.get(firstStair);
assertNotNull(firstStairData);
verify(firstStairData).setFacing(BlockFace.SOUTH);
verify(firstStairData).setHalf(Bisected.Half.BOTTOM);
Step firstInvertedBacking = flight.invertedBackingBlocks().getFirst();
Stairs invertedBackingData = blockData.get(firstInvertedBacking);
assertNotNull(invertedBackingData);
verify(invertedBackingData).setFacing(BlockFace.NORTH);
verify(invertedBackingData).setHalf(Bisected.Half.TOP);
verify(world, never()).getBlockAt(anyInt(), eq(62), anyInt());
}
}

87
src/test/java/com/majinnaibu/bukkitplugins/metropolis/AvenueStairwayLayoutTest.java Normal file
View File

@@ -0,0 +1,87 @@
/*
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 static org.junit.jupiter.api.Assertions.assertTrue;
import java.util.List;
import org.junit.jupiter.api.Test;
class AvenueStairwayLayoutTest {
@Test
void centersStairsAcrossTheAvenueAndAlongThePlotLength() {
Cuboid plot = new Cuboid(2, 62, 2, 33, 71, 33);
List<AvenueStairwayLayout.Step> steps =
AvenueStairwayLayout.centeredEastAvenue(plot, 4, 2, 62, 14);
assertEquals(28, steps.size());
assertEquals(new AvenueStairwayLayout.Step(35, 63, 12), steps.get(0));
assertEquals(new AvenueStairwayLayout.Step(36, 63, 12), steps.get(1));
assertEquals(new AvenueStairwayLayout.Step(35, 64, 13), steps.get(2));
assertEquals(new AvenueStairwayLayout.Step(36, 76, 25), steps.get(27));
}
@Test
void opensOnlyTheThreeUpperRoadBlocksBeforeTheTopStair() {
Cuboid plot = new Cuboid(2, 62, 2, 33, 71, 33);
List<AvenueStairwayLayout.Step> openings =
AvenueStairwayLayout.upperRoadOpening(plot, 4, 2, 62, 14, 3);
assertEquals(6, openings.size());
assertEquals(new AvenueStairwayLayout.Step(35, 76, 22), openings.get(0));
assertEquals(new AvenueStairwayLayout.Step(35, 76, 23), openings.get(1));
assertEquals(new AvenueStairwayLayout.Step(35, 76, 24), openings.get(2));
assertEquals(new AvenueStairwayLayout.Step(36, 76, 24), openings.get(5));
}
@Test
void upperRoadFlightPreservesTheLowerRoadAndPlansInvertedBacking() {
Cuboid plot = new Cuboid(2, 62, 2, 33, 71, 33);
AvenueStairwayLayout.Flight flight = AvenueStairwayLayout.forUpperRoad(plot, 4, 2, 62, 14, 3);
assertEquals(28, flight.stairBlocks().size());
assertEquals(new AvenueStairwayLayout.Step(35, 63, 12), flight.stairBlocks().getFirst());
assertEquals(new AvenueStairwayLayout.Step(36, 76, 25), flight.stairBlocks().getLast());
assertEquals(26, flight.invertedBackingBlocks().size());
assertEquals(
new AvenueStairwayLayout.Step(35, 63, 13), flight.invertedBackingBlocks().getFirst());
assertTrue(flight.stairBlocks().stream().allMatch(step -> step.y() > 62));
assertTrue(flight.invertedBackingBlocks().stream().allMatch(step -> step.y() > 62));
assertEquals(6, flight.roadOpenings().size());
assertTrue(flight.roadOpenings().stream().allMatch(step -> step.y() == 76));
}
@Test
void rejectsAStairRunThatCannotFitWithinThePlotLength() {
Cuboid plot = new Cuboid(2, 62, 2, 33, 71, 13);
assertTrue(AvenueStairwayLayout.centeredEastAvenue(plot, 4, 2, 62, 14).isEmpty());
}
@Test
void rejectsStairsThatAreNotNarrowerThanTheAvenue() {
Cuboid plot = new Cuboid(2, 62, 2, 33, 71, 33);
assertTrue(AvenueStairwayLayout.centeredEastAvenue(plot, 4, 4, 62, 14).isEmpty());
}
}