mirror of
https://github.com/IntellectualSites/PlotSquared.git
synced 2024-11-22 05:06:44 +01:00
feat: configurable accounting for bedrock layer when setting components (#4266)
- Add configuration option to force plot components to be set only above bedrock level - Account for build height < gen height where it is not wanted for components to be set at/below bedrock
This commit is contained in:
parent
59787fe7f3
commit
7f1f1e025e
@ -143,7 +143,7 @@ public class ClassicPlotManager extends SquarePlotManager {
|
|||||||
classicPlotWorld,
|
classicPlotWorld,
|
||||||
plot.getRegions(),
|
plot.getRegions(),
|
||||||
blocks,
|
blocks,
|
||||||
classicPlotWorld.getMinBuildHeight(),
|
classicPlotWorld.getMinComponentHeight(),
|
||||||
classicPlotWorld.getMaxBuildHeight() - 1,
|
classicPlotWorld.getMaxBuildHeight() - 1,
|
||||||
actor,
|
actor,
|
||||||
queue
|
queue
|
||||||
@ -204,7 +204,7 @@ public class ClassicPlotManager extends SquarePlotManager {
|
|||||||
classicPlotWorld,
|
classicPlotWorld,
|
||||||
plot.getRegions(),
|
plot.getRegions(),
|
||||||
blocks,
|
blocks,
|
||||||
classicPlotWorld.getMinBuildHeight(),
|
classicPlotWorld.getMinComponentHeight(),
|
||||||
classicPlotWorld.PLOT_HEIGHT - 1,
|
classicPlotWorld.PLOT_HEIGHT - 1,
|
||||||
actor,
|
actor,
|
||||||
queue
|
queue
|
||||||
@ -379,7 +379,7 @@ public class ClassicPlotManager extends SquarePlotManager {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
int yStart = classicPlotWorld.getMinBuildHeight() + (classicPlotWorld.PLOT_BEDROCK ? 1 : 0);
|
int yStart = classicPlotWorld.getMinComponentHeight();
|
||||||
if (!plot.isMerged(Direction.NORTH)) {
|
if (!plot.isMerged(Direction.NORTH)) {
|
||||||
int z = bot.getZ();
|
int z = bot.getZ();
|
||||||
for (int x = bot.getX(); x < top.getX(); x++) {
|
for (int x = bot.getX(); x < top.getX(); x++) {
|
||||||
|
@ -52,6 +52,7 @@ public abstract class ClassicPlotWorld extends SquarePlotWorld {
|
|||||||
public BlockBucket ROAD_BLOCK = new BlockBucket(BlockTypes.QUARTZ_BLOCK);
|
public BlockBucket ROAD_BLOCK = new BlockBucket(BlockTypes.QUARTZ_BLOCK);
|
||||||
public boolean PLOT_BEDROCK = true;
|
public boolean PLOT_BEDROCK = true;
|
||||||
public boolean PLACE_TOP_BLOCK = true;
|
public boolean PLACE_TOP_BLOCK = true;
|
||||||
|
public boolean COMPONENT_BELOW_BEDROCK = false;
|
||||||
|
|
||||||
public ClassicPlotWorld(
|
public ClassicPlotWorld(
|
||||||
final @NonNull String worldName,
|
final @NonNull String worldName,
|
||||||
@ -129,6 +130,9 @@ public abstract class ClassicPlotWorld extends SquarePlotWorld {
|
|||||||
),
|
),
|
||||||
new ConfigurationNode("plot.bedrock", this.PLOT_BEDROCK, TranslatableCaption.of("setup.bedrock_boolean"),
|
new ConfigurationNode("plot.bedrock", this.PLOT_BEDROCK, TranslatableCaption.of("setup.bedrock_boolean"),
|
||||||
ConfigurationUtil.BOOLEAN
|
ConfigurationUtil.BOOLEAN
|
||||||
|
),
|
||||||
|
new ConfigurationNode("world.component_below_bedrock", this.COMPONENT_BELOW_BEDROCK, TranslatableCaption.of(
|
||||||
|
"setup.component_below_bedrock_boolean"), ConfigurationUtil.BOOLEAN
|
||||||
)};
|
)};
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -150,6 +154,14 @@ public abstract class ClassicPlotWorld extends SquarePlotWorld {
|
|||||||
this.PLACE_TOP_BLOCK = config.getBoolean("wall.place_top_block");
|
this.PLACE_TOP_BLOCK = config.getBoolean("wall.place_top_block");
|
||||||
this.WALL_HEIGHT = Math.min(getMaxGenHeight() - (PLACE_TOP_BLOCK ? 1 : 0), config.getInt("wall.height"));
|
this.WALL_HEIGHT = Math.min(getMaxGenHeight() - (PLACE_TOP_BLOCK ? 1 : 0), config.getInt("wall.height"));
|
||||||
this.CLAIMED_WALL_BLOCK = createCheckedBlockBucket(config.getString("wall.block_claimed"), CLAIMED_WALL_BLOCK);
|
this.CLAIMED_WALL_BLOCK = createCheckedBlockBucket(config.getString("wall.block_claimed"), CLAIMED_WALL_BLOCK);
|
||||||
|
this.COMPONENT_BELOW_BEDROCK = config.getBoolean("world.component_below_bedrock");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int getMinComponentHeight() {
|
||||||
|
return COMPONENT_BELOW_BEDROCK && getMinGenHeight() >= getMinBuildHeight()
|
||||||
|
? getMinGenHeight() + (PLOT_BEDROCK ? 1 : 0)
|
||||||
|
: getMinBuildHeight();
|
||||||
}
|
}
|
||||||
|
|
||||||
int schematicStartHeight() {
|
int schematicStartHeight() {
|
||||||
|
@ -1452,6 +1452,24 @@ public abstract class PlotArea implements ComponentLike {
|
|||||||
this.defaultHome = defaultHome;
|
this.defaultHome = defaultHome;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get the maximum height that changes to plot components (wall filling, air, all etc.) may operate to
|
||||||
|
*
|
||||||
|
* @since TODO
|
||||||
|
*/
|
||||||
|
public int getMaxComponentHeight() {
|
||||||
|
return this.maxBuildHeight;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get the minimum height that changes to plot components (wall filling, air, all etc.) may operate to
|
||||||
|
*
|
||||||
|
* @since TODO
|
||||||
|
*/
|
||||||
|
public int getMinComponentHeight() {
|
||||||
|
return this.minBuildHeight;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get the maximum height players may build in. Exclusive.
|
* Get the maximum height players may build in. Exclusive.
|
||||||
*/
|
*/
|
||||||
|
@ -166,6 +166,7 @@
|
|||||||
"setup.wall_height": "<gold>Wall height</gold>",
|
"setup.wall_height": "<gold>Wall height</gold>",
|
||||||
"setup.min_gen_height": "<gold>Minimum height from which to generate (for 1.18+ can be negative).</gold>",
|
"setup.min_gen_height": "<gold>Minimum height from which to generate (for 1.18+ can be negative).</gold>",
|
||||||
"setup.bedrock_boolean": "<gold>Whether a bedrock layer under the plot should be generated or not</gold>",
|
"setup.bedrock_boolean": "<gold>Whether a bedrock layer under the plot should be generated or not</gold>",
|
||||||
|
"setup.component_below_bedrock_boolean": "<gold>Whether a component change e.g. /plot set walls should edit the bedrock layer or below</gold>",
|
||||||
"setup.singleplotarea_void_world": "<gold>Void world</gold>",
|
"setup.singleplotarea_void_world": "<gold>Void world</gold>",
|
||||||
"plotareatype.plot_area_type_normal": "<gray>Standard plot generation</gray>",
|
"plotareatype.plot_area_type_normal": "<gray>Standard plot generation</gray>",
|
||||||
"plotareatype.plot_area_type_augmented": "<gray>Plot generation with vanilla terrain</gray>",
|
"plotareatype.plot_area_type_augmented": "<gray>Plot generation with vanilla terrain</gray>",
|
||||||
|
Loading…
Reference in New Issue
Block a user