mirror of
https://github.com/IntellectualSites/PlotSquared.git
synced 2024-11-22 13:16:45 +01:00
Clean up HybridGen and make the code readable by humans
Previously it was only readable by androids, and Jesse.
This commit is contained in:
parent
5a6dbfda36
commit
ce177c3c46
@ -70,11 +70,11 @@ public class HybridGen extends IndependentPlotGenerator {
|
|||||||
Preconditions.checkNotNull(result, "result cannot be null");
|
Preconditions.checkNotNull(result, "result cannot be null");
|
||||||
Preconditions.checkNotNull(settings, "settings cannot be null");
|
Preconditions.checkNotNull(settings, "settings cannot be null");
|
||||||
|
|
||||||
HybridPlotWorld hpw = (HybridPlotWorld) settings;
|
HybridPlotWorld hybridPlotWorld = (HybridPlotWorld) settings;
|
||||||
// Biome
|
// Biome
|
||||||
result.fillBiome(hpw.getPlotBiome());
|
result.fillBiome(hybridPlotWorld.getPlotBiome());
|
||||||
// Bedrock
|
// Bedrock
|
||||||
if (hpw.PLOT_BEDROCK) {
|
if (hybridPlotWorld.PLOT_BEDROCK) {
|
||||||
for (short x = 0; x < 16; x++) {
|
for (short x = 0; x < 16; x++) {
|
||||||
for (short z = 0; z < 16; z++) {
|
for (short z = 0; z < 16; z++) {
|
||||||
result.setBlock(x, 0, z, BlockTypes.BEDROCK.getDefaultState());
|
result.setBlock(x, 0, z, BlockTypes.BEDROCK.getDefaultState());
|
||||||
@ -83,110 +83,122 @@ public class HybridGen extends IndependentPlotGenerator {
|
|||||||
}
|
}
|
||||||
// Coords
|
// Coords
|
||||||
Location min = result.getMin();
|
Location min = result.getMin();
|
||||||
int bx = (min.getX()) - hpw.ROAD_OFFSET_X;
|
int bx = (min.getX()) - hybridPlotWorld.ROAD_OFFSET_X;
|
||||||
int bz = (min.getZ()) - hpw.ROAD_OFFSET_Z;
|
int bz = (min.getZ()) - hybridPlotWorld.ROAD_OFFSET_Z;
|
||||||
short rbx;
|
// The relative X-coordinate (within the plot) of the minimum X coordinate
|
||||||
|
// contained in the scoped queue
|
||||||
|
short relativeOffsetX;
|
||||||
if (bx < 0) {
|
if (bx < 0) {
|
||||||
rbx = (short) (hpw.SIZE + (bx % hpw.SIZE));
|
relativeOffsetX = (short) (hybridPlotWorld.SIZE + (bx % hybridPlotWorld.SIZE));
|
||||||
} else {
|
} else {
|
||||||
rbx = (short) (bx % hpw.SIZE);
|
relativeOffsetX = (short) (bx % hybridPlotWorld.SIZE);
|
||||||
}
|
}
|
||||||
short rbz;
|
// The relative Z-coordinate (within the plot) of the minimum Z coordinate
|
||||||
|
// contained in the scoped queue
|
||||||
|
short relativeOffsetZ;
|
||||||
if (bz < 0) {
|
if (bz < 0) {
|
||||||
rbz = (short) (hpw.SIZE + (bz % hpw.SIZE));
|
relativeOffsetZ = (short) (hybridPlotWorld.SIZE + (bz % hybridPlotWorld.SIZE));
|
||||||
} else {
|
} else {
|
||||||
rbz = (short) (bz % hpw.SIZE);
|
relativeOffsetZ = (short) (bz % hybridPlotWorld.SIZE);
|
||||||
}
|
}
|
||||||
short[] rx = new short[16];
|
// The X-coordinate of a given X coordinate, relative to the
|
||||||
boolean[] gx = new boolean[16];
|
// plot (Counting from the corner with the least positive
|
||||||
boolean[] wx = new boolean[16];
|
// coordinates)
|
||||||
|
short[] relativeX = new short[16];
|
||||||
|
boolean[] insideRoadX = new boolean[16];
|
||||||
|
boolean[] insideWallX = new boolean[16];
|
||||||
for (short i = 0; i < 16; i++) {
|
for (short i = 0; i < 16; i++) {
|
||||||
short v = (short) (rbx + i);
|
short v = (short) (relativeOffsetX + i);
|
||||||
if (v >= hpw.SIZE) {
|
if (v >= hybridPlotWorld.SIZE) {
|
||||||
v -= hpw.SIZE;
|
v -= hybridPlotWorld.SIZE;
|
||||||
}
|
}
|
||||||
rx[i] = v;
|
relativeX[i] = v;
|
||||||
if (hpw.ROAD_WIDTH != 0) {
|
if (hybridPlotWorld.ROAD_WIDTH != 0) {
|
||||||
gx[i] = v < hpw.PATH_WIDTH_LOWER || v > hpw.PATH_WIDTH_UPPER;
|
insideRoadX[i] = v < hybridPlotWorld.PATH_WIDTH_LOWER || v > hybridPlotWorld.PATH_WIDTH_UPPER;
|
||||||
wx[i] = v == hpw.PATH_WIDTH_LOWER || v == hpw.PATH_WIDTH_UPPER;
|
insideWallX[i] = v == hybridPlotWorld.PATH_WIDTH_LOWER || v == hybridPlotWorld.PATH_WIDTH_UPPER;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
short[] rz = new short[16];
|
// The Z-coordinate of a given Z coordinate, relative to the
|
||||||
boolean[] gz = new boolean[16];
|
// plot (Counting from the corner with the least positive
|
||||||
boolean[] wz = new boolean[16];
|
// coordinates)
|
||||||
|
short[] relativeZ = new short[16];
|
||||||
|
// Whether or not the given Z coordinate belongs to the road
|
||||||
|
boolean[] insideRoadZ = new boolean[16];
|
||||||
|
// Whether or not the given Z coordinate belongs to the wall
|
||||||
|
boolean[] insideWallZ = new boolean[16];
|
||||||
for (short i = 0; i < 16; i++) {
|
for (short i = 0; i < 16; i++) {
|
||||||
short v = (short) (rbz + i);
|
short v = (short) (relativeOffsetZ + i);
|
||||||
if (v >= hpw.SIZE) {
|
if (v >= hybridPlotWorld.SIZE) {
|
||||||
v -= hpw.SIZE;
|
v -= hybridPlotWorld.SIZE;
|
||||||
}
|
}
|
||||||
rz[i] = v;
|
relativeZ[i] = v;
|
||||||
if (hpw.ROAD_WIDTH != 0) {
|
if (hybridPlotWorld.ROAD_WIDTH != 0) {
|
||||||
gz[i] = v < hpw.PATH_WIDTH_LOWER || v > hpw.PATH_WIDTH_UPPER;
|
insideRoadZ[i] = v < hybridPlotWorld.PATH_WIDTH_LOWER || v > hybridPlotWorld.PATH_WIDTH_UPPER;
|
||||||
wz[i] = v == hpw.PATH_WIDTH_LOWER || v == hpw.PATH_WIDTH_UPPER;
|
insideWallZ[i] = v == hybridPlotWorld.PATH_WIDTH_LOWER || v == hybridPlotWorld.PATH_WIDTH_UPPER;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// generation
|
// generation
|
||||||
for (short x = 0; x < 16; x++) {
|
for (short x = 0; x < 16; x++) {
|
||||||
if (gx[x]) {
|
if (insideRoadX[x]) {
|
||||||
for (short z = 0; z < 16; z++) {
|
for (short z = 0; z < 16; z++) {
|
||||||
// Road
|
// Road
|
||||||
for (int y = 1; y <= hpw.ROAD_HEIGHT; y++) {
|
for (int y = 1; y <= hybridPlotWorld.ROAD_HEIGHT; y++) {
|
||||||
result.setBlock(x, y, z, hpw.ROAD_BLOCK.toPattern());
|
result.setBlock(x, y, z, hybridPlotWorld.ROAD_BLOCK.toPattern());
|
||||||
}
|
}
|
||||||
if (hpw.ROAD_SCHEMATIC_ENABLED) {
|
if (hybridPlotWorld.ROAD_SCHEMATIC_ENABLED) {
|
||||||
placeSchem(hpw, result, rx[x], rz[z], x, z, true);
|
placeSchem(hybridPlotWorld, result, relativeX[x], relativeZ[z], x, z, true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else if (wx[x]) {
|
} else if (insideWallX[x]) {
|
||||||
for (short z = 0; z < 16; z++) {
|
for (short z = 0; z < 16; z++) {
|
||||||
if (gz[z]) {
|
if (insideRoadZ[z]) {
|
||||||
// road
|
// road
|
||||||
for (int y = 1; y <= hpw.ROAD_HEIGHT; y++) {
|
for (int y = 1; y <= hybridPlotWorld.ROAD_HEIGHT; y++) {
|
||||||
result.setBlock(x, y, z, hpw.ROAD_BLOCK.toPattern());
|
result.setBlock(x, y, z, hybridPlotWorld.ROAD_BLOCK.toPattern());
|
||||||
}
|
}
|
||||||
if (hpw.ROAD_SCHEMATIC_ENABLED) {
|
if (hybridPlotWorld.ROAD_SCHEMATIC_ENABLED) {
|
||||||
placeSchem(hpw, result, rx[x], rz[z], x, z, true);
|
placeSchem(hybridPlotWorld, result, relativeX[x], relativeZ[z], x, z, true);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
// wall
|
// wall
|
||||||
for (int y = 1; y <= hpw.WALL_HEIGHT; y++) {
|
for (int y = 1; y <= hybridPlotWorld.WALL_HEIGHT; y++) {
|
||||||
result.setBlock(x, y, z, hpw.WALL_FILLING.toPattern());
|
result.setBlock(x, y, z, hybridPlotWorld.WALL_FILLING.toPattern());
|
||||||
}
|
}
|
||||||
if (!hpw.ROAD_SCHEMATIC_ENABLED) {
|
if (!hybridPlotWorld.ROAD_SCHEMATIC_ENABLED) {
|
||||||
result.setBlock(x, hpw.WALL_HEIGHT + 1, z, hpw.WALL_BLOCK.toPattern());
|
result.setBlock(x, hybridPlotWorld.WALL_HEIGHT + 1, z, hybridPlotWorld.WALL_BLOCK.toPattern());
|
||||||
} else {
|
} else {
|
||||||
placeSchem(hpw, result, rx[x], rz[z], x, z, true);
|
placeSchem(hybridPlotWorld, result, relativeX[x], relativeZ[z], x, z, true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
for (short z = 0; z < 16; z++) {
|
for (short z = 0; z < 16; z++) {
|
||||||
if (gz[z]) {
|
if (insideRoadZ[z]) {
|
||||||
// road
|
// road
|
||||||
for (int y = 1; y <= hpw.ROAD_HEIGHT; y++) {
|
for (int y = 1; y <= hybridPlotWorld.ROAD_HEIGHT; y++) {
|
||||||
result.setBlock(x, y, z, hpw.ROAD_BLOCK.toPattern());
|
result.setBlock(x, y, z, hybridPlotWorld.ROAD_BLOCK.toPattern());
|
||||||
}
|
}
|
||||||
if (hpw.ROAD_SCHEMATIC_ENABLED) {
|
if (hybridPlotWorld.ROAD_SCHEMATIC_ENABLED) {
|
||||||
placeSchem(hpw, result, rx[x], rz[z], x, z, true);
|
placeSchem(hybridPlotWorld, result, relativeX[x], relativeZ[z], x, z, true);
|
||||||
}
|
}
|
||||||
} else if (wz[z]) {
|
} else if (insideWallZ[z]) {
|
||||||
// wall
|
// wall
|
||||||
for (int y = 1; y <= hpw.WALL_HEIGHT; y++) {
|
for (int y = 1; y <= hybridPlotWorld.WALL_HEIGHT; y++) {
|
||||||
result.setBlock(x, y, z, hpw.WALL_FILLING.toPattern());
|
result.setBlock(x, y, z, hybridPlotWorld.WALL_FILLING.toPattern());
|
||||||
}
|
}
|
||||||
if (!hpw.ROAD_SCHEMATIC_ENABLED) {
|
if (!hybridPlotWorld.ROAD_SCHEMATIC_ENABLED) {
|
||||||
result.setBlock(x, hpw.WALL_HEIGHT + 1, z, hpw.WALL_BLOCK.toPattern());
|
result.setBlock(x, hybridPlotWorld.WALL_HEIGHT + 1, z, hybridPlotWorld.WALL_BLOCK.toPattern());
|
||||||
} else {
|
} else {
|
||||||
placeSchem(hpw, result, rx[x], rz[z], x, z, true);
|
placeSchem(hybridPlotWorld, result, relativeX[x], relativeZ[z], x, z, true);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
// plot
|
// plot
|
||||||
for (int y = 1; y < hpw.PLOT_HEIGHT; y++) {
|
for (int y = 1; y < hybridPlotWorld.PLOT_HEIGHT; y++) {
|
||||||
result.setBlock(x, y, z, hpw.MAIN_BLOCK.toPattern());
|
result.setBlock(x, y, z, hybridPlotWorld.MAIN_BLOCK.toPattern());
|
||||||
}
|
}
|
||||||
result.setBlock(x, hpw.PLOT_HEIGHT, z, hpw.TOP_BLOCK.toPattern());
|
result.setBlock(x, hybridPlotWorld.PLOT_HEIGHT, z, hybridPlotWorld.TOP_BLOCK.toPattern());
|
||||||
if (hpw.PLOT_SCHEMATIC) {
|
if (hybridPlotWorld.PLOT_SCHEMATIC) {
|
||||||
placeSchem(hpw, result, rx[x], rz[z], x, z, false);
|
placeSchem(hybridPlotWorld, result, relativeX[x], relativeZ[z], x, z, false);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -194,68 +206,6 @@ public class HybridGen extends IndependentPlotGenerator {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/* @Override public boolean populateChunk(ScopedLocalBlockQueue result, PlotArea settings) {
|
|
||||||
HybridPlotWorld hpw = (HybridPlotWorld) settings;
|
|
||||||
if (hpw.G_SCH_STATE != null) {
|
|
||||||
Location min = result.getMin();
|
|
||||||
int cx = min.getX() >> 4;
|
|
||||||
int cz = min.getZ() >> 4;
|
|
||||||
int p1x = cx << 4;
|
|
||||||
int p1z = cz << 4;
|
|
||||||
int bx = p1x - hpw.ROAD_OFFSET_X;
|
|
||||||
int bz = p1z - hpw.ROAD_OFFSET_Z;
|
|
||||||
short rbx;
|
|
||||||
if (bx < 0) {
|
|
||||||
rbx = (short) (hpw.SIZE + (bx % hpw.SIZE));
|
|
||||||
} else {
|
|
||||||
rbx = (short) (bx % hpw.SIZE);
|
|
||||||
}
|
|
||||||
short rbz;
|
|
||||||
if (bz < 0) {
|
|
||||||
rbz = (short) (hpw.SIZE + (bz % hpw.SIZE));
|
|
||||||
} else {
|
|
||||||
rbz = (short) (bz % hpw.SIZE);
|
|
||||||
}
|
|
||||||
short[] rx = new short[16];
|
|
||||||
for (short i = 0; i < 16; i++) {
|
|
||||||
short v = (short) (rbx + i);
|
|
||||||
if (v >= hpw.SIZE) {
|
|
||||||
v -= hpw.SIZE;
|
|
||||||
}
|
|
||||||
rx[i] = v;
|
|
||||||
}
|
|
||||||
short[] rz = new short[16];
|
|
||||||
for (short i = 0; i < 16; i++) {
|
|
||||||
short v = (short) (rbz + i);
|
|
||||||
if (v >= hpw.SIZE) {
|
|
||||||
v -= hpw.SIZE;
|
|
||||||
}
|
|
||||||
rz[i] = v;
|
|
||||||
}
|
|
||||||
LocalBlockQueue queue = null;
|
|
||||||
for (short x = 0; x < 16; x++) {
|
|
||||||
for (short z = 0; z < 16; z++) {
|
|
||||||
int pair = MathMan.pair(rx[x], rz[z]);
|
|
||||||
HashMap<Integer, CompoundTag> map = hpw.G_SCH_STATE.get(pair);
|
|
||||||
if (map != null) {
|
|
||||||
for (Entry<Integer, CompoundTag> entry : map.entrySet()) {
|
|
||||||
if (queue == null) {
|
|
||||||
queue = GlobalBlockQueue.IMP.getNewQueue(hpw.worldname, false);
|
|
||||||
}
|
|
||||||
CompoundTag tag = entry.getValue();
|
|
||||||
SchematicHandler.manager
|
|
||||||
.restoreTile(queue, tag, p1x + x, entry.getKey(), p1z + z);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (queue != null) {
|
|
||||||
queue.flush();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return false;
|
|
||||||
}*/
|
|
||||||
|
|
||||||
@Override public PlotArea getNewPlotArea(String world, String id, PlotId min, PlotId max) {
|
@Override public PlotArea getNewPlotArea(String world, String id, PlotId min, PlotId max) {
|
||||||
return new HybridPlotWorld(world, id, this, min, max);
|
return new HybridPlotWorld(world, id, this, min, max);
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user