mirror of
https://github.com/BentoBoxWorld/Boxed.git
synced 2025-01-06 18:47:52 +01:00
Fix out of bounds error
This commit is contained in:
tastybento
parent
54a559fc79
commit
b69206e032
@ -1,171 +0,0 @@
|
|||||||
package world.bentobox.boxed.generators.biomes;
|
|
||||||
|
|
||||||
import java.io.File;
|
|
||||||
import java.util.Arrays;
|
|
||||||
import java.util.Collections;
|
|
||||||
import java.util.EnumMap;
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.Locale;
|
|
||||||
import java.util.Map;
|
|
||||||
import java.util.Map.Entry;
|
|
||||||
import java.util.SortedMap;
|
|
||||||
import java.util.TreeMap;
|
|
||||||
|
|
||||||
import org.bukkit.ChunkSnapshot;
|
|
||||||
import org.bukkit.World.Environment;
|
|
||||||
import org.bukkit.block.Biome;
|
|
||||||
import org.bukkit.block.BlockFace;
|
|
||||||
import org.bukkit.configuration.file.YamlConfiguration;
|
|
||||||
import org.bukkit.generator.BiomeProvider;
|
|
||||||
import org.bukkit.generator.WorldInfo;
|
|
||||||
import org.bukkit.util.Vector;
|
|
||||||
|
|
||||||
import com.google.common.base.Enums;
|
|
||||||
|
|
||||||
import world.bentobox.boxed.Boxed;
|
|
||||||
import world.bentobox.boxed.generators.chunks.BoxedChunkGenerator;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* NOT USED
|
|
||||||
* @author tastybento
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
public abstract class AbstractBoxedBiomeProvider extends BiomeProvider {
|
|
||||||
|
|
||||||
private static final Map<Environment, String> ENV_MAP;
|
|
||||||
|
|
||||||
static {
|
|
||||||
Map<Environment, String> e = new EnumMap<>(Environment.class);
|
|
||||||
e.put(Environment.NORMAL, "distribution.overworld");
|
|
||||||
e.put(Environment.NETHER, "distribution.nether");
|
|
||||||
e.put(Environment.THE_END, "distribution.the_end");
|
|
||||||
ENV_MAP = Collections.unmodifiableMap(e);
|
|
||||||
}
|
|
||||||
|
|
||||||
private final Boxed addon;
|
|
||||||
private final Biome defaultBiome;
|
|
||||||
|
|
||||||
protected final int dist;
|
|
||||||
|
|
||||||
private final int offsetX;
|
|
||||||
private final int offsetZ;
|
|
||||||
protected final Map<BlockFace, SortedMap<Double, Biome>> quadrants;
|
|
||||||
|
|
||||||
|
|
||||||
protected AbstractBoxedBiomeProvider(Boxed boxed, Environment env, Biome defaultBiome) {
|
|
||||||
this.addon = boxed;
|
|
||||||
this.defaultBiome = defaultBiome;
|
|
||||||
dist = addon.getSettings().getIslandDistance();
|
|
||||||
offsetX = addon.getSettings().getIslandXOffset();
|
|
||||||
offsetZ = addon.getSettings().getIslandZOffset();
|
|
||||||
// Load the config
|
|
||||||
File biomeFile = new File(addon.getDataFolder(), "biomes.yml");
|
|
||||||
// Check if it exists and if not, save it from the jar
|
|
||||||
if (!biomeFile.exists()) {
|
|
||||||
addon.saveResource("biomes.yml", true);
|
|
||||||
}
|
|
||||||
YamlConfiguration config = YamlConfiguration.loadConfiguration(biomeFile);
|
|
||||||
SortedMap<Double, Biome> northEast = loadQuad(config, ENV_MAP.get(env) + ".north-east");
|
|
||||||
SortedMap<Double, Biome> southEast = loadQuad(config, ENV_MAP.get(env) + ".south-east");
|
|
||||||
SortedMap<Double, Biome> northWest = loadQuad(config, ENV_MAP.get(env) + ".north-west");
|
|
||||||
SortedMap<Double, Biome> southWest = loadQuad(config, ENV_MAP.get(env) + ".south-west");
|
|
||||||
|
|
||||||
quadrants = new EnumMap<>(BlockFace.class);
|
|
||||||
quadrants.put(BlockFace.NORTH_EAST, northEast);
|
|
||||||
quadrants.put(BlockFace.NORTH_WEST, northWest);
|
|
||||||
quadrants.put(BlockFace.SOUTH_EAST, southEast);
|
|
||||||
quadrants.put(BlockFace.SOUTH_WEST, southWest);
|
|
||||||
}
|
|
||||||
|
|
||||||
private Biome getBiome(BlockFace dir, double d) {
|
|
||||||
Entry<Double, Biome> en = ((TreeMap<Double, Biome>) quadrants.get(dir)).ceilingEntry(d);
|
|
||||||
return en == null ? defaultBiome : en.getValue();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Biome getBiome(WorldInfo worldInfo, int x, int y, int z) {
|
|
||||||
int chunkX = x >> 4;
|
|
||||||
int chunkZ = z >> 4;
|
|
||||||
chunkX = BoxedChunkGenerator.repeatCalc(chunkX);
|
|
||||||
chunkZ = BoxedChunkGenerator.repeatCalc(chunkZ);
|
|
||||||
ChunkSnapshot c = addon.getChunkGenerator(worldInfo.getEnvironment()).getChunk(chunkX, chunkZ);
|
|
||||||
|
|
||||||
if (c != null) {
|
|
||||||
int xx = Math.floorMod(x, 16);
|
|
||||||
int zz = Math.floorMod(z, 16);
|
|
||||||
int yy = Math.max(Math.min(y * 4, worldInfo.getMaxHeight()), worldInfo.getMinHeight()); // To handle bug in Spigot
|
|
||||||
|
|
||||||
Biome b = c.getBiome(xx, yy, zz);
|
|
||||||
// Some biomes should stay from the seed world. These are mostly underground biomes.
|
|
||||||
if (!b.equals(Biome.CUSTOM) && (b.equals(Biome.DRIPSTONE_CAVES) || b.equals(Biome.LUSH_CAVES)
|
|
||||||
|| b.equals(Biome.RIVER) || b.equals(Biome.DEEP_DARK))) {
|
|
||||||
return b;
|
|
||||||
} else {
|
|
||||||
// Return the mapped biome
|
|
||||||
return getMappedBiome(x,z);
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
return this.defaultBiome;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private Biome getMappedBiome(int x, int z) {
|
|
||||||
/*
|
|
||||||
* Biomes go around the island centers
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
Vector s = new Vector(x, 0, z);
|
|
||||||
Vector l = getClosestIsland(s);
|
|
||||||
double dis = l.distanceSquared(s);
|
|
||||||
double d = dis / (dist * dist);
|
|
||||||
Vector direction = s.subtract(l);
|
|
||||||
if (direction.getBlockX() <= 0 && direction.getBlockZ() <= 0) {
|
|
||||||
return getBiome(BlockFace.NORTH_WEST, d);
|
|
||||||
} else if (direction.getBlockX() > 0 && direction.getBlockZ() <= 0) {
|
|
||||||
return getBiome(BlockFace.NORTH_EAST, d);
|
|
||||||
} else if (direction.getBlockX() <= 0 && direction.getBlockZ() > 0) {
|
|
||||||
return getBiome(BlockFace.SOUTH_WEST, d);
|
|
||||||
}
|
|
||||||
return getBiome(BlockFace.SOUTH_EAST, d);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public List<Biome> getBiomes(WorldInfo worldInfo) {
|
|
||||||
// Return all of them for now!
|
|
||||||
return Arrays.stream(Biome.values()).filter(b -> !b.equals(Biome.CUSTOM)).toList();
|
|
||||||
}
|
|
||||||
|
|
||||||
private Vector getClosestIsland(Vector v) {
|
|
||||||
int d = dist * 2;
|
|
||||||
long x = Math.round((double) v.getBlockX() / d) * d + offsetX;
|
|
||||||
long z = Math.round((double) v.getBlockZ() / d) * d + offsetZ;
|
|
||||||
return new Vector(x, 0, z);
|
|
||||||
}
|
|
||||||
|
|
||||||
private SortedMap<Double, Biome> loadQuad(YamlConfiguration config, String string) {
|
|
||||||
SortedMap<Double, Biome> result = new TreeMap<>();
|
|
||||||
if (!config.contains(string)) {
|
|
||||||
return result;
|
|
||||||
}
|
|
||||||
for (String ring : config.getStringList(string)) {
|
|
||||||
String[] split = ring.split(":");
|
|
||||||
if (split.length == 2) {
|
|
||||||
try {
|
|
||||||
double d = Double.parseDouble(split[0]);
|
|
||||||
Biome biome = Enums.getIfPresent(Biome.class, split[1].toUpperCase(Locale.ENGLISH)).orNull();
|
|
||||||
if (biome == null) {
|
|
||||||
addon.logError(split[1].toUpperCase(Locale.ENGLISH) + " is an unknown biome on this server.");
|
|
||||||
} else {
|
|
||||||
result.put(d, biome);
|
|
||||||
}
|
|
||||||
} catch(Exception e) {
|
|
||||||
addon.logError(string + ": " + split[0] + " does not seem to be a double. For integers add a .0 to the end");
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
addon.logError(ring + " must be in the format ratio:biome where ratio is a double.");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return result;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@ -41,7 +41,7 @@ public abstract class AbstractCopyBiomeProvider extends BiomeProvider {
|
|||||||
if (c != null) {
|
if (c != null) {
|
||||||
int xx = Math.floorMod(x, 16);
|
int xx = Math.floorMod(x, 16);
|
||||||
int zz = Math.floorMod(z, 16);
|
int zz = Math.floorMod(z, 16);
|
||||||
int yy = Math.max(Math.min(y * 4, worldInfo.getMaxHeight()), worldInfo.getMinHeight()); // To handle bug in Spigot
|
int yy = Math.max(Math.min(y * 4, worldInfo.getMaxHeight() - 1), worldInfo.getMinHeight()); // To handle bug in Spigot
|
||||||
|
|
||||||
return c.getBiome(xx, yy, zz);
|
return c.getBiome(xx, yy, zz);
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
@ -17,7 +17,6 @@ import world.bentobox.boxed.Boxed;
|
|||||||
public class BoxedSeedChunkGenerator extends AbstractBoxedChunkGenerator {
|
public class BoxedSeedChunkGenerator extends AbstractBoxedChunkGenerator {
|
||||||
|
|
||||||
private final BiomeProvider biomeProvider;
|
private final BiomeProvider biomeProvider;
|
||||||
private final Environment env;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param boxed - addon
|
* @param boxed - addon
|
||||||
@ -26,7 +25,6 @@ public class BoxedSeedChunkGenerator extends AbstractBoxedChunkGenerator {
|
|||||||
public BoxedSeedChunkGenerator(Boxed boxed, Environment env) {
|
public BoxedSeedChunkGenerator(Boxed boxed, Environment env) {
|
||||||
super(boxed);
|
super(boxed);
|
||||||
this.biomeProvider = null;
|
this.biomeProvider = null;
|
||||||
this.env = env;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -37,7 +35,6 @@ public class BoxedSeedChunkGenerator extends AbstractBoxedChunkGenerator {
|
|||||||
public BoxedSeedChunkGenerator(Boxed boxed, Environment env, BiomeProvider bp) {
|
public BoxedSeedChunkGenerator(Boxed boxed, Environment env, BiomeProvider bp) {
|
||||||
super(boxed);
|
super(boxed);
|
||||||
this.biomeProvider = bp;
|
this.biomeProvider = bp;
|
||||||
this.env = env;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user