EpicKnarvik97/PlotSquared
EpicKnarvik97/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-11-25 22:56:45 +01:00
Code Issues Projects Releases Wiki Activity

We can simplify getting relative offset using floormod

Browse Source
This commit is contained in:
dordsor21 2022-06-20 12:38:25 +01:00
parent 802edcba9f
commit 76c2f0ff0b
No known key found for this signature in database
GPG Key ID: 1E53E88969FFCF0B
1 changed files with 10 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
Core/src/main/java/com/plotsquared/core/generator/HybridGen.java
View File

@ -115,22 +115,14 @@ public class HybridGen extends IndependentPlotGenerator {
Location min = result.getMin(); Location min = result.getMin();
int bx = min.getX() - hybridPlotWorld.ROAD_OFFSET_X; int bx = min.getX() - hybridPlotWorld.ROAD_OFFSET_X;
int bz = min.getZ() - hybridPlotWorld.ROAD_OFFSET_Z; int bz = min.getZ() - hybridPlotWorld.ROAD_OFFSET_Z;
// The relative X-coordinate (within the plot) of the minimum X coordinate // The relative X-coordinate (within the plot) of the minimum X coordinate
// contained in the scoped queue // contained in the scoped queue
short relativeOffsetX; short relativeOffsetX = (short) Math.floorMod(bx, hybridPlotWorld.SIZE);
if (bx < 0) {
relativeOffsetX = (short) (hybridPlotWorld.SIZE + (bx % hybridPlotWorld.SIZE));
} else {
relativeOffsetX = (short) (bx % hybridPlotWorld.SIZE);
}
// The relative Z-coordinate (within the plot) of the minimum Z coordinate // The relative Z-coordinate (within the plot) of the minimum Z coordinate
// contained in the scoped queue // contained in the scoped queue
short relativeOffsetZ; short relativeOffsetZ = (short) Math.floorMod(bz, hybridPlotWorld.SIZE);
if (bz < 0) {
relativeOffsetZ = (short) (hybridPlotWorld.SIZE + (bz % hybridPlotWorld.SIZE));
} else {
relativeOffsetZ = (short) (bz % hybridPlotWorld.SIZE);
}
// The X-coordinate of a given X coordinate, relative to the // The X-coordinate of a given X coordinate, relative to the
// plot (Counting from the corner with the least positive // plot (Counting from the corner with the least positive
// coordinates) // coordinates)
@ -251,22 +243,14 @@ public class HybridGen extends IndependentPlotGenerator {
Location min = result.getMin(); Location min = result.getMin();
int bx = min.getX() - hybridPlotWorld.ROAD_OFFSET_X; int bx = min.getX() - hybridPlotWorld.ROAD_OFFSET_X;
int bz = min.getZ() - hybridPlotWorld.ROAD_OFFSET_Z; int bz = min.getZ() - hybridPlotWorld.ROAD_OFFSET_Z;
// The relative X-coordinate (within the plot) of the minimum X coordinate // The relative X-coordinate (within the plot) of the minimum X coordinate
// contained in the scoped queue // contained in the scoped queue
short relativeOffsetX; short relativeOffsetX = (short) Math.floorMod(bx, hybridPlotWorld.SIZE);
if (bx < 0) {
relativeOffsetX = (short) (hybridPlotWorld.SIZE + (bx % hybridPlotWorld.SIZE));
} else {
relativeOffsetX = (short) (bx % hybridPlotWorld.SIZE);
}
// The relative Z-coordinate (within the plot) of the minimum Z coordinate // The relative Z-coordinate (within the plot) of the minimum Z coordinate
// contained in the scoped queue // contained in the scoped queue
short relativeOffsetZ; short relativeOffsetZ = (short) Math.floorMod(bz, hybridPlotWorld.SIZE);
if (bz < 0) {
relativeOffsetZ = (short) (hybridPlotWorld.SIZE + (bz % hybridPlotWorld.SIZE));
} else {
relativeOffsetZ = (short) (bz % hybridPlotWorld.SIZE);
}
boolean allRoad = true; boolean allRoad = true;
boolean overlap = false; boolean overlap = false;
@ -398,16 +382,8 @@ public class HybridGen extends IndependentPlotGenerator {
relativeZ -= hybridPlotWorld.ROAD_OFFSET_Z; relativeZ -= hybridPlotWorld.ROAD_OFFSET_Z;
} }
int size = hybridPlotWorld.PLOT_WIDTH + hybridPlotWorld.ROAD_WIDTH; int size = hybridPlotWorld.PLOT_WIDTH + hybridPlotWorld.ROAD_WIDTH;
if (relativeX < 0) { relativeX = Math.floorMod(relativeX, size);
relativeX = size + (relativeX % size); relativeZ = Math.floorMod(relativeZ, size);
} else {
relativeX = relativeX % size;
}
if (relativeZ < 0) {
relativeZ = size + (relativeZ % size);
} else {
relativeZ = relativeZ % size;
}
BiomeType biome = hybridPlotWorld.G_SCH_B.get(MathMan.pair((short) relativeX, (short) relativeZ)); BiomeType biome = hybridPlotWorld.G_SCH_B.get(MathMan.pair((short) relativeX, (short) relativeZ));
return biome == null ? hybridPlotWorld.getPlotBiome() : biome; return biome == null ? hybridPlotWorld.getPlotBiome() : biome;
} }