mirror of
https://github.com/PolyhedralDev/Terra.git
synced 2026-10-20 23:37:04 +00:00
Implement chunk serialization
This commit is contained in:
dfsek committed
1 parent
f727e9d297
commit
c8e564c2d3
19 files changed
+166
-36
No files matched your search
@@ -95,13 +95,7 @@
|
||||
<dependency>
|
||||
<groupId>org.polydev</groupId>
|
||||
<artifactId>gaea</artifactId>
|
||||
<version>1.10.17</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>javax.vecmath</groupId>
|
||||
<artifactId>vecmath</artifactId>
|
||||
<version>1.5.2</version>
|
||||
<scope>test</scope>
|
||||
<version>1.10.42</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>me.lucko</groupId>
|
||||
|
||||
@@ -2,10 +2,13 @@ package com.dfsek.terra;
|
||||
|
||||
import com.dfsek.terra.config.ConfigUtil;
|
||||
import com.dfsek.terra.generation.TerraChunkGenerator;
|
||||
import com.dfsek.terra.structure.StructureManager;
|
||||
import com.mojang.brigadier.tree.LiteralCommandNode;
|
||||
import me.lucko.commodore.Commodore;
|
||||
import me.lucko.commodore.CommodoreProvider;
|
||||
import me.lucko.commodore.file.CommodoreFileFormat;
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.World;
|
||||
import org.bukkit.command.Command;
|
||||
import org.bukkit.command.PluginCommand;
|
||||
import org.bukkit.configuration.file.FileConfiguration;
|
||||
@@ -15,10 +18,13 @@ import org.jetbrains.annotations.NotNull;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
|
||||
import java.io.InputStream;
|
||||
import java.util.Map;
|
||||
import java.util.logging.Logger;
|
||||
|
||||
public class Terra extends JavaPlugin {
|
||||
private static FileConfiguration config;
|
||||
private static Terra instance;
|
||||
private static StructureManager manager;
|
||||
|
||||
public static Terra getInstance() {
|
||||
return instance;
|
||||
@@ -26,13 +32,13 @@ public class Terra extends JavaPlugin {
|
||||
|
||||
@Override
|
||||
public void onDisable() {
|
||||
super.onDisable();
|
||||
TerraChunkGenerator.saveAll();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onEnable() {
|
||||
ConfigUtil.loadConfig(this);
|
||||
//getCommand("terra").setExecutor(new TerraCommand());
|
||||
manager = new StructureManager(this);
|
||||
|
||||
PluginCommand command = getCommand("terra");
|
||||
command.setExecutor(new TerraCommand());
|
||||
@@ -46,6 +52,7 @@ public class Terra extends JavaPlugin {
|
||||
} else getLogger().severe("Brigadier is not properly supported! Commands will NOT work properly!");
|
||||
saveDefaultConfig();
|
||||
config = getConfig();
|
||||
Bukkit.getScheduler().scheduleAsyncRepeatingTask(this, TerraChunkGenerator::saveAll, ConfigUtil.dataSave, ConfigUtil.dataSave);
|
||||
instance = this;
|
||||
}
|
||||
|
||||
@@ -60,6 +67,10 @@ public class Terra extends JavaPlugin {
|
||||
}
|
||||
}
|
||||
|
||||
public static StructureManager getStructureManager() {
|
||||
return manager;
|
||||
}
|
||||
|
||||
@Override
|
||||
public @Nullable ChunkGenerator getDefaultWorldGenerator(@NotNull String worldName, @Nullable String id) {
|
||||
return new TerraChunkGenerator();
|
||||
|
||||
@@ -16,6 +16,7 @@ import com.sk89q.worldedit.bukkit.WorldEditPlugin;
|
||||
import com.sk89q.worldedit.math.BlockVector3;
|
||||
import com.sk89q.worldedit.regions.Region;
|
||||
import org.bukkit.Location;
|
||||
import org.bukkit.World;
|
||||
import org.bukkit.block.Block;
|
||||
import org.bukkit.command.Command;
|
||||
import org.bukkit.command.CommandExecutor;
|
||||
@@ -30,6 +31,7 @@ import java.io.File;
|
||||
import java.io.IOException;
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Random;
|
||||
|
||||
public class TerraCommand implements CommandExecutor, TabExecutor {
|
||||
@@ -123,6 +125,10 @@ public class TerraCommand implements CommandExecutor, TabExecutor {
|
||||
}
|
||||
}
|
||||
break;
|
||||
case "save-data":
|
||||
TerraChunkGenerator.saveAll();
|
||||
sender.sendMessage("Saved population data.");
|
||||
return true;
|
||||
case "structure":
|
||||
if(! (sender instanceof Player)) {
|
||||
sender.sendMessage("Command is for players only.");
|
||||
@@ -152,13 +158,13 @@ public class TerraCommand implements CommandExecutor, TabExecutor {
|
||||
BlockVector3 max = selection.getMaximumPoint();
|
||||
Location l1 = new Location(pl.getWorld(), min.getBlockX(), min.getBlockY(), min.getBlockZ());
|
||||
Location l2 = new Location(pl.getWorld(), max.getBlockX(), max.getBlockY(), max.getBlockZ());
|
||||
GaeaStructure structure = new GaeaStructure(l1, l2);
|
||||
GaeaStructure structure = new GaeaStructure(l1, l2, args[2]);
|
||||
try {
|
||||
File file = new File(Terra.getInstance().getDataFolder() + File.separator + "export" + File.separator + "structures", args[2] + ".tstructure");
|
||||
file.getParentFile().mkdirs();
|
||||
file.createNewFile();
|
||||
structure.save(file);
|
||||
sender.sendMessage("Saved to " + file.getPath());
|
||||
sender.sendMessage("Saved structure with ID " + structure.getId() + ", UUID: " + structure.getUuid().toString() + " to " + file.getPath());
|
||||
} catch(IOException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
@@ -174,7 +180,7 @@ public class TerraCommand implements CommandExecutor, TabExecutor {
|
||||
}
|
||||
return true;
|
||||
} else if("getspawn".equals(args[1])) {
|
||||
Vector v = new StructureSpawn(50, 25).getNearestSpawn(pl.getLocation().getBlockX(), pl.getLocation().getBlockZ(), pl.getWorld().getSeed());
|
||||
Vector v = new StructureSpawn(500, 100).getNearestSpawn(pl.getLocation().getBlockX(), pl.getLocation().getBlockZ(), pl.getWorld().getSeed());
|
||||
sender.sendMessage(v.getBlockX() + ":" + v.getBlockZ());
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,5 +1,7 @@
|
||||
package com.dfsek.terra.biome;
|
||||
|
||||
import com.dfsek.terra.generation.UserDefinedDecorator;
|
||||
import com.dfsek.terra.generation.UserDefinedGenerator;
|
||||
import org.polydev.gaea.biome.Biome;
|
||||
import org.polydev.gaea.biome.Generator;
|
||||
import org.polydev.gaea.biome.Decorator;
|
||||
|
||||
@@ -13,17 +13,21 @@ import org.bukkit.configuration.file.FileConfiguration;
|
||||
import org.bukkit.plugin.java.JavaPlugin;
|
||||
|
||||
import java.io.File;
|
||||
import java.time.Duration;
|
||||
import java.util.List;
|
||||
import java.util.Objects;
|
||||
import java.util.logging.Logger;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
public class ConfigUtil {
|
||||
public static boolean debug;
|
||||
public static long dataSave;
|
||||
public static void loadConfig(JavaPlugin main) {
|
||||
main.saveDefaultConfig();
|
||||
FileConfiguration config = main.getConfig();
|
||||
|
||||
debug = config.getBoolean("debug", false);
|
||||
dataSave = Duration.parse(Objects.requireNonNull(config.getString("data-save", "PT6M"))).toMillis()/20L;
|
||||
|
||||
Logger logger = main.getLogger();
|
||||
logger.info("Loading config values");
|
||||
|
||||
@@ -3,8 +3,8 @@ package com.dfsek.terra.config.genconfig;
|
||||
import com.dfsek.terra.MaxMin;
|
||||
import com.dfsek.terra.TerraTree;
|
||||
import com.dfsek.terra.biome.UserDefinedBiome;
|
||||
import com.dfsek.terra.biome.UserDefinedDecorator;
|
||||
import com.dfsek.terra.biome.UserDefinedGenerator;
|
||||
import com.dfsek.terra.generation.UserDefinedDecorator;
|
||||
import com.dfsek.terra.generation.UserDefinedGenerator;
|
||||
import com.dfsek.terra.carving.UserDefinedCarver;
|
||||
import com.dfsek.terra.config.ConfigUtil;
|
||||
import com.dfsek.terra.config.TerraConfigObject;
|
||||
|
||||
@@ -2,14 +2,11 @@ package com.dfsek.terra.config.genconfig;
|
||||
|
||||
import com.dfsek.terra.MaxMin;
|
||||
import com.dfsek.terra.carving.UserDefinedCarver;
|
||||
import com.dfsek.terra.config.ConfigLoader;
|
||||
import com.dfsek.terra.config.TerraConfigObject;
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.Material;
|
||||
import org.bukkit.block.data.BlockData;
|
||||
import org.bukkit.configuration.InvalidConfigurationException;
|
||||
import org.bukkit.plugin.java.JavaPlugin;
|
||||
import org.bukkit.scheduler.BukkitTask;
|
||||
import org.polydev.gaea.math.ProbabilityCollection;
|
||||
|
||||
import java.io.File;
|
||||
@@ -123,6 +120,8 @@ public class CarverConfig extends TerraConfigObject {
|
||||
|
||||
replaceIsBlacklistInner = getBoolean("palette.inner.replace-blacklist", false);
|
||||
replaceIsBlacklistOuter = getBoolean("palette.outer.replace-blacklist", false);
|
||||
replaceIsBlacklistTop = getBoolean("palette.top.replace-blacklist", false);
|
||||
replaceIsBlacklistBottom = getBoolean("palette.bottom.replace-blacklist", false);
|
||||
|
||||
double[] start = new double[] {getDouble("start.x"), getDouble("start.y"), getDouble("start.z")};
|
||||
double[] mutate = new double[] {getDouble("mutate.x"), getDouble("mutate.y"), getDouble("mutate.z"), getDouble("mutate.radius")};
|
||||
|
||||
@@ -5,6 +5,7 @@ import com.dfsek.terra.config.WorldConfig;
|
||||
import com.dfsek.terra.population.CavePopulator;
|
||||
import com.dfsek.terra.population.FloraPopulator;
|
||||
import com.dfsek.terra.population.OrePopulator;
|
||||
import com.dfsek.terra.population.StructurePopulator;
|
||||
import com.dfsek.terra.population.TreePopulator;
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.Material;
|
||||
@@ -18,17 +19,25 @@ import org.polydev.gaea.math.ChunkInterpolator;
|
||||
import org.polydev.gaea.math.FastNoise;
|
||||
import org.polydev.gaea.population.PopulationManager;
|
||||
|
||||
import java.io.FileNotFoundException;
|
||||
import java.io.IOException;
|
||||
import java.util.Arrays;
|
||||
import java.util.Collections;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Random;
|
||||
|
||||
public class TerraChunkGenerator extends GaeaChunkGenerator {
|
||||
private static final BlockData STONE = Material.STONE.createBlockData();
|
||||
private static final BlockData WATER = Material.WATER.createBlockData();
|
||||
private final PopulationManager popMan = new PopulationManager();
|
||||
private boolean needsLoad = true;
|
||||
private static final Map<World, PopulationManager> popMap = new HashMap<>();
|
||||
|
||||
public TerraChunkGenerator() {
|
||||
super(ChunkInterpolator.InterpolationType.TRILINEAR);
|
||||
popMan.attach(new StructurePopulator());
|
||||
popMan.attach(new TreePopulator());
|
||||
popMan.attach(new FloraPopulator());
|
||||
popMan.attach(new OrePopulator());
|
||||
@@ -36,6 +45,7 @@ public class TerraChunkGenerator extends GaeaChunkGenerator {
|
||||
|
||||
@Override
|
||||
public ChunkData generateBase(@NotNull World world, @NotNull Random random, int chunkX, int chunkZ, FastNoise fastNoise) {
|
||||
if(needsLoad) load(world);
|
||||
ChunkData chunk = createChunkData(world);
|
||||
int sea = WorldConfig.fromWorld(world).seaLevel;
|
||||
for(byte x = 0; x < 16; x++) {
|
||||
@@ -49,6 +59,31 @@ public class TerraChunkGenerator extends GaeaChunkGenerator {
|
||||
return chunk;
|
||||
}
|
||||
|
||||
private void load(World w) {
|
||||
try {
|
||||
popMan.loadBlocks(w);
|
||||
} catch(IOException e) {
|
||||
if(e instanceof FileNotFoundException) {
|
||||
Bukkit.getLogger().warning("[Terra] No population chunks were loaded. If this is your first time starting your server with Terra, or if you are creating a new world, this is normal.");
|
||||
} else e.printStackTrace();
|
||||
} catch(ClassNotFoundException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
popMap.put(w, popMan);
|
||||
needsLoad = false;
|
||||
}
|
||||
|
||||
public static void saveAll() {
|
||||
for(Map.Entry<World, PopulationManager> e : popMap.entrySet()) {
|
||||
try {
|
||||
e.getValue().saveBlocks(e.getKey());
|
||||
Bukkit.getLogger().info("[Terra] Saved data for world " + e.getKey().getName());
|
||||
} catch(IOException ioException) {
|
||||
ioException.printStackTrace();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getNoiseOctaves(World world) {
|
||||
return 4;
|
||||
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package com.dfsek.terra.biome;
|
||||
package com.dfsek.terra.generation;
|
||||
|
||||
import org.bukkit.block.Biome;
|
||||
import org.polydev.gaea.biome.Decorator;
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package com.dfsek.terra.biome;
|
||||
package com.dfsek.terra.generation;
|
||||
|
||||
import com.dfsek.terra.math.NoiseFunction2;
|
||||
import com.dfsek.terra.math.NoiseFunction3;
|
||||
@@ -21,6 +21,7 @@ import java.util.Random;
|
||||
import java.util.Set;
|
||||
|
||||
public class CavePopulator extends BlockPopulator {
|
||||
private static final Map<Material, BlockData> shiftStorage = new HashMap<>(); // Persist BlockData created for shifts, to avoid re-calculating each time.
|
||||
@Override
|
||||
public void populate(@NotNull World world, @NotNull Random random, @NotNull Chunk chunk) {
|
||||
ProfileFuture cave = TerraProfiler.fromWorld(world).measure("CaveTime");
|
||||
@@ -34,16 +35,16 @@ public class CavePopulator extends BlockPopulator {
|
||||
Material m = b.getType();
|
||||
if(e.getValue().equals(CarvingData.CarvingType.CENTER) && c.isReplaceableInner(m)) {
|
||||
if(c.getShiftedBlocks().containsKey(b.getType())) shiftCandidate.put(b.getLocation(), b.getType());
|
||||
b.setBlockData(c.getPaletteInner(v.getBlockY()).get(random), false);
|
||||
b.setBlockData(c.getPaletteInner(v.getBlockY()).get(random), c.getUpdateBlocks().contains(m));
|
||||
} else if(e.getValue().equals(CarvingData.CarvingType.WALL) && c.isReplaceableOuter(m)){
|
||||
if(c.getShiftedBlocks().containsKey(b.getType())) shiftCandidate.put(b.getLocation(), b.getType());
|
||||
b.setBlockData(c.getPaletteOuter(v.getBlockY()).get(random), false);
|
||||
b.setBlockData(c.getPaletteOuter(v.getBlockY()).get(random), c.getUpdateBlocks().contains(m));
|
||||
} else if(e.getValue().equals(CarvingData.CarvingType.TOP) && c.isReplaceableTop(m)){
|
||||
if(c.getShiftedBlocks().containsKey(b.getType())) shiftCandidate.put(b.getLocation(), b.getType());
|
||||
b.setBlockData(c.getPaletteTop(v.getBlockY()).get(random), false);
|
||||
b.setBlockData(c.getPaletteTop(v.getBlockY()).get(random), c.getUpdateBlocks().contains(m));
|
||||
} else if(e.getValue().equals(CarvingData.CarvingType.BOTTOM) && c.isReplaceableBottom(m)){
|
||||
if(c.getShiftedBlocks().containsKey(b.getType())) shiftCandidate.put(b.getLocation(), b.getType());
|
||||
b.setBlockData(c.getPaletteBottom(v.getBlockY()).get(random), false);
|
||||
b.setBlockData(c.getPaletteBottom(v.getBlockY()).get(random), c.getUpdateBlocks().contains(m));
|
||||
}
|
||||
if(c.getUpdateBlocks().contains(m)) {
|
||||
updateNeeded.add(b);
|
||||
@@ -58,7 +59,7 @@ public class CavePopulator extends BlockPopulator {
|
||||
while(mut.getBlock().getType().equals(orig));
|
||||
try {
|
||||
if(c.getShiftedBlocks().get(shiftCandidate.get(l)).contains(mut.getBlock().getType())) {
|
||||
mut.getBlock().setType(shiftCandidate.get(l));
|
||||
mut.getBlock().setBlockData(shiftStorage.computeIfAbsent(shiftCandidate.get(l), Material::createBlockData), false);
|
||||
j++;
|
||||
}
|
||||
} catch(NullPointerException ignored) {}
|
||||
|
||||
@@ -4,6 +4,7 @@ import com.dfsek.terra.TerraProfiler;
|
||||
import com.dfsek.terra.biome.TerraBiomeGrid;
|
||||
import com.dfsek.terra.biome.UserDefinedBiome;
|
||||
import com.dfsek.terra.config.genconfig.BiomeConfig;
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.Chunk;
|
||||
import org.bukkit.World;
|
||||
import org.bukkit.block.Block;
|
||||
@@ -13,11 +14,16 @@ import org.polydev.gaea.population.GaeaBlockPopulator;
|
||||
import org.polydev.gaea.profiler.ProfileFuture;
|
||||
import org.polydev.gaea.world.Flora;
|
||||
|
||||
import java.util.HashSet;
|
||||
import java.util.Random;
|
||||
import java.util.Set;
|
||||
|
||||
public class FloraPopulator extends GaeaBlockPopulator {
|
||||
Set<Chunk> pop = new HashSet<>();
|
||||
@Override
|
||||
public void populate(@NotNull World world, @NotNull Random random, @NotNull Chunk chunk) {
|
||||
if(pop.contains(chunk)) Bukkit.getLogger().warning("Already populated flora in chunk: " + chunk);
|
||||
pop.add(chunk);
|
||||
ProfileFuture flora = TerraProfiler.fromWorld(world).measure("FloraTime");
|
||||
for(int x = 0; x < 16; x++) {
|
||||
for(int z = 0; z < 16; z++) {
|
||||
|
||||
@@ -0,0 +1,38 @@
|
||||
package com.dfsek.terra.population;
|
||||
|
||||
import com.dfsek.terra.Terra;
|
||||
import com.dfsek.terra.structure.GaeaStructure;
|
||||
import com.dfsek.terra.structure.StructureSpawn;
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.Chunk;
|
||||
import org.bukkit.Location;
|
||||
import org.bukkit.World;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
import org.polydev.gaea.population.GaeaBlockPopulator;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
import java.util.HashSet;
|
||||
import java.util.Random;
|
||||
import java.util.Set;
|
||||
|
||||
public class StructurePopulator extends GaeaBlockPopulator {
|
||||
StructureSpawn spawnTest = new StructureSpawn(100, 5);
|
||||
Set<Chunk> pop = new HashSet<>();
|
||||
@Override
|
||||
public void populate(@NotNull World world, @NotNull Random random, @NotNull Chunk chunk) {
|
||||
if(pop.contains(chunk)) Bukkit.getLogger().warning("Already populated structures in chunk: " + chunk);
|
||||
pop.add(chunk);
|
||||
Location near = spawnTest.getNearestSpawn((chunk.getX() << 4) + 8, (chunk.getZ() << 4), world.getSeed()).toLocation(world);
|
||||
if(near.getChunk().equals(chunk)) {
|
||||
Terra.getInstance().getLogger().info("Spawning structure at " + near.toString() + " in chunk " + chunk);
|
||||
try {
|
||||
GaeaStructure struc = GaeaStructure.load(new File(Terra.getInstance().getDataFolder() + File.separator + "export" + File.separator + "structures", "demo.tstructure"));
|
||||
near.setY(world.getHighestBlockYAt(near));
|
||||
struc.paste(near);
|
||||
} catch(IOException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -3,7 +3,7 @@ package com.dfsek.terra.population;
|
||||
import com.dfsek.terra.Terra;
|
||||
import com.dfsek.terra.TerraProfiler;
|
||||
import com.dfsek.terra.biome.TerraBiomeGrid;
|
||||
import com.dfsek.terra.biome.UserDefinedDecorator;
|
||||
import com.dfsek.terra.generation.UserDefinedDecorator;
|
||||
import org.bukkit.Chunk;
|
||||
import org.bukkit.Location;
|
||||
import org.bukkit.World;
|
||||
|
||||
@@ -15,10 +15,13 @@ import java.io.ObjectInputStream;
|
||||
import java.io.ObjectOutputStream;
|
||||
import java.io.Serializable;
|
||||
import java.util.Objects;
|
||||
import java.util.UUID;
|
||||
|
||||
public class GaeaStructure implements Serializable {
|
||||
public static final long serialVersionUID = -6664585217063842034L;
|
||||
public static final long serialVersionUID = -6664585217063842035L;
|
||||
private final StructureContainedBlock[][][] structure;
|
||||
private final String id;
|
||||
private final UUID uuid;
|
||||
|
||||
public static GaeaStructure load(File f) throws IOException {
|
||||
try {
|
||||
@@ -28,7 +31,9 @@ public class GaeaStructure implements Serializable {
|
||||
}
|
||||
}
|
||||
|
||||
public GaeaStructure(Location l1, Location l2) {
|
||||
public GaeaStructure(Location l1, Location l2, String id) {
|
||||
this.id = id;
|
||||
this.uuid = UUID.randomUUID();
|
||||
if(l1.getX() > l2.getX() || l1.getY() > l2.getY() || l1.getZ() > l2.getZ()) throw new IllegalArgumentException("Invalid locations provided!");
|
||||
structure = new StructureContainedBlock[l2.getBlockX()-l1.getBlockX()+1][l2.getBlockY()-l1.getBlockY()+1][l2.getBlockZ()-l1.getBlockZ()+1];
|
||||
for(int x = 0; x <= l2.getBlockX()-l1.getBlockX(); x++) {
|
||||
@@ -87,4 +92,12 @@ public class GaeaStructure implements Serializable {
|
||||
oos.writeObject(o);
|
||||
oos.close();
|
||||
}
|
||||
|
||||
public String getId() {
|
||||
return id;
|
||||
}
|
||||
|
||||
public UUID getUuid() {
|
||||
return uuid;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,29 @@
|
||||
package com.dfsek.terra.structure;
|
||||
|
||||
import org.bukkit.plugin.java.JavaPlugin;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
import java.util.UUID;
|
||||
import java.util.logging.Logger;
|
||||
|
||||
public class StructureManager {
|
||||
private static StructureManager singleton;
|
||||
private Logger logger;
|
||||
private final Map<UUID, GaeaStructure> structures = new HashMap<>();
|
||||
public StructureManager(JavaPlugin main) {
|
||||
if(singleton!= null) throw new IllegalStateException("Only one instance of StructureManager may exist at a given time.");
|
||||
this.logger = main.getLogger();
|
||||
logger.info("Initializing StructureManager...");
|
||||
singleton = this;
|
||||
}
|
||||
public GaeaStructure get(UUID uuid) {
|
||||
return structures.get(uuid);
|
||||
}
|
||||
public void load(File file) throws IOException {
|
||||
GaeaStructure s = GaeaStructure.load(file);
|
||||
structures.put(s.getUuid(), s);
|
||||
}
|
||||
}
|
||||
@@ -33,13 +33,11 @@ public class StructureSpawn {
|
||||
return shortest;
|
||||
}
|
||||
private Vector getStructureChunkSpawn(int structureChunkX, int structureChunkZ, long seed) {
|
||||
if(ConfigUtil.debug) Bukkit.getLogger().info("Structure chunk: " + structureChunkX + ":" + structureChunkZ);
|
||||
Random r = new Random(MathUtil.getCarverChunkSeed(structureChunkX, structureChunkZ, seed));
|
||||
int offsetX = r.nextInt(width);
|
||||
int offsetZ = r.nextInt(width);
|
||||
int sx = structureChunkX * (width + 2*separation) + offsetX;
|
||||
int sz = structureChunkZ * (width + 2*separation) + offsetZ;
|
||||
if(ConfigUtil.debug) Bukkit.getLogger().info("Structure coords: " + sx + ":" + sz);
|
||||
return new Vector(sx, 0, sz);
|
||||
}
|
||||
}
|
||||
@@ -35,4 +35,5 @@ terra {
|
||||
}
|
||||
getspawn;
|
||||
}
|
||||
save-data;
|
||||
}
|
||||
@@ -1,12 +1,5 @@
|
||||
import com.dfsek.terra.biome.BiomeZone;
|
||||
import org.polydev.gaea.math.FastNoise;
|
||||
|
||||
import javax.vecmath.Vector2f;
|
||||
import java.util.Arrays;
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
import java.util.Random;
|
||||
|
||||
public class DistributionTest {
|
||||
private static final double[] normalMap = new double[] {-0.5522426962852478D, -0.5356624126434326D, -0.5250319838523865D, -0.5172030329704285D, -0.5108230710029602D, -0.5051751136779785D, -0.5003848075866699D, -0.496286541223526D, -0.49219056963920593D, -0.488725870847702D, -0.48548242449760437D, -0.48233601450920105D, -0.4794590473175049D, -0.47680431604385376D, -0.4741802513599396D, -0.4716983437538147D, -0.46938973665237427D, -0.4671768844127655D, -0.46493932604789734D, -0.4628496468067169D, -0.46085309982299805D, -0.45893776416778564D, -0.4571230709552765D, -0.45534923672676086D, -0.4535684585571289D, -0.4518905282020569D, -0.45032820105552673D, -0.44873151183128357D, -0.4472157657146454D, -0.445724755525589D, -0.4442773759365082D, -0.44282811880111694D, -0.44138428568840027D, -0.43998438119888306D, -0.43863797187805176D, -0.4373200237751007D, -0.43603432178497314D, -0.4348065257072449D, -0.4335438907146454D, -0.43234220147132874D, -0.4311666488647461D, -0.42999887466430664D, -0.4288702607154846D, -0.4277186393737793D, -0.42660200595855713D, -0.425540030002594D, -0.42445454001426697D, -0.42338213324546814D, -0.42237231135368347D, -0.4213787317276001D, -0.42034342885017395D, -0.41934314370155334D, -0.41838738322257996D, -0.41747593879699707D, -0.4165368676185608D, -0.41563472151756287D, -0.41473135352134705D, -0.41381341218948364D, -0.412920743227005D, -0.4120390713214874D, -0.41113483905792236D, -0.41027551889419556D, -0.40940171480178833D, -0.4085462987422943D, -0.40771594643592834D, -0.4068986475467682D, -0.4060843288898468D, -0.4052877426147461D, -0.40450364351272583D, -0.40370258688926697D, -0.40295007824897766D, -0.4022042751312256D, -0.40143170952796936D, -0.40068766474723816D, -0.3999272882938385D, -0.39916759729385376D, -0.3984144926071167D, -0.3977096378803253D, -0.3969724774360657D, -0.3962542712688446D, -0.3955434262752533D, -0.39482179284095764D, -0.39413219690322876D, -0.3934393525123596D, -0.39274853467941284D, -0.3920603394508362D, -0.3913818895816803D, -0.3907110095024109D, -0.39001911878585815D, -0.3893643021583557D, -0.38873276114463806D, -0.38809072971343994D, -0.38744935393333435D, -0.38681110739707947D, -0.38617849349975586D, -0.3855555057525635D, -0.3849259316921234D, -0.38428404927253723D, -0.38368701934814453D, -0.38305720686912537D, -0.3824397325515747D, -0.38183310627937317D, -0.3812190294265747D, -0.38061732053756714D, -0.3800400495529175D, -0.37945547699928284D, -0.37887564301490784D, -0.3783135712146759D, -0.3777320683002472D, -0.3771609365940094D, -0.3765930235385895D, -0.3760446608066559D, -0.37546253204345703D, -0.37489989399909973D, -0.37433329224586487D, -0.3737635910511017D, -0.37320101261138916D, -0.37265515327453613D, -0.3721090257167816D, -0.3715764880180359D, -0.3710474967956543D, -0.3705263137817383D, -0.37000274658203125D, -0.36946558952331543D, -0.3689403533935547D, -0.3684338629245758D, -0.3679268956184387D, -0.3674132525920868D, -0.3668895363807678D, -0.36637264490127563D, -0.3658500015735626D, -0.3653477430343628D, -0.3648494482040405D, -0.3643417954444885D, -0.36385640501976013D, -0.36335185170173645D, -0.3628855347633362D, -0.3624073565006256D, -0.3619007468223572D, -0.36142677068710327D, -0.3609183132648468D, -0.3604544401168823D, -0.3599613606929779D, -0.3594810962677002D, -0.3590005338191986D, -0.3585355281829834D, -0.35805660486221313D, -0.35758334398269653D, -0.3571120500564575D, -0.356632798910141D, -0.35616397857666016D, -0.3557022213935852D, -0.35522621870040894D, -0.35475999116897583D, -0.3543040454387665D, -0.3538462817668915D, -0.35339656472206116D, -0.35294967889785767D, -0.3525013029575348D, -0.35205140709877014D, -0.3516044616699219D, -0.3511776924133301D, -0.3507419228553772D, -0.350308358669281D, -0.34987354278564453D, -0.3494442403316498D, -0.34901976585388184D, -0.34858623147010803D, -0.3481590747833252D, -0.3477269113063812D, -0.34729984402656555D, -0.34686949849128723D, -0.34644952416419983D, -0.3460380733013153D, -0.345601350069046D, -0.3451806306838989D, -0.34476256370544434D, -0.3443388342857361D, -0.34393346309661865D, -0.3435156047344208D, -0.34309715032577515D, -0.34269776940345764D, -0.34230056405067444D, -0.34190237522125244D, -0.3415068984031677D, -0.3411085307598114D, -0.3407077193260193D, -0.3403150737285614D, -0.3399060070514679D, -0.3395008146762848D, -0.33910876512527466D, -0.3387194573879242D, -0.3383338451385498D, -0.3379477858543396D, -0.33756473660469055D, -0.33716049790382385D, -0.336769163608551D, -0.33637988567352295D, -0.3360031843185425D, -0.33561065793037415D, -0.33522093296051025D, -0.33484047651290894D, -0.3344566524028778D, -0.3340719938278198D, -0.33369651436805725D, -0.33331871032714844D, -0.3329450190067291D, -0.3325762152671814D, -0.3321962356567383D, -0.3318250775337219D, -0.33146360516548157D, -0.331096351146698D, -0.3307240307331085D, -0.33036690950393677D, -0.3300083577632904D, -0.3296314477920532D, -0.32925838232040405D, -0.3289034366607666D, -0.32853060960769653D, -0.3281768262386322D, -0.3278148Line truncated
|
||||
//private static final List<Double> m = Arrays.asList(normalMap);
|
||||
|
||||
Reference in new issue
Block a user