mirror of
https://github.com/IntellectualSites/PlotSquared.git
synced 2025-06-29 20:24:43 +02:00
Hows this?
This commit is contained in:
boy0001
@ -17,8 +17,7 @@ import com.intellectualcrafters.plot.util.BlockManager;
|
||||
|
||||
/**
|
||||
|
||||
*/
|
||||
public class HybridPop extends BukkitPlotPopulator
|
||||
*/
|
||||
public class HybridPop extends BukkitPlotPopulator {
|
||||
/*
|
||||
* Sorry, this isn't well documented at the moment.
|
||||
@ -42,9 +41,8 @@ public class HybridPop extends BukkitPlotPopulator
|
||||
Biome biome;
|
||||
private long state;
|
||||
private boolean doFilling = false;
|
||||
private boolean doFloor = false;
|
||||
|
||||
public HybridPop(final PlotWorld pw)
|
||||
private boolean doFloor = false;
|
||||
|
||||
public HybridPop(final PlotWorld pw) {
|
||||
plotworld = (HybridPlotWorld) pw;
|
||||
// save configuration
|
||||
@ -56,125 +54,95 @@ public class HybridPop extends BukkitPlotPopulator
|
||||
wall = plotworld.WALL_BLOCK.data;
|
||||
int count1 = 0;
|
||||
int count2 = 0;
|
||||
plotfloors = new byte[plotworld.TOP_BLOCK.length];
|
||||
for (int i = 0; i < plotworld.TOP_BLOCK.length; i++)
|
||||
plotfloors = new byte[plotworld.TOP_BLOCK.length];
|
||||
for (int i = 0; i < plotworld.TOP_BLOCK.length; i++) {
|
||||
count1++;
|
||||
plotfloors[i] = plotworld.TOP_BLOCK[i].data;
|
||||
if (plotworld.TOP_BLOCK[i].data != 0)
|
||||
plotfloors[i] = plotworld.TOP_BLOCK[i].data;
|
||||
if (plotworld.TOP_BLOCK[i].data != 0) {
|
||||
doFloor = true;
|
||||
}
|
||||
}
|
||||
filling = new byte[plotworld.MAIN_BLOCK.length];
|
||||
for (int i = 0; i < plotworld.MAIN_BLOCK.length; i++)
|
||||
filling = new byte[plotworld.MAIN_BLOCK.length];
|
||||
for (int i = 0; i < plotworld.MAIN_BLOCK.length; i++) {
|
||||
count2++;
|
||||
filling[i] = plotworld.MAIN_BLOCK[i].data;
|
||||
if (plotworld.MAIN_BLOCK[i].data != 0)
|
||||
filling[i] = plotworld.MAIN_BLOCK[i].data;
|
||||
if (plotworld.MAIN_BLOCK[i].data != 0) {
|
||||
doFilling = true;
|
||||
}
|
||||
}
|
||||
if (((count1 > 0) && doFloor) || ((count2 > 0) && doFilling))
|
||||
}
|
||||
if (((count1 > 0) && doFloor) || ((count2 > 0) && doFilling)) {}
|
||||
wallheight = plotworld.WALL_HEIGHT;
|
||||
roadheight = plotworld.ROAD_HEIGHT;
|
||||
plotheight = plotworld.PLOT_HEIGHT;
|
||||
if (pathsize == 0)
|
||||
plotheight = plotworld.PLOT_HEIGHT;
|
||||
if (pathsize == 0) {
|
||||
pathWidthLower = (short) -1;
|
||||
pathWidthUpper = (short) (plotsize + 1);
|
||||
}
|
||||
else
|
||||
{
|
||||
if ((pathsize % 2) == 0)
|
||||
pathWidthUpper = (short) (plotsize + 1);
|
||||
} else {
|
||||
if ((pathsize % 2) == 0) {
|
||||
pathWidthLower = (short) (Math.floor(pathsize / 2) - 1);
|
||||
}
|
||||
else
|
||||
pathWidthLower = (short) (Math.floor(pathsize / 2) - 1);
|
||||
} else {
|
||||
pathWidthLower = (short) (Math.floor(pathsize / 2));
|
||||
}
|
||||
pathWidthUpper = (short) (pathWidthLower + plotsize + 1);
|
||||
}
|
||||
}
|
||||
|
||||
public final long nextLong()
|
||||
}
|
||||
|
||||
public final long nextLong() {
|
||||
final long a = state;
|
||||
state = xorShift64(a);
|
||||
return a;
|
||||
}
|
||||
|
||||
public final long xorShift64(long a)
|
||||
}
|
||||
|
||||
public final long xorShift64(long a) {
|
||||
a ^= (a << 21);
|
||||
a ^= (a >>> 35);
|
||||
a ^= (a << 4);
|
||||
return a;
|
||||
}
|
||||
|
||||
public final int random(final int n)
|
||||
}
|
||||
|
||||
public final int random(final int n) {
|
||||
final long result = ((nextLong() >>> 32) * n) >> 32;
|
||||
return (int) result;
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void populate(final World world, final RegionWrapper requiredRegion, final PseudoRandom random, final int cx, final int cz)
|
||||
@Override
|
||||
public void populate(final World world, final RegionWrapper requiredRegion, final PseudoRandom random, final int cx, final int cz) {
|
||||
PS.get().getPlotManager(world.getName());
|
||||
PS.get().getPlotManager(world.getName());
|
||||
|
||||
int sx = (short) ((X - plotworld.ROAD_OFFSET_X) % size);
|
||||
int sz = (short) ((Z - plotworld.ROAD_OFFSET_Z) % size);
|
||||
if (sx < 0)
|
||||
int sz = (short) ((Z - plotworld.ROAD_OFFSET_Z) % size);
|
||||
if (sx < 0) {
|
||||
sx += size;
|
||||
}
|
||||
if (sz < 0)
|
||||
}
|
||||
if (sz < 0) {
|
||||
sz += size;
|
||||
}
|
||||
|
||||
if (requiredRegion != null)
|
||||
{
|
||||
for (short x = 0; x < 16; x++)
|
||||
{
|
||||
for (short z = 0; z < 16; z++)
|
||||
{
|
||||
if (contains(requiredRegion, x, z))
|
||||
{
|
||||
if (doFilling)
|
||||
{
|
||||
for (short y = 1; y < plotheight; y++)
|
||||
}
|
||||
|
||||
if (requiredRegion != null) {
|
||||
for (short x = 0; x < 16; x++) {
|
||||
for (short z = 0; z < 16; z++) {
|
||||
if (contains(requiredRegion, x, z)) {
|
||||
if (doFilling) {
|
||||
for (short y = 1; y < plotheight; y++) {
|
||||
setBlock(x, y, z, filling);
|
||||
}
|
||||
}
|
||||
if (doFloor)
|
||||
}
|
||||
if (doFloor) {
|
||||
setBlock(x, (short) plotheight, z, plotfloors);
|
||||
}
|
||||
if (plotworld.PLOT_SCHEMATIC)
|
||||
}
|
||||
if (plotworld.PLOT_SCHEMATIC) {
|
||||
final int absX = ((sx + x) % size);
|
||||
final int absZ = ((sz + z) % size);
|
||||
final PlotLoc loc = new PlotLoc(absX, absZ);
|
||||
final HashMap<Short, Byte> blocks = plotworld.G_SCH_DATA.get(loc);
|
||||
if (blocks != null)
|
||||
{
|
||||
for (final short y : blocks.keySet())
|
||||
final HashMap<Short, Byte> blocks = plotworld.G_SCH_DATA.get(loc);
|
||||
if (blocks != null) {
|
||||
for (final short y : blocks.keySet()) {
|
||||
setBlockAbs(x, (short) (plotheight + y), z, blocks.get(y));
|
||||
}
|
||||
}
|
||||
if (plotworld.G_SCH_STATE != null)
|
||||
}
|
||||
if (plotworld.G_SCH_STATE != null) {
|
||||
final HashSet<PlotItem> states = plotworld.G_SCH_STATE.get(loc);
|
||||
if (states != null)
|
||||
{
|
||||
for (final PlotItem items : states)
|
||||
final HashSet<PlotItem> states = plotworld.G_SCH_STATE.get(loc);
|
||||
if (states != null) {
|
||||
for (final PlotItem items : states) {
|
||||
BlockManager.manager.addItems(plotworld.worldname, items);
|
||||
}
|
||||
@ -185,11 +153,9 @@ public class HybridPop extends BukkitPlotPopulator
|
||||
}
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
for (short x = 0; x < 16; x++)
|
||||
{
|
||||
for (short z = 0; z < 16; z++)
|
||||
}
|
||||
|
||||
for (short x = 0; x < 16; x++) {
|
||||
for (short z = 0; z < 16; z++) {
|
||||
final int absX = ((sx + x) % size);
|
||||
final int absZ = ((sz + z) % size);
|
||||
@ -197,31 +163,23 @@ public class HybridPop extends BukkitPlotPopulator
|
||||
final boolean gz = absZ > pathWidthLower;
|
||||
final boolean lx = absX < pathWidthUpper;
|
||||
final boolean lz = absZ < pathWidthUpper;
|
||||
// inside plot
|
||||
if (gx && gz && lx && lz)
|
||||
{
|
||||
for (short y = 1; y < plotheight; y++)
|
||||
// inside plot
|
||||
if (gx && gz && lx && lz) {
|
||||
for (short y = 1; y < plotheight; y++) {
|
||||
setBlock(x, y, z, filling);
|
||||
}
|
||||
setBlock(x, (short) plotheight, z, plotfloors);
|
||||
if (plotworld.PLOT_SCHEMATIC)
|
||||
setBlock(x, (short) plotheight, z, plotfloors);
|
||||
if (plotworld.PLOT_SCHEMATIC) {
|
||||
final PlotLoc loc = new PlotLoc(absX, absZ);
|
||||
final HashMap<Short, Byte> blocks = plotworld.G_SCH_DATA.get(loc);
|
||||
if (blocks != null)
|
||||
{
|
||||
for (final short y : blocks.keySet())
|
||||
final HashMap<Short, Byte> blocks = plotworld.G_SCH_DATA.get(loc);
|
||||
if (blocks != null) {
|
||||
for (final short y : blocks.keySet()) {
|
||||
setBlockAbs(x, (short) (plotheight + y), z, blocks.get(y));
|
||||
}
|
||||
}
|
||||
if (plotworld.G_SCH_STATE != null)
|
||||
}
|
||||
if (plotworld.G_SCH_STATE != null) {
|
||||
final HashSet<PlotItem> states = plotworld.G_SCH_STATE.get(loc);
|
||||
if (states != null)
|
||||
{
|
||||
for (final PlotItem items : states)
|
||||
final HashSet<PlotItem> states = plotworld.G_SCH_STATE.get(loc);
|
||||
if (states != null) {
|
||||
for (final PlotItem items : states) {
|
||||
items.x = X + x;
|
||||
items.z = Z + z;
|
||||
@ -229,37 +187,27 @@ public class HybridPop extends BukkitPlotPopulator
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
else if (pathsize != 0)
|
||||
}
|
||||
} else if (pathsize != 0) {
|
||||
// wall
|
||||
if (((absX >= pathWidthLower) && (absX <= pathWidthUpper) && (absZ >= pathWidthLower) && (absZ <= pathWidthUpper)))
|
||||
{
|
||||
for (short y = 1; y <= wallheight; y++)
|
||||
// wall
|
||||
if (((absX >= pathWidthLower) && (absX <= pathWidthUpper) && (absZ >= pathWidthLower) && (absZ <= pathWidthUpper))) {
|
||||
for (short y = 1; y <= wallheight; y++) {
|
||||
setBlock(x, y, z, wallfilling);
|
||||
}
|
||||
if (!plotworld.ROAD_SCHEMATIC_ENABLED)
|
||||
}
|
||||
if (!plotworld.ROAD_SCHEMATIC_ENABLED) {
|
||||
setBlock(x, wallheight + 1, z, wall);
|
||||
}
|
||||
}
|
||||
// road
|
||||
else
|
||||
{
|
||||
for (short y = 1; y <= roadheight; y++)
|
||||
// road
|
||||
else {
|
||||
for (short y = 1; y <= roadheight; y++) {
|
||||
setBlock(x, y, z, roadblock);
|
||||
}
|
||||
}
|
||||
if (plotworld.ROAD_SCHEMATIC_ENABLED)
|
||||
}
|
||||
if (plotworld.ROAD_SCHEMATIC_ENABLED) {
|
||||
final PlotLoc loc = new PlotLoc(absX, absZ);
|
||||
final HashMap<Short, Byte> blocks = plotworld.G_SCH_DATA.get(loc);
|
||||
if (blocks != null)
|
||||
{
|
||||
for (final short y : blocks.keySet())
|
||||
final HashMap<Short, Byte> blocks = plotworld.G_SCH_DATA.get(loc);
|
||||
if (blocks != null) {
|
||||
for (final short y : blocks.keySet()) {
|
||||
setBlockAbs(x, (short) (roadheight + y), z, blocks.get(y));
|
||||
}
|
||||
@ -268,15 +216,11 @@ public class HybridPop extends BukkitPlotPopulator
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void setBlock(final short x, final short y, final short z, final byte[] blkids)
|
||||
{
|
||||
if (blkids.length == 1)
|
||||
}
|
||||
|
||||
private void setBlock(final short x, final short y, final short z, final byte[] blkids) {
|
||||
if (blkids.length == 1) {
|
||||
setBlock(x, y, z, blkids[0]);
|
||||
}
|
||||
else
|
||||
setBlock(x, y, z, blkids[0]);
|
||||
} else {
|
||||
final int i = random(blkids.length);
|
||||
setBlock(x, y, z, blkids[i]);
|
||||
|
||||
Reference in New Issue
Block a user