diff --git a/.editorconfig b/.editorconfig index 36339ddae..182e9199e 100644 --- a/.editorconfig +++ b/.editorconfig @@ -179,7 +179,7 @@ ij_java_space_before_for_left_brace = true ij_java_space_before_for_parentheses = false ij_java_space_before_for_semicolon = false ij_java_space_before_if_left_brace = true -ij_java_space_before_if_parentheses = true +ij_java_space_before_if_parentheses = false ij_java_space_before_method_call_parentheses = false ij_java_space_before_method_left_brace = true ij_java_space_before_method_parentheses = false @@ -340,7 +340,7 @@ ij_json_wrap_long_lines = false [{*.yaml,*.yml}] indent_size = 2 -ij_yaml_keep_indents_on_empty_lines = false +ij_yaml_keep_indents_on_empty_lines = true ij_yaml_keep_line_breaks = true ij_yaml_space_before_colon = true ij_yaml_spaces_within_braces = true diff --git a/.idea/misc.xml b/.idea/misc.xml index f56146bc8..594038a0a 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,6 +1,9 @@ + + + diff --git a/Terra.iml b/Terra.iml new file mode 100644 index 000000000..f2029cb9e --- /dev/null +++ b/Terra.iml @@ -0,0 +1,17 @@ + + + + + + + + + + SPIGOT + + + + + \ No newline at end of file diff --git a/src/main/java/com/dfsek/terra/TerraWorld.java b/src/main/java/com/dfsek/terra/TerraWorld.java index 9bda533d6..8f7024a29 100644 --- a/src/main/java/com/dfsek/terra/TerraWorld.java +++ b/src/main/java/com/dfsek/terra/TerraWorld.java @@ -39,7 +39,7 @@ public class TerraWorld { for(int i = 0; i < config.biomeList.size(); i++) { String partName = config.biomeList.get(i); try { - if (partName.startsWith("BIOME:")) { + if(partName.startsWith("BIOME:")) { UserDefinedBiome[][] temp = new UserDefinedBiome[1][1]; UserDefinedBiome b = config.getBiomes().get(partName.substring(6)).getBiome(); temp[0][0] = b; diff --git a/src/main/java/com/dfsek/terra/biome/TerraBiomeGrid.java b/src/main/java/com/dfsek/terra/biome/TerraBiomeGrid.java index 7f66aa428..dbc47eb3f 100644 --- a/src/main/java/com/dfsek/terra/biome/TerraBiomeGrid.java +++ b/src/main/java/com/dfsek/terra/biome/TerraBiomeGrid.java @@ -21,11 +21,11 @@ public class TerraBiomeGrid extends BiomeGrid { public TerraBiomeGrid(World w, double freq1, double freq2, BiomeZone zone, ConfigPack c, UserDefinedGrid erosion) { super(w, freq1, freq2, 0, 0); - if (c.biomeBlend) { + if(c.biomeBlend) { perturb = new CoordinatePerturb(c.blendFreq, c.blendAmp, w.getSeed()); } this.zone = zone; - if (c.erosionEnable) { + if(c.erosionEnable) { erode = new ErosionNoise(c.erosionFreq, c.erosionThresh, c.erosionOctaves, w.getSeed()); this.erosionGrid = erosion; } @@ -39,7 +39,7 @@ public class TerraBiomeGrid extends BiomeGrid { public Biome getBiome(int x, int z, GenerationPhase phase) { int xp = x; int zp = z; - if (perturb != null && phase.equals(GenerationPhase.PALETTE_APPLY)) { + if(perturb != null && phase.equals(GenerationPhase.PALETTE_APPLY)) { Vector2 perturbCoords = perturb.getShiftedCoords(x, z); xp = (int) perturbCoords.getX(); zp = (int) perturbCoords.getZ(); diff --git a/src/main/java/com/dfsek/terra/carving/SimplexCarver.java b/src/main/java/com/dfsek/terra/carving/SimplexCarver.java index 948d2b8e7..42a951f80 100644 --- a/src/main/java/com/dfsek/terra/carving/SimplexCarver.java +++ b/src/main/java/com/dfsek/terra/carving/SimplexCarver.java @@ -58,7 +58,7 @@ public class SimplexCarver extends Carver { if(finalNoise > 0.5) { c.carve(x - ox, y, z - oz, type); double finalNoiseUp = (-0.05 * Math.abs((y + 1) - (heightNoise * 16 + 24)) + 1 - simplex) * hc; - if (finalNoiseUp > 0.5) { + if(finalNoiseUp > 0.5) { type = CarvingData.CarvingType.CENTER; } else type = CarvingData.CarvingType.TOP; } diff --git a/src/main/java/com/dfsek/terra/config/base/ConfigPack.java b/src/main/java/com/dfsek/terra/config/base/ConfigPack.java index e57eccdc6..c57fad859 100644 --- a/src/main/java/com/dfsek/terra/config/base/ConfigPack.java +++ b/src/main/java/com/dfsek/terra/config/base/ConfigPack.java @@ -158,6 +158,22 @@ public class ConfigPack extends YamlConfiguration { LangUtil.log("config-pack.loaded", Level.INFO, getID(), String.valueOf((System.nanoTime() - l) / 1000000D)); } + public String getID() { + return id; + } + + public Map getBiomes() { + return biomes; + } + + public StructureConfig getStructure(String id) { + return structures.get(id); + } + + public BiomeGridConfig getBiomeGrid(String id) { + return grids.get(id); + } + public static synchronized void loadAll(JavaPlugin main) { configs.clear(); File file = new File(main.getDataFolder(), "packs"); @@ -188,22 +204,6 @@ public class ConfigPack extends YamlConfiguration { } } - public String getID() { - return id; - } - - public Map getBiomes() { - return biomes; - } - - public StructureConfig getStructure(String id) { - return structures.get(id); - } - - public BiomeGridConfig getBiomeGrid(String id) { - return grids.get(id); - } - public static synchronized ConfigPack fromID(String id) { return configs.get(id); } diff --git a/src/main/java/com/dfsek/terra/config/base/WorldConfig.java b/src/main/java/com/dfsek/terra/config/base/WorldConfig.java index 426ce6af3..ae8729502 100644 --- a/src/main/java/com/dfsek/terra/config/base/WorldConfig.java +++ b/src/main/java/com/dfsek/terra/config/base/WorldConfig.java @@ -42,7 +42,7 @@ public class WorldConfig { FileConfiguration config = new YamlConfiguration(); Debug.info("Loading config " + configID + " for world " + worldID); try { // Load/create world config file - if (configID == null || configID.equals("")) + if(configID == null || configID.equals("")) throw new ConfigException("Config pack unspecified in bukkit.yml!", worldID); File configFile = new File(main.getDataFolder() + File.separator + "worlds", worldID + ".yml"); if(!configFile.exists()) { @@ -58,19 +58,19 @@ public class WorldConfig { tConfig = ConfigPack.fromID(configID); - if (tConfig == null) + if(tConfig == null) throw new ConfigException("No such config pack: \"" + configID + "\". This pack either does not exist, or failed to load due to configuration errors.", worldID); // Load image stuff try { biomeXChannel = ImageLoader.Channel.valueOf(Objects.requireNonNull(config.getString("image.channels.biome-x", "red")).toUpperCase()); biomeZChannel = ImageLoader.Channel.valueOf(Objects.requireNonNull(config.getString("image.channels.biome-z", "green")).toUpperCase()); - if (biomeZChannel.equals(biomeXChannel)) + if(biomeZChannel.equals(biomeXChannel)) throw new InvalidConfigurationException("2 objects share the same image channels: biome-x and biome-z"); zoneChannel = ImageLoader.Channel.valueOf(Objects.requireNonNull(config.getString("image.channels.zone", "blue")).toUpperCase()); - if (zoneChannel.equals(biomeXChannel) || zoneChannel.equals(biomeZChannel)) + if(zoneChannel.equals(biomeXChannel) || zoneChannel.equals(biomeZChannel)) throw new InvalidConfigurationException("2 objects share the same image channels: zone and biome-x/z"); - if (fromImage) { + if(fromImage) { try { //noinspection ConstantConditions imageLoader = new ImageLoader(new File(config.getString("image.file")), diff --git a/src/main/java/com/dfsek/terra/generation/TerraChunkGenerator.java b/src/main/java/com/dfsek/terra/generation/TerraChunkGenerator.java index c3579a826..a27f5b11c 100644 --- a/src/main/java/com/dfsek/terra/generation/TerraChunkGenerator.java +++ b/src/main/java/com/dfsek/terra/generation/TerraChunkGenerator.java @@ -70,7 +70,7 @@ public class TerraChunkGenerator extends GaeaChunkGenerator { } public static synchronized void fixChunk(Chunk c) { - if (!(c.getWorld().getGenerator() instanceof TerraChunkGenerator)) throw new IllegalArgumentException(); + if(!(c.getWorld().getGenerator() instanceof TerraChunkGenerator)) throw new IllegalArgumentException(); popMap.get(c.getWorld()).checkNeighbors(c.getX(), c.getZ(), c.getWorld()); } @@ -82,10 +82,10 @@ public class TerraChunkGenerator extends GaeaChunkGenerator { @Override public ChunkData generateBase(@NotNull World world, @NotNull Random random, int chunkX, int chunkZ, ChunkInterpolator interpolator) { - if (needsLoad) load(world); // Load population data for world. + if(needsLoad) load(world); // Load population data for world. ChunkData chunk = createChunkData(world); TerraWorld tw = TerraWorld.getWorld(world); - if (!tw.isSafe()) return chunk; + if(!tw.isSafe()) return chunk; ConfigPack config = tw.getConfig(); int xOrig = (chunkX << 4); int zOrig = (chunkZ << 4); @@ -109,7 +109,7 @@ public class TerraChunkGenerator extends GaeaChunkGenerator { slab.getStairs(), slab.getSlabThreshold(), interpolator); } paletteLevel++; - } else if (y <= sea) { + } else if(y <= sea) { chunk.setBlock(x, y, z, seaPalette.get(sea - y, x + xOrig, z + zOrig)); paletteLevel = 0; } else paletteLevel = 0; @@ -121,15 +121,15 @@ public class TerraChunkGenerator extends GaeaChunkGenerator { private void prepareBlockPart(BlockData down, BlockData orig, ChunkData chunk, Vector block, Map> slabs, Map> stairs, double thresh, ChunkInterpolator interpolator) { - if (interpolator.getNoise(block.getBlockX(), block.getBlockY() - 0.4, block.getBlockZ()) > thresh) { - if (stairs != null) { + if(interpolator.getNoise(block.getBlockX(), block.getBlockY() - 0.4, block.getBlockZ()) > thresh) { + if(stairs != null) { Palette stairPalette = stairs.get(down.getMaterial()); - if (stairPalette != null) { + if(stairPalette != null) { BlockData stair = stairPalette.get(0, block.getBlockX(), block.getBlockZ()); Stairs stairNew = (Stairs) stair.clone(); - if (interpolator.getNoise(block.getBlockX() - 0.5, block.getBlockY(), block.getBlockZ()) > thresh) { + if(interpolator.getNoise(block.getBlockX() - 0.5, block.getBlockY(), block.getBlockZ()) > thresh) { stairNew.setFacing(BlockFace.WEST); - } else if (interpolator.getNoise(block.getBlockX(), block.getBlockY(), block.getBlockZ() - 0.5) > thresh) { + } else if(interpolator.getNoise(block.getBlockX(), block.getBlockY(), block.getBlockZ() - 0.5) > thresh) { stairNew.setFacing(BlockFace.NORTH); } else if(interpolator.getNoise(block.getBlockX(), block.getBlockY(), block.getBlockZ() + 0.5) > thresh) { stairNew.setFacing(BlockFace.SOUTH); diff --git a/src/main/java/com/dfsek/terra/generation/UserDefinedGenerator.java b/src/main/java/com/dfsek/terra/generation/UserDefinedGenerator.java index c730b4148..ac5ea5d84 100644 --- a/src/main/java/com/dfsek/terra/generation/UserDefinedGenerator.java +++ b/src/main/java/com/dfsek/terra/generation/UserDefinedGenerator.java @@ -40,7 +40,7 @@ public class UserDefinedGenerator extends Generator { for(int y = 0; y < 256; y++) { Palette d = DataUtil.BLANK_PALETTE; for(Map.Entry> e : paletteMap.entrySet()) { - if (e.getKey() >= y) { + if(e.getKey() >= y) { d = e.getValue(); break; } diff --git a/src/main/java/com/dfsek/terra/image/ImageLoader.java b/src/main/java/com/dfsek/terra/image/ImageLoader.java index 3442c23c8..be3b521b3 100644 --- a/src/main/java/com/dfsek/terra/image/ImageLoader.java +++ b/src/main/java/com/dfsek/terra/image/ImageLoader.java @@ -15,9 +15,9 @@ import java.io.File; import java.io.IOException; public class ImageLoader { + private static final double INVERSE_ROOT_2 = 0.7071067811865475; private final BufferedImage image; private final Align align; - private static final double INVERSE_ROOT_2 = 0.7071067811865475; public ImageLoader(File file, Align align) throws IOException { image = ImageIO.read(file); @@ -60,9 +60,9 @@ public class ImageLoader { } public void debug(boolean genStep, World w) { - if (!ConfigUtil.debug) return; + if(!ConfigUtil.debug) return; BufferedImage newImg = copyImage(image); - if (genStep) { + if(genStep) { newImg = redrawStepped(image, w, align); } DebugGUI debugGUI = new DebugGUI(newImg); @@ -90,20 +90,6 @@ public class ImageLoader { } } - public void debug(boolean genStep, World w) { - if(!ConfigUtil.debug) return; - BufferedImage newImg = copyImage(image); - if(genStep) { - newImg = redrawStepped(image, w, align); - } - DebugGUI debugGUI = new DebugGUI(newImg); - debugGUI.start(); - } - - public double getNoiseVal(int x, int y, Channel channel) { - return ((double) (getChannel(x, y, channel) - 128) / 128) * inverseRoot2; - } - public Align getAlign() { return align; } diff --git a/src/main/java/com/dfsek/terra/math/NoiseFunction2.java b/src/main/java/com/dfsek/terra/math/NoiseFunction2.java index 1e13c11d0..3a011be24 100644 --- a/src/main/java/com/dfsek/terra/math/NoiseFunction2.java +++ b/src/main/java/com/dfsek/terra/math/NoiseFunction2.java @@ -37,7 +37,7 @@ public class NoiseFunction2 implements Function { public double get(double x, double z) { for(int i = 0; i < cacheX.length; i++) { - if (cacheX[i] == x && cacheZ[i] == z) return cacheValues[i]; + if(cacheX[i] == x && cacheZ[i] == z) return cacheValues[i]; } cacheX[0] = x; cacheZ[0] = z; diff --git a/src/main/java/com/dfsek/terra/population/FloraPopulator.java b/src/main/java/com/dfsek/terra/population/FloraPopulator.java index 2d3d31d83..15943293b 100644 --- a/src/main/java/com/dfsek/terra/population/FloraPopulator.java +++ b/src/main/java/com/dfsek/terra/population/FloraPopulator.java @@ -60,7 +60,7 @@ public class FloraPopulator extends GaeaBlockPopulator { item = biome.getDecorator().getFlora().get(f.getFloraNoise(), originX + x, originZ + z); else item = biome.getDecorator().getFlora().get(random); for(Block highest : item.getValidSpawnsAt(chunk, x, z, c.getFloraHeights(item))) { - if (random.nextInt(100) < biome.getDecorator().getFloraChance()) + if(random.nextInt(100) < biome.getDecorator().getFloraChance()) item.plant(highest.getLocation()); } } @@ -75,12 +75,12 @@ public class FloraPopulator extends GaeaBlockPopulator { for(Block block : getValidTreeSpawnsAt(chunk, x, z, new Range(0, 254))) { Tree tree = biome.getDecorator().getTrees().get(random); Range range = world.getConfig().getBiome(biome).getTreeRange(tree); - if (!range.isInRange(block.getY())) continue; + if(!range.isInRange(block.getY())) continue; try { Location l = block.getLocation(); TreeGenerateEvent event = new TreeGenerateEvent(world, l, tree); Bukkit.getPluginManager().callEvent(event); - if (!event.isCancelled()) tree.plant(l, random, Terra.getInstance()); + if(!event.isCancelled()) tree.plant(l, random, Terra.getInstance()); } catch(NullPointerException ignore) { } } @@ -90,7 +90,7 @@ public class FloraPopulator extends GaeaBlockPopulator { public static List getValidTreeSpawnsAt(Chunk chunk, int x, int z, Range check) { List blocks = new ArrayList<>(); for(int y : check) { - if (chunk.getBlock(x, y, z).getType().isSolid() && chunk.getBlock(x, y + 1, z).getType().isAir()) { + if(chunk.getBlock(x, y, z).getType().isSolid() && chunk.getBlock(x, y + 1, z).getType().isAir()) { blocks.add(chunk.getBlock(x, y + 1, z)); } } diff --git a/src/main/java/com/dfsek/terra/population/OrePopulator.java b/src/main/java/com/dfsek/terra/population/OrePopulator.java index 50d87db16..81bad037c 100644 --- a/src/main/java/com/dfsek/terra/population/OrePopulator.java +++ b/src/main/java/com/dfsek/terra/population/OrePopulator.java @@ -44,7 +44,7 @@ public class OrePopulator extends GaeaBlockPopulator { Bukkit.getPluginManager().callEvent(event); if(!event.isCancelled()) { if(ore.crossChunks()) ore.doVein(v, chunk, random); - else ore.doVeinSingle(new Vector(x, y, z), chunk, random); + else ore.doVeinSingleChunk(new Vector(x, y, z), chunk, random); } } } diff --git a/src/main/java/com/dfsek/terra/procgen/math/Vector2.java b/src/main/java/com/dfsek/terra/procgen/math/Vector2.java index ed45b5511..d7d296455 100644 --- a/src/main/java/com/dfsek/terra/procgen/math/Vector2.java +++ b/src/main/java/com/dfsek/terra/procgen/math/Vector2.java @@ -145,15 +145,6 @@ public class Vector2 implements Cloneable { return dx * dx + dz * dz; } - @Override - public boolean equals(Object obj) { - if(!(obj instanceof Vector2)) { - return false; - } - Vector2 other = (Vector2) obj; - return other.x == this.x && other.z == this.z; - } - @Override public int hashCode() { int hash = 17; @@ -164,7 +155,7 @@ public class Vector2 implements Cloneable { @Override public boolean equals(Object obj) { - if (!(obj instanceof Vector2)) { + if(!(obj instanceof Vector2)) { return false; } Vector2 other = (Vector2) obj; diff --git a/src/main/java/com/dfsek/terra/structure/Structure.java b/src/main/java/com/dfsek/terra/structure/Structure.java index 227d9c9f2..c4e78ec8d 100644 --- a/src/main/java/com/dfsek/terra/structure/Structure.java +++ b/src/main/java/com/dfsek/terra/structure/Structure.java @@ -54,7 +54,7 @@ public class Structure implements Serializable { this.uuid = UUID.randomUUID(); this.spawns = new HashSet<>(); this.inventories = new HashSet<>(); - if (l1.getX() > l2.getX() || l1.getY() > l2.getY() || l1.getZ() > l2.getZ()) + 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.getBlockZ() - l1.getBlockZ() + 1][l2.getBlockY() - l1.getBlockY() + 1]; for(int x = 0; x <= l2.getBlockX() - l1.getBlockX(); x++) { @@ -68,16 +68,16 @@ public class Structure implements Serializable { int pullOffset = 0; StructureSpawnRequirement requirement = StructureSpawnRequirement.BLANK; try { - if (state instanceof Sign) { // Magic sign stuff + if(state instanceof Sign) { // Magic sign stuff Sign s = (Sign) b.getState(); - if (s.getLine(0).equals("[TERRA]")) { + if(s.getLine(0).equals("[TERRA]")) { try { d = Bukkit.createBlockData(s.getLine(2) + s.getLine(3)); useState = false; - if (s.getLine(1).equals("[CENTER]")) { + if(s.getLine(1).equals("[CENTER]")) { centerX = x; centerZ = z; - } else if (s.getLine(1).startsWith("[SPAWN=") && s.getLine(1).endsWith("]")) { + } else if(s.getLine(1).startsWith("[SPAWN=") && s.getLine(1).endsWith("]")) { String og = s.getLine(1); String spawn = og.substring(og.indexOf("=") + 1, og.length() - 1); try { @@ -85,7 +85,7 @@ public class Structure implements Serializable { } catch(IllegalArgumentException e) { throw new InitializationException("Invalid spawn type: " + spawn, b.getLocation()); } - } else if (s.getLine(1).startsWith("[PULL=") && s.getLine(1).endsWith("]")) { + } else if(s.getLine(1).startsWith("[PULL=") && s.getLine(1).endsWith("]")) { String og = s.getLine(1); String spawn = og.substring(og.indexOf("=") + 1, og.indexOf("_")); pullOffset = Integer.parseInt(og.substring(og.indexOf("_") + 1, og.length() - 1)); @@ -106,15 +106,15 @@ public class Structure implements Serializable { throw new InitializationException("Invalid sign.", b.getLocation()); } StructureContainedBlock block = new StructureContainedBlock(x, y, z, useState ? state : null, d, requirement, pull, pullOffset); - if (state instanceof BlockInventoryHolder) { + if(state instanceof BlockInventoryHolder) { inventories.add(new StructureContainedInventory(((BlockInventoryHolder) state).getInventory(), block)); } - if (!requirement.equals(StructureSpawnRequirement.BLANK)) spawns.add(block); + if(!requirement.equals(StructureSpawnRequirement.BLANK)) spawns.add(block); structure[x][z][y] = block; } } } - if (centerX < 0 || centerZ < 0) throw new InitializationException("No structure center specified.", null); + if(centerX < 0 || centerZ < 0) throw new InitializationException("No structure center specified.", null); structureInfo = new StructureInfo(l2.getBlockX() - l1.getBlockX() + 1, l2.getBlockY() - l1.getBlockY() + 1, l2.getBlockZ() - l1.getBlockZ() + 1, new Vector2(centerX, centerZ)); } @@ -177,33 +177,13 @@ public class Structure implements Serializable { } /** - * Paste structure at an origin location, confined to a single chunk. + * Get GaeaStructureInfo object * - * @param origin Origin location - * @param chunk Chunk to confine pasting to - * @param r Rotation + * @return Structure Info */ - public void paste(Location origin, Chunk chunk, Rotation r) { - int xOr = (chunk.getX() << 4); - int zOr = (chunk.getZ() << 4); - Range intersectX = new Range(xOr, xOr + 16).sub(origin.getBlockX() - structureInfo.getCenterX()); - Range intersectZ = new Range(zOr, zOr + 16).sub(origin.getBlockZ() - structureInfo.getCenterZ()); - if (intersectX == null || intersectZ == null) return; - executeForBlocksInRange(intersectX, getRange(Axis.Y, r), intersectZ, block -> pasteBlock(block, origin, r), r); - Debug.info(intersectX.toString() + " : " + intersectZ.toString()); - } - - public boolean checkSpawns(Location origin, Rotation r) { - for(StructureContainedBlock b : spawns) { - Vector2 rot = getRotatedCoords(new Vector2(b.getX() - structureInfo.getCenterX(), b.getZ() - structureInfo.getCenterZ()), r); - if (!b.getRequirement().matches(origin.getWorld(), (int) rot.getX() + origin.getBlockX(), origin.getBlockY() + b.getY(), (int) rot.getZ() + origin.getBlockZ())) - return false; - } - return true; - } - - public HashSet getInventories() { - return inventories; + @NotNull + public StructureInfo getStructureInfo() { + return structureInfo; } /** @@ -218,23 +198,11 @@ public class Structure implements Serializable { int zOr = (chunk.getZ() << 4); Range intersectX = new Range(xOr, xOr + 16).sub(origin.getBlockX() - structureInfo.getCenterX()); Range intersectZ = new Range(zOr, zOr + 16).sub(origin.getBlockZ() - structureInfo.getCenterZ()); - if (intersectX == null || intersectZ == null) return; + if(intersectX == null || intersectZ == null) return; executeForBlocksInRange(intersectX, getRange(Axis.Y, r), intersectZ, block -> pasteBlock(block, origin, r), r); Debug.info(intersectX.toString() + " : " + intersectZ.toString()); } - /** - * Test whether a set of coordinates is within the current structure - * - * @param x X coordinate - * @param y Y coordinate - * @param z Z coordinate - * @return True if coordinate set is in structure, false if it is not. - */ - private boolean isInStructure(int x, int y, int z) { - return x < structureInfo.getSizeX() && y < structureInfo.getSizeY() && z < structureInfo.getSizeZ() && x >= 0 && y >= 0 && z >= 0; - } - /** * Paste a single StructureDefinedBlock at an origin location, offset by its coordinates. * @@ -250,8 +218,8 @@ public class Structure implements Serializable { Block worldBlock = loc.getBlock(); main: while(worldBlock.isEmpty()) { - if (loc.getBlockY() > 255 || loc.getBlockY() < 0) return; - if (block.getPull() == null) break; + if(loc.getBlockY() > 255 || loc.getBlockY() < 0) return; + if(block.getPull() == null) break; switch(block.getPull()) { case UP: worldBlock = worldBlock.getRelative(BlockFace.UP); @@ -265,16 +233,16 @@ public class Structure implements Serializable { } int offset = block.getPullOffset(); - if (offset != 0) + if(offset != 0) worldBlock = worldBlock.getRelative((offset > 0) ? BlockFace.UP : BlockFace.DOWN, Math.abs(offset)); - if (data instanceof Rotatable) { + if(data instanceof Rotatable) { BlockFace rt = getRotatedFace(((Rotatable) data).getRotation(), r); ((Rotatable) data).setRotation(rt); - } else if (data instanceof Directional) { + } else if(data instanceof Directional) { BlockFace rt = getRotatedFace(((Directional) data).getFacing(), r); ((Directional) data).setFacing(rt); - } else if (data instanceof MultipleFacing) { + } else if(data instanceof MultipleFacing) { MultipleFacing mfData = (MultipleFacing) data; Map faces = new HashMap<>(); for(BlockFace f : mfData.getAllowedFaces()) { @@ -283,13 +251,13 @@ public class Structure implements Serializable { for(Map.Entry face : faces.entrySet()) { mfData.setFace(getRotatedFace(face.getKey(), r), face.getValue()); } - } else if (data instanceof Rail) { + } else if(data instanceof Rail) { Rail.Shape newShape = getRotatedRail(((Rail) data).getShape(), r); ((Rail) data).setShape(newShape); - } else if (data instanceof Orientable) { + } else if(data instanceof Orientable) { org.bukkit.Axis newAxis = getRotatedAxis(((Orientable) data).getAxis(), r); ((Orientable) data).setAxis(newAxis); - } else if (data instanceof RedstoneWire) { + } else if(data instanceof RedstoneWire) { Map connections = new HashMap<>(); RedstoneWire rData = (RedstoneWire) data; for(BlockFace f : rData.getAllowedFaces()) { @@ -300,26 +268,12 @@ public class Structure implements Serializable { } } worldBlock.setBlockData(data, false); - if (block.getState() != null) { + if(block.getState() != null) { block.getState().getState(worldBlock.getState()).update(true, false); } } } - @NotNull - private Range getRawRange(@NotNull Axis a) { - switch(a) { - case X: - return new Range(0, structureInfo.getSizeX()); - case Y: - return new Range(0, structureInfo.getSizeY()); - case Z: - return new Range(0, structureInfo.getSizeZ()); - default: - throw new IllegalArgumentException(); - } - } - /** * Execute a Consumer for all blocks in a cuboid region defined by 3 Ranges, accounting for rotation. * @@ -335,7 +289,7 @@ public class Structure implements Serializable { for(int z : zM) { Vector2 c = getRotatedCoords(new Vector2(x - structureInfo.getCenterX(), z - structureInfo.getCenterZ()), r); c.add(new Vector2(structureInfo.getCenterX(), structureInfo.getCenterZ())); - if (isInStructure((int) c.getX(), y, (int) c.getZ())) { + if(isInStructure((int) c.getX(), y, (int) c.getZ())) { StructureContainedBlock b = structure[(int) c.getX()][(int) c.getZ()][y]; exec.accept(new StructureContainedBlock(x - getStructureInfo().getCenterX(), y, z - getStructureInfo().getCenterZ(), b.getState(), b.getBlockData(), b.getRequirement(), b.getPull(), b.getPullOffset())); } @@ -345,30 +299,46 @@ public class Structure implements Serializable { } /** - * Get GaeaStructureInfo object + * Test whether a set of coordinates is within the current structure * - * @return Structure Info + * @param x X coordinate + * @param y Y coordinate + * @param z Z coordinate + * @return True if coordinate set is in structure, false if it is not. */ - @NotNull - public StructureInfo getStructureInfo() { - return structureInfo; + private boolean isInStructure(int x, int y, int z) { + return x < structureInfo.getSizeX() && y < structureInfo.getSizeY() && z < structureInfo.getSizeZ() && x >= 0 && y >= 0 && z >= 0; } @NotNull public Range getRange(@NotNull Axis a, @NotNull Rotation r) { - if (a.equals(Axis.Y)) return getRawRange(a); + if(a.equals(Axis.Y)) return getRawRange(a); Vector2 center = new Vector2(structureInfo.getCenterX(), structureInfo.getCenterZ()); Range x = getRawRange(Axis.X); Range z = getRawRange(Axis.Z); Vector2 min = getRotatedCoords(new Vector2(x.getMin(), z.getMin()).subtract(center), r.inverse()).add(center); Vector2 max = getRotatedCoords(new Vector2(x.getMax(), z.getMax()).subtract(center), r.inverse()).add(center); - if (a.equals(Axis.X)) + if(a.equals(Axis.X)) return new Range((int) Math.floor(Math.min(min.getX(), max.getX())), (int) Math.ceil(Math.max(min.getX(), max.getX())) + 1); else return new Range((int) Math.floor(Math.min(min.getZ(), max.getZ())), (int) Math.ceil(Math.max(min.getZ(), max.getZ())) + 1); } + @NotNull + private Range getRawRange(@NotNull Axis a) { + switch(a) { + case X: + return new Range(0, structureInfo.getSizeX()); + case Y: + return new Range(0, structureInfo.getSizeY()); + case Z: + return new Range(0, structureInfo.getSizeZ()); + default: + throw new IllegalArgumentException(); + } + } + /** * From an origin location (First bound) fetch the second bound. * diff --git a/src/main/java/com/dfsek/terra/structure/StructureSpawnRequirement.java b/src/main/java/com/dfsek/terra/structure/StructureSpawnRequirement.java index be228d8c2..812a36c21 100644 --- a/src/main/java/com/dfsek/terra/structure/StructureSpawnRequirement.java +++ b/src/main/java/com/dfsek/terra/structure/StructureSpawnRequirement.java @@ -21,7 +21,7 @@ public enum StructureSpawnRequirement implements Serializable { ConfigPack wc = tw.getConfig(); UserDefinedBiome b = (UserDefinedBiome) tw.getGrid().getBiome(x, z, GenerationPhase.POPULATE); BiomeConfig c = wc.getBiome(b); - if (y <= c.getOcean().getSeaLevel()) return false; + if(y <= c.getOcean().getSeaLevel()) return false; return b.getGenerator().getNoise(getNoise(w), w, x, y, z) <= 0; } }, OCEAN { @@ -30,7 +30,7 @@ public enum StructureSpawnRequirement implements Serializable { setNoise(w, x, y, z); UserDefinedBiome b = (UserDefinedBiome) TerraWorld.getWorld(w).getGrid().getBiome(x, z, GenerationPhase.POPULATE); BiomeConfig c = TerraWorld.getWorld(w).getConfig().getBiome(b); - if (y > c.getOcean().getSeaLevel()) return false; + if(y > c.getOcean().getSeaLevel()) return false; return b.getGenerator().getNoise(getNoise(w), w, x, y, z) <= 0; } }, LAND { @@ -52,7 +52,7 @@ public enum StructureSpawnRequirement implements Serializable { private static void setNoise(World w, int x, int y, int z) { TerraWorld tw = TerraWorld.getWorld(w); ConfigPack wc = tw.getConfig(); - if (getNoise(w) == null) { + if(getNoise(w) == null) { FastNoiseLite gen = new FastNoiseLite((int) w.getSeed()); gen.setNoiseType(FastNoiseLite.NoiseType.OpenSimplex2); gen.setFractalType(FastNoiseLite.FractalType.FBm); diff --git a/src/main/java/com/dfsek/terra/structure/features/EntityFeature.java b/src/main/java/com/dfsek/terra/structure/features/EntityFeature.java index 287bf8aff..78859e6da 100644 --- a/src/main/java/com/dfsek/terra/structure/features/EntityFeature.java +++ b/src/main/java/com/dfsek/terra/structure/features/EntityFeature.java @@ -63,9 +63,9 @@ public class EntityFeature implements Feature { for(int j = 1; j < inSize + 1; j++) if(!in.contains(on.getRelative(BlockFace.UP, j).getType())) canSpawn = false; - if (canSpawn) break; + if(canSpawn) break; } - if (canSpawn) { + if(canSpawn) { Debug.info("Spawning entity at " + attempt); chunk.getWorld().spawnEntity(attempt.add(0.5, 2, 0.5), type); // Add 0.5 to X & Z so entity spawns in center of block. } diff --git a/src/main/java/com/dfsek/terra/util/structure/RotationUtil.java b/src/main/java/com/dfsek/terra/util/structure/RotationUtil.java index aed825c91..270e61cc9 100644 --- a/src/main/java/com/dfsek/terra/util/structure/RotationUtil.java +++ b/src/main/java/com/dfsek/terra/util/structure/RotationUtil.java @@ -40,7 +40,7 @@ public final class RotationUtil { BlockFace n = f; int rotateNum = r.getDegrees() / 90; int rn = faceRotation(f); - if (rn >= 0) { + if(rn >= 0) { n = fromRotation(faceRotation(n) + 4 * rotateNum); } return n; @@ -141,10 +141,10 @@ public final class RotationUtil { final boolean shouldSwitch = r.equals(Structure.Rotation.CW_90) || r.equals(Structure.Rotation.CCW_90); switch(orig) { case X: - if (shouldSwitch) other = org.bukkit.Axis.Z; + if(shouldSwitch) other = org.bukkit.Axis.Z; break; case Z: - if (shouldSwitch) other = org.bukkit.Axis.X; + if(shouldSwitch) other = org.bukkit.Axis.X; break; } return other; @@ -231,94 +231,4 @@ public final class RotationUtil { } return orig; } - - /** - * Get an integer representation of a BlockFace, to perform math on. - * - * @param f BlockFace to get integer for - * @return integer representation of BlockFace - */ - public static int faceRotation(BlockFace f) { - switch(f) { - case NORTH: - return 0; - case NORTH_NORTH_EAST: - return 1; - case NORTH_EAST: - return 2; - case EAST_NORTH_EAST: - return 3; - case EAST: - return 4; - case EAST_SOUTH_EAST: - return 5; - case SOUTH_EAST: - return 6; - case SOUTH_SOUTH_EAST: - return 7; - case SOUTH: - return 8; - case SOUTH_SOUTH_WEST: - return 9; - case SOUTH_WEST: - return 10; - case WEST_SOUTH_WEST: - return 11; - case WEST: - return 12; - case WEST_NORTH_WEST: - return 13; - case NORTH_WEST: - return 14; - case NORTH_NORTH_WEST: - return 15; - default: - return -1; - } - } - - /** - * Convert integer to BlockFace representation - * - * @param r integer to get BlockFace for - * @return BlockFace represented by integer. - */ - public static BlockFace fromRotation(int r) { - switch(Math.floorMod(r, 16)) { - case 0: - return BlockFace.NORTH; - case 1: - return BlockFace.NORTH_NORTH_EAST; - case 2: - return BlockFace.NORTH_EAST; - case 3: - return BlockFace.EAST_NORTH_EAST; - case 4: - return BlockFace.EAST; - case 5: - return BlockFace.EAST_SOUTH_EAST; - case 6: - return BlockFace.SOUTH_EAST; - case 7: - return BlockFace.SOUTH_SOUTH_EAST; - case 8: - return BlockFace.SOUTH; - case 9: - return BlockFace.SOUTH_SOUTH_WEST; - case 10: - return BlockFace.SOUTH_WEST; - case 11: - return BlockFace.WEST_SOUTH_WEST; - case 12: - return BlockFace.WEST; - case 13: - return BlockFace.WEST_NORTH_WEST; - case 14: - return BlockFace.NORTH_WEST; - case 15: - return BlockFace.NORTH_NORTH_WEST; - default: - throw new IllegalArgumentException(); - } - } } diff --git a/src/main/java/com/dfsek/terra/util/structure/WorldEditUtil.java b/src/main/java/com/dfsek/terra/util/structure/WorldEditUtil.java index 8617c90f8..e73b123d0 100644 --- a/src/main/java/com/dfsek/terra/util/structure/WorldEditUtil.java +++ b/src/main/java/com/dfsek/terra/util/structure/WorldEditUtil.java @@ -36,16 +36,9 @@ public final class WorldEditUtil { return new Location[] {l1, l2}; } - public static WorldEditPlugin getWorldEdit() { - Plugin p = Bukkit.getServer().getPluginManager().getPlugin("WorldEdit"); - if (p instanceof WorldEditPlugin) return (WorldEditPlugin) p; - Bukkit.getLogger().severe("[Terra] a command requiring WorldEdit was executed, but WorldEdit was not detected!"); - return null; - } - public static Location[] getSelectionPositions(Player sender) { WorldEditPlugin we = WorldEditUtil.getWorldEdit(); - if (we == null) { + if(we == null) { sender.sendMessage("WorldEdit is not installed! Please install WorldEdit before attempting to export structures."); return null; } @@ -66,4 +59,11 @@ public final class WorldEditUtil { Location l2 = new Location(sender.getWorld(), max.getBlockX(), max.getBlockY(), max.getBlockZ()); return new Location[] {l1, l2}; } + + public static WorldEditPlugin getWorldEdit() { + Plugin p = Bukkit.getServer().getPluginManager().getPlugin("WorldEdit"); + if(p instanceof WorldEditPlugin) return (WorldEditPlugin) p; + Bukkit.getLogger().severe("[Terra] a command requiring WorldEdit was executed, but WorldEdit was not detected!"); + return null; + } } diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml index 39696f020..04175c2b4 100644 --- a/src/main/resources/config.yml +++ b/src/main/resources/config.yml @@ -1,8 +1,8 @@ -debug: false -data-save: PT6M -language: "en_us" -fail-type: SHUTDOWN +debug: false +data-save: PT6M +language: "en_us" +fail-type: SHUTDOWN dump-default: true -cache-size: 8 +cache-size: 8 master-disable: - caves: false \ No newline at end of file + caves: false \ No newline at end of file diff --git a/src/main/resources/default-config/abstract/biomes/basic_ores.yml b/src/main/resources/default-config/abstract/biomes/basic_ores.yml index 27988852c..a881a1d64 100644 --- a/src/main/resources/default-config/abstract/biomes/basic_ores.yml +++ b/src/main/resources/default-config/abstract/biomes/basic_ores.yml @@ -9,57 +9,57 @@ carving: CAVERN: 5 ores: DIRT: - min: 0 - max: 1 + min: 0 + max: 1 min-height: 0 max-height: 84 GRAVEL: - min: 0 - max: 1 + min: 0 + max: 1 min-height: 0 max-height: 84 DIORITE: - min: 0 - max: 1 + min: 0 + max: 1 min-height: 0 max-height: 84 ANDESITE: - min: 0 - max: 1 + min: 0 + max: 1 min-height: 0 max-height: 84 GRANITE: - min: 0 - max: 1 + min: 0 + max: 1 min-height: 0 max-height: 84 COAL_ORE: - min: 4 - max: 8 + min: 4 + max: 8 min-height: 0 max-height: 84 IRON_ORE: - min: 2 - max: 6 + min: 2 + max: 6 min-height: 0 max-height: 64 GOLD_ORE: - min: 1 - max: 3 + min: 1 + max: 3 min-height: 0 max-height: 32 LAPIS_ORE: - min: 1 - max: 2 + min: 1 + max: 2 min-height: 0 max-height: 32 REDSTONE_ORE: - min: 1 - max: 2 + min: 1 + max: 2 min-height: 0 max-height: 16 DIAMOND_ORE: - min: 1 - max: 1 + min: 1 + max: 1 min-height: 0 max-height: 16 \ No newline at end of file diff --git a/src/main/resources/default-config/abstract/biomes/beach_abstract.yml b/src/main/resources/default-config/abstract/biomes/beach_abstract.yml index f354079fb..03106c46c 100644 --- a/src/main/resources/default-config/abstract/biomes/beach_abstract.yml +++ b/src/main/resources/default-config/abstract/biomes/beach_abstract.yml @@ -40,57 +40,57 @@ flora: ores: DIRT: - min: 0 - max: 2 + min: 0 + max: 2 min-height: 0 max-height: 128 GRAVEL: - min: 0 - max: 2 + min: 0 + max: 2 min-height: 0 max-height: 128 DIORITE: - min: 0 - max: 2 + min: 0 + max: 2 min-height: 0 max-height: 128 ANDESITE: - min: 0 - max: 2 + min: 0 + max: 2 min-height: 0 max-height: 128 GRANITE: - min: 0 - max: 2 + min: 0 + max: 2 min-height: 0 max-height: 128 COAL_ORE: - min: 5 - max: 15 + min: 5 + max: 15 min-height: 0 max-height: 128 IRON_ORE: - min: 2 - max: 6 + min: 2 + max: 6 min-height: 0 max-height: 64 GOLD_ORE: - min: 1 - max: 3 + min: 1 + max: 3 min-height: 0 max-height: 32 LAPIS_ORE: - min: 1 - max: 4 + min: 1 + max: 4 min-height: 0 max-height: 32 REDSTONE_ORE: - min: 1 - max: 4 + min: 1 + max: 4 min-height: 0 max-height: 16 DIAMOND_ORE: - min: 1 - max: 2 + min: 1 + max: 2 min-height: 0 max-height: 16 \ No newline at end of file diff --git a/src/main/resources/default-config/abstract/biomes/deep_ocean_abstract.yml b/src/main/resources/default-config/abstract/biomes/deep_ocean_abstract.yml index 51f0eba88..19178b724 100644 --- a/src/main/resources/default-config/abstract/biomes/deep_ocean_abstract.yml +++ b/src/main/resources/default-config/abstract/biomes/deep_ocean_abstract.yml @@ -33,57 +33,57 @@ structures: ores: DIRT: - min: 0 - max: 2 + min: 0 + max: 2 min-height: 0 max-height: 128 GRAVEL: - min: 0 - max: 2 + min: 0 + max: 2 min-height: 0 max-height: 128 DIORITE: - min: 0 - max: 2 + min: 0 + max: 2 min-height: 0 max-height: 128 ANDESITE: - min: 0 - max: 2 + min: 0 + max: 2 min-height: 0 max-height: 128 GRANITE: - min: 0 - max: 2 + min: 0 + max: 2 min-height: 0 max-height: 128 COAL_ORE: - min: 5 - max: 15 + min: 5 + max: 15 min-height: 0 max-height: 128 IRON_ORE: - min: 2 - max: 6 + min: 2 + max: 6 min-height: 0 max-height: 64 GOLD_ORE: - min: 1 - max: 3 + min: 1 + max: 3 min-height: 0 max-height: 32 LAPIS_ORE: - min: 1 - max: 4 + min: 1 + max: 4 min-height: 0 max-height: 32 REDSTONE_ORE: - min: 1 - max: 4 + min: 1 + max: 4 min-height: 0 max-height: 16 DIAMOND_ORE: - min: 1 - max: 2 + min: 1 + max: 2 min-height: 0 max-height: 16 \ No newline at end of file diff --git a/src/main/resources/default-config/abstract/biomes/mountain/mountains_pretty.yml b/src/main/resources/default-config/abstract/biomes/mountain/mountains_pretty.yml index 13b0c4362..139c53339 100644 --- a/src/main/resources/default-config/abstract/biomes/mountain/mountains_pretty.yml +++ b/src/main/resources/default-config/abstract/biomes/mountain/mountains_pretty.yml @@ -11,58 +11,58 @@ structures: ores: DIRT: - min: 0 - max: 1 + min: 0 + max: 1 min-height: 0 max-height: 84 GRAVEL: - min: 0 - max: 1 + min: 0 + max: 1 min-height: 0 max-height: 84 DIORITE: - min: 0 - max: 1 + min: 0 + max: 1 min-height: 0 max-height: 84 ANDESITE: - min: 0 - max: 1 + min: 0 + max: 1 min-height: 0 max-height: 84 GRANITE: - min: 0 - max: 1 + min: 0 + max: 1 min-height: 0 max-height: 84 COAL_ORE: - min: 4 - max: 8 + min: 4 + max: 8 min-height: 0 max-height: 84 IRON_ORE: - min: 2 - max: 6 + min: 2 + max: 6 min-height: 0 max-height: 64 GOLD_ORE: - min: 1 - max: 3 + min: 1 + max: 3 min-height: 0 max-height: 32 LAPIS_ORE: - min: 1 - max: 2 + min: 1 + max: 2 min-height: 0 max-height: 32 REDSTONE_ORE: - min: 1 - max: 2 + min: 1 + max: 2 min-height: 0 max-height: 16 DIAMOND_ORE: - min: 1 - max: 1 + min: 1 + max: 1 min-height: 0 max-height: 16 @@ -82,7 +82,7 @@ flora: simplex: enable: true frequency: 0.1 - seed: 4 + seed: 4 items: SMALL_ROCK: weight: 1 @@ -106,8 +106,8 @@ flora: max: 180 slabs: - enable: true - threshold: 0.0075 + enable: true + threshold: 0.0075 palettes: - "minecraft:stone": "MOUNTAIN_SLABS" - "minecraft:gravel": "MOUNTAIN_SLABS" diff --git a/src/main/resources/default-config/abstract/biomes/mountain/mountains_pretty_border_0.yml b/src/main/resources/default-config/abstract/biomes/mountain/mountains_pretty_border_0.yml index a1cbafaed..24f769460 100644 --- a/src/main/resources/default-config/abstract/biomes/mountain/mountains_pretty_border_0.yml +++ b/src/main/resources/default-config/abstract/biomes/mountain/mountains_pretty_border_0.yml @@ -11,58 +11,58 @@ structures: ores: DIRT: - min: 0 - max: 1 + min: 0 + max: 1 min-height: 0 max-height: 84 GRAVEL: - min: 0 - max: 1 + min: 0 + max: 1 min-height: 0 max-height: 84 DIORITE: - min: 0 - max: 1 + min: 0 + max: 1 min-height: 0 max-height: 84 ANDESITE: - min: 0 - max: 1 + min: 0 + max: 1 min-height: 0 max-height: 84 GRANITE: - min: 0 - max: 1 + min: 0 + max: 1 min-height: 0 max-height: 84 COAL_ORE: - min: 4 - max: 8 + min: 4 + max: 8 min-height: 0 max-height: 84 IRON_ORE: - min: 2 - max: 6 + min: 2 + max: 6 min-height: 0 max-height: 64 GOLD_ORE: - min: 1 - max: 3 + min: 1 + max: 3 min-height: 0 max-height: 32 LAPIS_ORE: - min: 1 - max: 2 + min: 1 + max: 2 min-height: 0 max-height: 32 REDSTONE_ORE: - min: 1 - max: 2 + min: 1 + max: 2 min-height: 0 max-height: 16 DIAMOND_ORE: - min: 1 - max: 1 + min: 1 + max: 1 min-height: 0 max-height: 16 @@ -82,7 +82,7 @@ flora: simplex: enable: true frequency: 0.1 - seed: 4 + seed: 4 items: SMALL_ROCK: weight: 1 @@ -106,8 +106,8 @@ flora: max: 180 slabs: - enable: true - threshold: 0.0075 + enable: true + threshold: 0.0075 palettes: - "minecraft:stone": "MOUNTAIN_SLABS" - "minecraft:gravel": "MOUNTAIN_SLABS" diff --git a/src/main/resources/default-config/abstract/biomes/mountain/mountains_pretty_border_1.yml b/src/main/resources/default-config/abstract/biomes/mountain/mountains_pretty_border_1.yml index 3935c2cb3..d463b5a16 100644 --- a/src/main/resources/default-config/abstract/biomes/mountain/mountains_pretty_border_1.yml +++ b/src/main/resources/default-config/abstract/biomes/mountain/mountains_pretty_border_1.yml @@ -11,58 +11,58 @@ structures: ores: DIRT: - min: 0 - max: 1 + min: 0 + max: 1 min-height: 0 max-height: 84 GRAVEL: - min: 0 - max: 1 + min: 0 + max: 1 min-height: 0 max-height: 84 DIORITE: - min: 0 - max: 1 + min: 0 + max: 1 min-height: 0 max-height: 84 ANDESITE: - min: 0 - max: 1 + min: 0 + max: 1 min-height: 0 max-height: 84 GRANITE: - min: 0 - max: 1 + min: 0 + max: 1 min-height: 0 max-height: 84 COAL_ORE: - min: 4 - max: 8 + min: 4 + max: 8 min-height: 0 max-height: 84 IRON_ORE: - min: 2 - max: 6 + min: 2 + max: 6 min-height: 0 max-height: 64 GOLD_ORE: - min: 1 - max: 3 + min: 1 + max: 3 min-height: 0 max-height: 32 LAPIS_ORE: - min: 1 - max: 2 + min: 1 + max: 2 min-height: 0 max-height: 32 REDSTONE_ORE: - min: 1 - max: 2 + min: 1 + max: 2 min-height: 0 max-height: 16 DIAMOND_ORE: - min: 1 - max: 1 + min: 1 + max: 1 min-height: 0 max-height: 16 @@ -82,7 +82,7 @@ flora: simplex: enable: true frequency: 0.1 - seed: 4 + seed: 4 items: SMALL_ROCK: weight: 1 @@ -106,8 +106,8 @@ flora: max: 180 slabs: - enable: true - threshold: 0.0075 + enable: true + threshold: 0.0075 palettes: - "minecraft:stone": "MOUNTAIN_SLABS" - "minecraft:gravel": "MOUNTAIN_SLABS" diff --git a/src/main/resources/default-config/abstract/biomes/ocean_abstract.yml b/src/main/resources/default-config/abstract/biomes/ocean_abstract.yml index 4de810cc9..08c9951b9 100644 --- a/src/main/resources/default-config/abstract/biomes/ocean_abstract.yml +++ b/src/main/resources/default-config/abstract/biomes/ocean_abstract.yml @@ -33,57 +33,57 @@ structures: ores: DIRT: - min: 0 - max: 2 + min: 0 + max: 2 min-height: 0 max-height: 128 GRAVEL: - min: 0 - max: 2 + min: 0 + max: 2 min-height: 0 max-height: 128 DIORITE: - min: 0 - max: 2 + min: 0 + max: 2 min-height: 0 max-height: 128 ANDESITE: - min: 0 - max: 2 + min: 0 + max: 2 min-height: 0 max-height: 128 GRANITE: - min: 0 - max: 2 + min: 0 + max: 2 min-height: 0 max-height: 128 COAL_ORE: - min: 5 - max: 15 + min: 5 + max: 15 min-height: 0 max-height: 128 IRON_ORE: - min: 2 - max: 6 + min: 2 + max: 6 min-height: 0 max-height: 64 GOLD_ORE: - min: 1 - max: 3 + min: 1 + max: 3 min-height: 0 max-height: 32 LAPIS_ORE: - min: 1 - max: 4 + min: 1 + max: 4 min-height: 0 max-height: 32 REDSTONE_ORE: - min: 1 - max: 4 + min: 1 + max: 4 min-height: 0 max-height: 16 DIAMOND_ORE: - min: 1 - max: 2 + min: 1 + max: 2 min-height: 0 max-height: 16 \ No newline at end of file diff --git a/src/main/resources/default-config/abstract/biomes/plains_abstract.yml b/src/main/resources/default-config/abstract/biomes/plains_abstract.yml index 362de8498..065fbd3d2 100644 --- a/src/main/resources/default-config/abstract/biomes/plains_abstract.yml +++ b/src/main/resources/default-config/abstract/biomes/plains_abstract.yml @@ -1,5 +1,5 @@ noise-equation: "((-((y / 63)^2)) + 1) + |(noise2(x, z) / 3) + 0.1|" -id: "PLAINS_ABSTRACT" +id: "PLAINS_ABSTRACT" carving: CAVE: 30 @@ -12,57 +12,57 @@ structures: erodible: true ores: DIRT: - min: 0 - max: 2 + min: 0 + max: 2 min-height: 0 max-height: 72 GRAVEL: - min: 0 - max: 2 + min: 0 + max: 2 min-height: 0 max-height: 72 DIORITE: - min: 0 - max: 2 + min: 0 + max: 2 min-height: 0 max-height: 72 ANDESITE: - min: 0 - max: 2 + min: 0 + max: 2 min-height: 0 max-height: 72 GRANITE: - min: 0 - max: 2 + min: 0 + max: 2 min-height: 0 max-height: 72 COAL_ORE: - min: 3 - max: 7 + min: 3 + max: 7 min-height: 0 max-height: 72 IRON_ORE: - min: 2 - max: 7 + min: 2 + max: 7 min-height: 0 max-height: 64 GOLD_ORE: - min: 1 - max: 3 + min: 1 + max: 3 min-height: 0 max-height: 32 LAPIS_ORE: - min: 1 - max: 4 + min: 1 + max: 4 min-height: 0 max-height: 32 REDSTONE_ORE: - min: 1 - max: 4 + min: 1 + max: 4 min-height: 0 max-height: 16 DIAMOND_ORE: - min: 1 - max: 2 + min: 1 + max: 2 min-height: 0 max-height: 16 \ No newline at end of file diff --git a/src/main/resources/default-config/abstract/biomes/shelf_ocean_abstract.yml b/src/main/resources/default-config/abstract/biomes/shelf_ocean_abstract.yml index 557af8ffb..ccf221321 100644 --- a/src/main/resources/default-config/abstract/biomes/shelf_ocean_abstract.yml +++ b/src/main/resources/default-config/abstract/biomes/shelf_ocean_abstract.yml @@ -32,57 +32,57 @@ carving: ores: DIRT: - min: 0 - max: 2 + min: 0 + max: 2 min-height: 0 max-height: 128 GRAVEL: - min: 0 - max: 2 + min: 0 + max: 2 min-height: 0 max-height: 128 DIORITE: - min: 0 - max: 2 + min: 0 + max: 2 min-height: 0 max-height: 128 ANDESITE: - min: 0 - max: 2 + min: 0 + max: 2 min-height: 0 max-height: 128 GRANITE: - min: 0 - max: 2 + min: 0 + max: 2 min-height: 0 max-height: 128 COAL_ORE: - min: 5 - max: 15 + min: 5 + max: 15 min-height: 0 max-height: 128 IRON_ORE: - min: 2 - max: 6 + min: 2 + max: 6 min-height: 0 max-height: 64 GOLD_ORE: - min: 1 - max: 3 + min: 1 + max: 3 min-height: 0 max-height: 32 LAPIS_ORE: - min: 1 - max: 4 + min: 1 + max: 4 min-height: 0 max-height: 32 REDSTONE_ORE: - min: 1 - max: 4 + min: 1 + max: 4 min-height: 0 max-height: 16 DIAMOND_ORE: - min: 1 - max: 2 + min: 1 + max: 2 min-height: 0 max-height: 16 \ No newline at end of file diff --git a/src/main/resources/default-config/biomes/beach/beach.yml b/src/main/resources/default-config/biomes/beach/beach.yml index 2bb04dde4..99ad276d7 100644 --- a/src/main/resources/default-config/biomes/beach/beach.yml +++ b/src/main/resources/default-config/biomes/beach/beach.yml @@ -1,4 +1,4 @@ -extends: "BEACH_ABSTRACT" -id: "BEACH" -vanilla: BEACH +extends: "BEACH_ABSTRACT" +id: "BEACH" +vanilla: BEACH erodible: true \ No newline at end of file diff --git a/src/main/resources/default-config/biomes/beach/beach_cold.yml b/src/main/resources/default-config/biomes/beach/beach_cold.yml index 3d56a186b..5a863c5fa 100644 --- a/src/main/resources/default-config/biomes/beach/beach_cold.yml +++ b/src/main/resources/default-config/biomes/beach/beach_cold.yml @@ -1,5 +1,5 @@ -extends: "BEACH_ABSTRACT" -id: "COLD_BEACH" +extends: "BEACH_ABSTRACT" +id: "COLD_BEACH" palette: - "BLOCK:minecraft:bedrock": 0 - BEDROCK_MOST: 1 @@ -8,4 +8,4 @@ palette: - GRAVEL: 64 - TUNDRA: 255 erodible: true -vanilla: SNOWY_BEACH \ No newline at end of file +vanilla: SNOWY_BEACH \ No newline at end of file diff --git a/src/main/resources/default-config/biomes/beach/beach_frozen.yml b/src/main/resources/default-config/biomes/beach/beach_frozen.yml index 1b0dc341b..6f93b0f8c 100644 --- a/src/main/resources/default-config/biomes/beach/beach_frozen.yml +++ b/src/main/resources/default-config/biomes/beach/beach_frozen.yml @@ -1,5 +1,5 @@ -extends: "BEACH_ABSTRACT" -id: "FROZEN_BEACH" +extends: "BEACH_ABSTRACT" +id: "FROZEN_BEACH" palette: - "BLOCK:minecraft:bedrock": 0 - BEDROCK_MOST: 1 @@ -8,7 +8,7 @@ palette: - GRAVEL: 64 - TUNDRA: 255 erodible: true -vanilla: SNOWY_BEACH +vanilla: SNOWY_BEACH ocean: palette: "COLD_OCEAN" - level: 62 \ No newline at end of file + level: 62 \ No newline at end of file diff --git a/src/main/resources/default-config/biomes/beach/beach_warm.yml b/src/main/resources/default-config/biomes/beach/beach_warm.yml index 4684d23d1..cb4adbcd4 100644 --- a/src/main/resources/default-config/biomes/beach/beach_warm.yml +++ b/src/main/resources/default-config/biomes/beach/beach_warm.yml @@ -1,6 +1,6 @@ -extends: "BEACH_ABSTRACT" -id: "WARM_BEACH" -vanilla: BEACH +extends: "BEACH_ABSTRACT" +id: "WARM_BEACH" +vanilla: BEACH erodible: true palette: diff --git a/src/main/resources/default-config/biomes/desert.yml b/src/main/resources/default-config/biomes/desert.yml index 25e825cd5..8418c9d21 100644 --- a/src/main/resources/default-config/biomes/desert.yml +++ b/src/main/resources/default-config/biomes/desert.yml @@ -1,5 +1,5 @@ extends: "PLAINS_ABSTRACT" -id: "DESERT" +id: "DESERT" palette: - "BLOCK:minecraft:bedrock": 0 @@ -36,8 +36,8 @@ trees: max: 72 slabs: - enable: true - threshold: 0.0075 + enable: true + threshold: 0.0075 palettes: - "minecraft:sand": "BLOCK:minecraft:sandstone_slab" use-stairs-if-available: true diff --git a/src/main/resources/default-config/biomes/forest/birch_forest.yml b/src/main/resources/default-config/biomes/forest/birch_forest.yml index 177158d19..1f501d04e 100644 --- a/src/main/resources/default-config/biomes/forest/birch_forest.yml +++ b/src/main/resources/default-config/biomes/forest/birch_forest.yml @@ -1,18 +1,18 @@ noise-equation: "((-((y / 63)^2)) + 1) + ((noise2(x, z)+0.5) / 3)" -extends: "BASIC_ORES" -id: "BIRCH_FOREST" +extends: "BASIC_ORES" +id: "BIRCH_FOREST" palette: - - "BLOCK:minecraft:bedrock": 0 - - BEDROCK_MOST: 1 - - BEDROCK_HALF: 2 - - BEDROCK_LITTLE: 3 - - SANDY: 62 - - GRASSY: 255 -vanilla: BIRCH_FOREST + - "BLOCK:minecraft:bedrock": 0 + - BEDROCK_MOST: 1 + - BEDROCK_HALF: 2 + - BEDROCK_LITTLE: 3 + - SANDY: 62 + - GRASSY: 255 +vanilla: BIRCH_FOREST flora: - chance: 40 + chance: 40 attempts: 1 items: TALL_GRASS: @@ -30,7 +30,7 @@ flora: y: min: 62 max: 84 -erodible: true +erodible: true trees: density: 200 diff --git a/src/main/resources/default-config/biomes/forest/dark_forest.yml b/src/main/resources/default-config/biomes/forest/dark_forest.yml index 3aa3b1a2e..c93aae7c1 100644 --- a/src/main/resources/default-config/biomes/forest/dark_forest.yml +++ b/src/main/resources/default-config/biomes/forest/dark_forest.yml @@ -1,30 +1,30 @@ noise-equation: "((-((y / 63)^2)) + 1) + ((noise2(x, z)+0.5) / 3)" -extends: "BASIC_ORES" -id: "DARK_FOREST" +extends: "BASIC_ORES" +id: "DARK_FOREST" structures: - - MANSION - - STRONGHOLD + - MANSION + - STRONGHOLD palette: - - "BLOCK:minecraft:bedrock": 0 - - BEDROCK_MOST: 1 - - BEDROCK_HALF: 2 - - BEDROCK_LITTLE: 3 - - SANDY: 62 - - GRASSY: 255 -vanilla: DARK_FOREST -erodible: true -flora-chance: 40 + - "BLOCK:minecraft:bedrock": 0 + - BEDROCK_MOST: 1 + - BEDROCK_HALF: 2 + - BEDROCK_LITTLE: 3 + - SANDY: 62 + - GRASSY: 255 +vanilla: DARK_FOREST +erodible: true +flora-chance: 40 flora: - chance: 40 - attempts: 1 - items: - TALL_GRASS: - weight: 15 - y: - min: 62 - max: 255 - GRASS: + chance: 40 + attempts: 1 + items: + TALL_GRASS: + weight: 15 + y: + min: 62 + max: 255 + GRASS: weight: 70 y: min: 62 diff --git a/src/main/resources/default-config/biomes/forest/jungle.yml b/src/main/resources/default-config/biomes/forest/jungle.yml index d08a6a4cd..bb916ee74 100644 --- a/src/main/resources/default-config/biomes/forest/jungle.yml +++ b/src/main/resources/default-config/biomes/forest/jungle.yml @@ -1,23 +1,23 @@ noise-equation: "((-((y / 63)^2)) + 1) + ((noise2(x, z)+0.25) / 3)" -extends: "BASIC_ORES" -id: "JUNGLE" +extends: "BASIC_ORES" +id: "JUNGLE" palette: - - "BLOCK:minecraft:bedrock": 0 - - BEDROCK_MOST: 1 - - BEDROCK_HALF: 2 - - BEDROCK_LITTLE: 3 - - RIVER_BOTTOM: 61 - - RIVER_SHORE: 62 - - GRASSY: 255 -vanilla: JUNGLE + - "BLOCK:minecraft:bedrock": 0 + - BEDROCK_MOST: 1 + - BEDROCK_HALF: 2 + - BEDROCK_LITTLE: 3 + - RIVER_BOTTOM: 61 + - RIVER_SHORE: 62 + - GRASSY: 255 +vanilla: JUNGLE -erodible: true +erodible: true structures: - JUNGLE - STRONGHOLD flora: - chance: 80 + chance: 80 attempts: 2 items: TALL_GRASS: diff --git a/src/main/resources/default-config/biomes/forest/oak_forest.yml b/src/main/resources/default-config/biomes/forest/oak_forest.yml index 00eb11a83..d74bc411d 100644 --- a/src/main/resources/default-config/biomes/forest/oak_forest.yml +++ b/src/main/resources/default-config/biomes/forest/oak_forest.yml @@ -1,19 +1,19 @@ noise-equation: "((-((y / 63)^2)) + 1) + ((noise2(x, z)+0.5) / 2)" -extends: "BASIC_ORES" -id: "FOREST" +extends: "BASIC_ORES" +id: "FOREST" palette: - - "BLOCK:minecraft:bedrock": 0 - - BEDROCK_MOST: 1 - - BEDROCK_HALF: 2 - - BEDROCK_LITTLE: 3 - - RIVER_BOTTOM: 61 - - RIVER_SHORE: 62 - - GRASSY: 255 -vanilla: FOREST + - "BLOCK:minecraft:bedrock": 0 + - BEDROCK_MOST: 1 + - BEDROCK_HALF: 2 + - BEDROCK_LITTLE: 3 + - RIVER_BOTTOM: 61 + - RIVER_SHORE: 62 + - GRASSY: 255 +vanilla: FOREST flora: - chance: 40 + chance: 40 attempts: 1 items: TALL_GRASS: @@ -41,7 +41,7 @@ flora: y: min: 62 max: 84 -erodible: true +erodible: true trees: density: 250 diff --git a/src/main/resources/default-config/biomes/forest/savanna.yml b/src/main/resources/default-config/biomes/forest/savanna.yml index 1290d4463..0e0d0a8d2 100644 --- a/src/main/resources/default-config/biomes/forest/savanna.yml +++ b/src/main/resources/default-config/biomes/forest/savanna.yml @@ -1,19 +1,19 @@ noise-equation: "((-((y / 63)^2)) + 1) + ((noise2(x, z)+0.5) / 3)" -extends: "BASIC_ORES" -id: "SAVANNA" +extends: "BASIC_ORES" +id: "SAVANNA" palette: - - "BLOCK:minecraft:bedrock": 0 - - BEDROCK_MOST: 1 - - BEDROCK_HALF: 2 - - BEDROCK_LITTLE: 3 - - RIVER_BOTTOM: 61 - - RIVER_SHORE: 62 - - GRASSY: 255 -vanilla: SAVANNA + - "BLOCK:minecraft:bedrock": 0 + - BEDROCK_MOST: 1 + - BEDROCK_HALF: 2 + - BEDROCK_LITTLE: 3 + - RIVER_BOTTOM: 61 + - RIVER_SHORE: 62 + - GRASSY: 255 +vanilla: SAVANNA flora: - chance: 40 + chance: 40 attempts: 1 items: TALL_GRASS: @@ -26,7 +26,7 @@ flora: y: min: 62 max: 84 -erodible: true +erodible: true trees: density: 20 diff --git a/src/main/resources/default-config/biomes/forest/snowy_taiga.yml b/src/main/resources/default-config/biomes/forest/snowy_taiga.yml index 0471dc706..7d6164ea3 100644 --- a/src/main/resources/default-config/biomes/forest/snowy_taiga.yml +++ b/src/main/resources/default-config/biomes/forest/snowy_taiga.yml @@ -1,7 +1,7 @@ noise-equation: "((-((y / 63)^2)) + 1) + ((noise2(x, z)+0.5) / 2)" -extends: "BASIC_ORES" -id: "SNOWY_TAIGA" -erodible: true +extends: "BASIC_ORES" +id: "SNOWY_TAIGA" +erodible: true palette: @@ -12,11 +12,11 @@ palette: - RIVER_BOTTOM: 61 - RIVER_SHORE: 62 - TAIGA: 255 -vanilla: TAIGA +vanilla: TAIGA snow: - - min: 0 - max: 255 + - min: 0 + max: 255 chance: 100 diff --git a/src/main/resources/default-config/biomes/forest/taiga.yml b/src/main/resources/default-config/biomes/forest/taiga.yml index 9e5cd4de3..edc7696d9 100644 --- a/src/main/resources/default-config/biomes/forest/taiga.yml +++ b/src/main/resources/default-config/biomes/forest/taiga.yml @@ -1,6 +1,6 @@ noise-equation: "((-((y / 63)^2)) + 1) + ((noise2(x, z)+0.5) / 2)" -extends: "BASIC_ORES" -id: "TAIGA" +extends: "BASIC_ORES" +id: "TAIGA" palette: - "BLOCK:minecraft:bedrock": 0 @@ -10,11 +10,11 @@ palette: - RIVER_BOTTOM: 61 - RIVER_SHORE: 62 - TAIGA: 255 -vanilla: TAIGA -erodible: true +vanilla: TAIGA +erodible: true flora: - chance: 40 + chance: 40 attempts: 1 items: TALL_GRASS: @@ -22,16 +22,16 @@ flora: y: min: 62 max: 84 - GRASS: - weight: 75 - y: - min: 62 - max: 84 - POPPY: - weight: 5 - y: - min: 62 - max: 84 + GRASS: + weight: 75 + y: + min: 62 + max: 84 + POPPY: + weight: 5 + y: + min: 62 + max: 84 trees: density: 75 diff --git a/src/main/resources/default-config/biomes/mesa.yml b/src/main/resources/default-config/biomes/mesa.yml index 1d0b7ea85..1832099f1 100644 --- a/src/main/resources/default-config/biomes/mesa.yml +++ b/src/main/resources/default-config/biomes/mesa.yml @@ -1,6 +1,6 @@ noise-equation: "((-((y / 64)^2)) + 1) + min(floor(((max(noise2(x/1.5, z/1.5)+0.1, 0)) + 0.1)*5), 3)/2.5 + |(noise2(x, z)+0.1)/3|" -extends: "BASIC_ORES" -id: "MESA" +extends: "BASIC_ORES" +id: "MESA" palette: - "BLOCK:minecraft:bedrock": 0 @@ -22,9 +22,9 @@ palette: - "BLOCK:minecraft:red_terracotta": 84 - "BLOCK:minecraft:orange_terracotta": 80 - RED_DESERT: 72 -vanilla: BADLANDS +vanilla: BADLANDS -flora-chance: 2 +flora-chance: 2 flora: chance: 2 attempts: 1 @@ -40,8 +40,8 @@ flora: min: 62 max: 84 slabs: - enable: true - threshold: 0.0075 + enable: true + threshold: 0.0075 palettes: - "minecraft:red_sand": "BLOCK:minecraft:red_sandstone_slab" use-stairs-if-available: true diff --git a/src/main/resources/default-config/biomes/mountain/arid_mountains.yml b/src/main/resources/default-config/biomes/mountain/arid_mountains.yml index 708d52d29..0e941cb15 100644 --- a/src/main/resources/default-config/biomes/mountain/arid_mountains.yml +++ b/src/main/resources/default-config/biomes/mountain/arid_mountains.yml @@ -1,7 +1,7 @@ noise-equation: "((-((y / 64)^2)) + 1) + min(floor(((|noise2(x/2.5, z/2.5)|) + 0.1)*4), 3)/2.5 + |noise2(x/2.5, z/2.5)|" -id: "ARID_MOUNTAINS" -extends: "BASIC_ORES" +id: "ARID_MOUNTAINS" +extends: "BASIC_ORES" palette: @@ -10,12 +10,12 @@ palette: - BEDROCK_HALF: 2 - BEDROCK_LITTLE: 3 - ARID: 255 -vanilla: SAVANNA +vanilla: SAVANNA -erodible: false +erodible: false flora: - chance: 40 + chance: 40 attempts: 1 items: TALL_GRASS: @@ -38,8 +38,8 @@ trees: min: 58 max: 128 slabs: - enable: true - threshold: 0.015 + enable: true + threshold: 0.015 palettes: - "minecraft:red_sand": "BLOCK:minecraft:red_sandstone_slab" use-stairs-if-available: true diff --git a/src/main/resources/default-config/biomes/mountain/arid_mountains_border_0.yml b/src/main/resources/default-config/biomes/mountain/arid_mountains_border_0.yml index e7fff8825..9717f061b 100644 --- a/src/main/resources/default-config/biomes/mountain/arid_mountains_border_0.yml +++ b/src/main/resources/default-config/biomes/mountain/arid_mountains_border_0.yml @@ -1,26 +1,26 @@ noise-equation: "((-((y / 64)^2)) + 1) + min(floor(((|noise2(x/2.5, z/2.5)|) + 0.1)), 3)/5 + |noise2(x/2.5, z/2.5)|" -id: "ARID_MOUNTAINS_0" -extends: "BASIC_ORES" +id: "ARID_MOUNTAINS_0" +extends: "BASIC_ORES" palette: - - "BLOCK:minecraft:bedrock": 0 - - BEDROCK_MOST: 1 - - BEDROCK_HALF: 2 - - BEDROCK_LITTLE: 3 - - ARID: 255 -vanilla: SAVANNA + - "BLOCK:minecraft:bedrock": 0 + - BEDROCK_MOST: 1 + - BEDROCK_HALF: 2 + - BEDROCK_LITTLE: 3 + - ARID: 255 +vanilla: SAVANNA -erodible: false +erodible: false flora: - chance: 40 - attempts: 1 - items: - TALL_GRASS: - weight: 15 - y: + chance: 40 + attempts: 1 + items: + TALL_GRASS: + weight: 15 + y: min: 62 max: 128 GRASS: @@ -38,10 +38,10 @@ trees: min: 58 max: 128 slabs: - enable: true - threshold: 0.015 - palettes: - - "minecraft:red_sand": "BLOCK:minecraft:red_sandstone_slab" - use-stairs-if-available: true - stair-palettes: - - "minecraft:red_sand": "BLOCK:minecraft:red_sandstone_stairs" \ No newline at end of file + enable: true + threshold: 0.015 + palettes: + - "minecraft:red_sand": "BLOCK:minecraft:red_sandstone_slab" + use-stairs-if-available: true + stair-palettes: + - "minecraft:red_sand": "BLOCK:minecraft:red_sandstone_stairs" \ No newline at end of file diff --git a/src/main/resources/default-config/biomes/mountain/arid_mountains_border_1.yml b/src/main/resources/default-config/biomes/mountain/arid_mountains_border_1.yml index bce92ce8b..4a6168d44 100644 --- a/src/main/resources/default-config/biomes/mountain/arid_mountains_border_1.yml +++ b/src/main/resources/default-config/biomes/mountain/arid_mountains_border_1.yml @@ -1,26 +1,26 @@ noise-equation: "((-((y / 64)^2)) + 1) + min(floor(((|noise2(x/2.5, z/2.5)|) + 0.1)*3), 3)/3 + |noise2(x/2.5, z/2.5)|" -id: "ARID_MOUNTAINS_1" -extends: "BASIC_ORES" +id: "ARID_MOUNTAINS_1" +extends: "BASIC_ORES" palette: - - "BLOCK:minecraft:bedrock": 0 - - BEDROCK_MOST: 1 - - BEDROCK_HALF: 2 - - BEDROCK_LITTLE: 3 - - ARID: 255 -vanilla: SAVANNA + - "BLOCK:minecraft:bedrock": 0 + - BEDROCK_MOST: 1 + - BEDROCK_HALF: 2 + - BEDROCK_LITTLE: 3 + - ARID: 255 +vanilla: SAVANNA -erodible: false +erodible: false flora: - chance: 40 - attempts: 1 - items: - TALL_GRASS: - weight: 15 - y: + chance: 40 + attempts: 1 + items: + TALL_GRASS: + weight: 15 + y: min: 62 max: 128 GRASS: @@ -38,10 +38,10 @@ trees: min: 58 max: 128 slabs: - enable: true - threshold: 0.015 - palettes: - - "minecraft:red_sand": "BLOCK:minecraft:red_sandstone_slab" - use-stairs-if-available: true - stair-palettes: - - "minecraft:red_sand": "BLOCK:minecraft:red_sandstone_stairs" \ No newline at end of file + enable: true + threshold: 0.015 + palettes: + - "minecraft:red_sand": "BLOCK:minecraft:red_sandstone_slab" + use-stairs-if-available: true + stair-palettes: + - "minecraft:red_sand": "BLOCK:minecraft:red_sandstone_stairs" \ No newline at end of file diff --git a/src/main/resources/default-config/biomes/mountain/mountains_stone.yml b/src/main/resources/default-config/biomes/mountain/mountains_stone.yml index a3dd00437..4b62adb3a 100644 --- a/src/main/resources/default-config/biomes/mountain/mountains_stone.yml +++ b/src/main/resources/default-config/biomes/mountain/mountains_stone.yml @@ -1,26 +1,26 @@ -extends: "MOUNTAINS_PRETTY" -id: "MOUNTAINS_STONE" +extends: "MOUNTAINS_PRETTY" +id: "MOUNTAINS_STONE" noise-equation: "((-((y / 76)^2)) + 1) + ((noise2(x, z)+0.5) / 3) + max(noise2(x/2, z/2)*4 + noise2(x*8, z*8)*0.25, 0)" prevent-smooth: true palette: - - "BLOCK:minecraft:bedrock": 0 - - BEDROCK_MOST: 1 - - BEDROCK_HALF: 2 - - BEDROCK_LITTLE: 3 - - MOUNTAIN_STONE: 255 - - MOUNTAIN_STONE_GRASS: 108 - - MOUNTAIN_GRASS: 84 -vanilla: MOUNTAINS + - "BLOCK:minecraft:bedrock": 0 + - BEDROCK_MOST: 1 + - BEDROCK_HALF: 2 + - BEDROCK_LITTLE: 3 + - MOUNTAIN_STONE: 255 + - MOUNTAIN_STONE_GRASS: 108 + - MOUNTAIN_GRASS: 84 +vanilla: MOUNTAINS snow: - - min: 0 - max: 120 - chance: 50 - - min: 120 - max: 140 - chance: 75 - - min: 140 - max: 255 - chance: 100 + - min: 0 + max: 120 + chance: 50 + - min: 120 + max: 140 + chance: 75 + - min: 140 + max: 255 + chance: 100 trees: density: 200 items: diff --git a/src/main/resources/default-config/biomes/mountain/mountains_stone_border_0.yml b/src/main/resources/default-config/biomes/mountain/mountains_stone_border_0.yml index dabe8bfe2..508f2dd7b 100644 --- a/src/main/resources/default-config/biomes/mountain/mountains_stone_border_0.yml +++ b/src/main/resources/default-config/biomes/mountain/mountains_stone_border_0.yml @@ -1,26 +1,26 @@ -extends: "MOUNTAINS_PRETTY_0" -id: "MOUNTAINS_STONE_0" +extends: "MOUNTAINS_PRETTY_0" +id: "MOUNTAINS_STONE_0" noise-equation: "((-((y / 64)^2)) + 1) + ((noise2(x, z)+0.5) / 3) + max(noise2(x/2, z/2), 0)" prevent-smooth: true palette: - - "BLOCK:minecraft:bedrock": 0 - - BEDROCK_MOST: 1 - - BEDROCK_HALF: 2 - - BEDROCK_LITTLE: 3 - - MOUNTAIN_STONE: 255 - - MOUNTAIN_STONE_GRASS: 108 - - MOUNTAIN_GRASS: 84 -vanilla: MOUNTAINS + - "BLOCK:minecraft:bedrock": 0 + - BEDROCK_MOST: 1 + - BEDROCK_HALF: 2 + - BEDROCK_LITTLE: 3 + - MOUNTAIN_STONE: 255 + - MOUNTAIN_STONE_GRASS: 108 + - MOUNTAIN_GRASS: 84 +vanilla: MOUNTAINS snow: - - min: 0 - max: 120 - chance: 50 - - min: 120 - max: 140 - chance: 75 - - min: 140 - max: 255 - chance: 100 + - min: 0 + max: 120 + chance: 50 + - min: 120 + max: 140 + chance: 75 + - min: 140 + max: 255 + chance: 100 trees: density: 200 items: diff --git a/src/main/resources/default-config/biomes/mountain/mountains_stone_border_1.yml b/src/main/resources/default-config/biomes/mountain/mountains_stone_border_1.yml index c31e6ca08..44502269e 100644 --- a/src/main/resources/default-config/biomes/mountain/mountains_stone_border_1.yml +++ b/src/main/resources/default-config/biomes/mountain/mountains_stone_border_1.yml @@ -1,5 +1,5 @@ -extends: "MOUNTAINS_PRETTY_1" -id: "MOUNTAINS_STONE_1" +extends: "MOUNTAINS_PRETTY_1" +id: "MOUNTAINS_STONE_1" noise-equation: "((-((y / 70)^2)) + 1) + ((noise2(x, z)+0.5) / 3) + max(noise2(x/2, z/2)*3 + noise2(x*8, z*8)*0.125, 0)" prevent-smooth: true palette: @@ -10,16 +10,16 @@ palette: - MOUNTAIN_STONE: 255 - MOUNTAIN_STONE_GRASS: 108 - MOUNTAIN_GRASS: 84 -vanilla: MOUNTAINS +vanilla: MOUNTAINS snow: - - min: 0 - max: 120 + - min: 0 + max: 120 chance: 50 - - min: 120 - max: 140 + - min: 120 + max: 140 chance: 75 - - min: 140 - max: 255 + - min: 140 + max: 255 chance: 100 trees: density: 200 diff --git a/src/main/resources/default-config/biomes/mountains.yml b/src/main/resources/default-config/biomes/mountains.yml index ba0c6b67d..0c8c23831 100644 --- a/src/main/resources/default-config/biomes/mountains.yml +++ b/src/main/resources/default-config/biomes/mountains.yml @@ -1,6 +1,6 @@ noise-equation: "((-((y / 62)^2)) + 1) + ((noise2(x, z)+0.5) / 3) + max(floor(noise3(x/2, y, z/2)*10 + noise2(x/2, z/2)*55)/8, 0)" -extends: "BASIC_ORES" -id: "MOUNTAINS" +extends: "BASIC_ORES" +id: "MOUNTAINS" palette: - "BLOCK:minecraft:bedrock": 0 @@ -9,10 +9,10 @@ palette: - BEDROCK_LITTLE: 3 - TUNDRA: 100 - SNOW: 255 -vanilla: MOUNTAINS +vanilla: MOUNTAINS flora: - chance: 2 + chance: 2 attempts: 1 items: SMALL_ROCK: @@ -21,8 +21,8 @@ flora: min: 60 max: 72 slabs: - enable: true - threshold: 0.015 + enable: true + threshold: 0.015 palettes: - "minecraft:stone": "MOUNTAIN_SLABS" - "minecraft:snow_block": "SNOW_LAYERS" diff --git a/src/main/resources/default-config/biomes/ocean/ocean_warm.yml b/src/main/resources/default-config/biomes/ocean/ocean_warm.yml index 7d422ece2..d348eeab5 100644 --- a/src/main/resources/default-config/biomes/ocean/ocean_warm.yml +++ b/src/main/resources/default-config/biomes/ocean/ocean_warm.yml @@ -14,7 +14,7 @@ flora: simplex: enable: true frequency: 0.05 - seed: 4 + seed: 4 items: TALL_SEAGRASS: weight: 1 diff --git a/src/main/resources/default-config/biomes/ocean_deep/ocean_warm.yml b/src/main/resources/default-config/biomes/ocean_deep/ocean_warm.yml index 5848958f2..851322bcb 100644 --- a/src/main/resources/default-config/biomes/ocean_deep/ocean_warm.yml +++ b/src/main/resources/default-config/biomes/ocean_deep/ocean_warm.yml @@ -14,7 +14,7 @@ flora: simplex: enable: true frequency: 0.05 - seed: 4 + seed: 4 items: TALL_SEAGRASS: weight: 1 diff --git a/src/main/resources/default-config/biomes/ocean_shelf/ocean_warm.yml b/src/main/resources/default-config/biomes/ocean_shelf/ocean_warm.yml index 860d20dbd..279bfd0e5 100644 --- a/src/main/resources/default-config/biomes/ocean_shelf/ocean_warm.yml +++ b/src/main/resources/default-config/biomes/ocean_shelf/ocean_warm.yml @@ -14,7 +14,7 @@ flora: simplex: enable: true frequency: 0.05 - seed: 4 + seed: 4 items: TALL_SEAGRASS: weight: 1 diff --git a/src/main/resources/default-config/biomes/plains.yml b/src/main/resources/default-config/biomes/plains.yml index 9e3dda9f2..b8c8721b7 100644 --- a/src/main/resources/default-config/biomes/plains.yml +++ b/src/main/resources/default-config/biomes/plains.yml @@ -1,5 +1,5 @@ -extends: "PLAINS_ABSTRACT" -id: "PLAINS" +extends: "PLAINS_ABSTRACT" +id: "PLAINS" palette: - "BLOCK:minecraft:bedrock": 0 @@ -9,12 +9,12 @@ palette: - RIVER_BOTTOM: 61 - RIVER_SHORE: 62 - GRASSY: 255 -vanilla: PLAINS +vanilla: PLAINS erodible: true flora: - chance: 60 + chance: 60 attempts: 1 items: TALL_GRASS: diff --git a/src/main/resources/default-config/biomes/plains_sky.yml b/src/main/resources/default-config/biomes/plains_sky.yml index aa9a9cae2..ba9d42124 100644 --- a/src/main/resources/default-config/biomes/plains_sky.yml +++ b/src/main/resources/default-config/biomes/plains_sky.yml @@ -1,5 +1,5 @@ -extends: "PLAINS_ABSTRACT" -id: "SKY_ISLANDS" +extends: "PLAINS_ABSTRACT" +id: "SKY_ISLANDS" noise-equation: "if(max(y-96, 0), -(if(max(y-150, 0), |y-150|, |y-150|/16)) - 0.25 + (noise2(x*3, z*3)*3), ((-((y / 63)^2)) + 1) + |(noise2(x, z) / 3) + 0.1|)" @@ -11,12 +11,12 @@ palette: - RIVER_BOTTOM: 61 - RIVER_SHORE: 62 - GRASSY: 255 -vanilla: PLAINS +vanilla: PLAINS -erodible: true +erodible: true flora: - chance: 60 + chance: 60 attempts: 1 items: TALL_GRASS: diff --git a/src/main/resources/default-config/biomes/river.yml b/src/main/resources/default-config/biomes/river.yml index 5719efbb5..d5981f23b 100644 --- a/src/main/resources/default-config/biomes/river.yml +++ b/src/main/resources/default-config/biomes/river.yml @@ -1,6 +1,6 @@ noise-equation: "((-((y / 58)^2)) + 1) + ((noise2(x, z)/4))" -extends: "BASIC_ORES" -id: "RIVER" +extends: "BASIC_ORES" +id: "RIVER" palette: - "BLOCK:minecraft:bedrock": 0 - BEDROCK_MOST: 1 @@ -9,10 +9,10 @@ palette: - RIVER_BOTTOM: 61 - RIVER_SHORE: 62 - GRASSY: 255 -vanilla: RIVER +vanilla: RIVER flora: - chance: 60 + chance: 60 attempts: 1 items: TALL_GRASS: diff --git a/src/main/resources/default-config/biomes/swamp.yml b/src/main/resources/default-config/biomes/swamp.yml index 7b7e8f4e9..71c83b936 100644 --- a/src/main/resources/default-config/biomes/swamp.yml +++ b/src/main/resources/default-config/biomes/swamp.yml @@ -1,6 +1,6 @@ noise-equation: "((-((y / 62)^2)) + 1) + ((noise2(x, z)/4))" -extends: "BASIC_ORES" -id: "SWAMP" +extends: "BASIC_ORES" +id: "SWAMP" palette: - "BLOCK:minecraft:bedrock": 0 - BEDROCK_MOST: 1 @@ -8,9 +8,9 @@ palette: - BEDROCK_LITTLE: 3 - SWAMP_BOTTOM: 61 - SWAMP: 255 -vanilla: SWAMP +vanilla: SWAMP flora: - chance: 80 + chance: 80 attempts: 1 items: TALL_GRASS: diff --git a/src/main/resources/default-config/biomes/tundra.yml b/src/main/resources/default-config/biomes/tundra.yml index 8bea04905..256e564d2 100644 --- a/src/main/resources/default-config/biomes/tundra.yml +++ b/src/main/resources/default-config/biomes/tundra.yml @@ -1,5 +1,5 @@ -extends: "PLAINS_ABSTRACT" -id: "TUNDRA" +extends: "PLAINS_ABSTRACT" +id: "TUNDRA" palette: - "BLOCK:minecraft:bedrock": 0 @@ -7,15 +7,15 @@ palette: - BEDROCK_HALF: 2 - BEDROCK_LITTLE: 3 - TUNDRA: 255 -vanilla: SNOWY_TUNDRA +vanilla: SNOWY_TUNDRA carving: CAVE_TUNDRA: 35 - RAVINE: 5 - CAVERN: 5 + RAVINE: 5 + CAVERN: 5 snow: - - min: 0 - max: 255 + - min: 0 + max: 255 chance: 30 erodible: true @@ -36,8 +36,8 @@ trees: min: 58 max: 84 slabs: - enable: true - threshold: 0.015 + enable: true + threshold: 0.015 palettes: - "minecraft:stone": "MOUNTAIN_SLABS" - "minecraft:snow_block": "SNOW_LAYERS" diff --git a/src/main/resources/default-config/carving/cave.yml b/src/main/resources/default-config/carving/cave.yml index 23395e2d4..60b95bb5d 100644 --- a/src/main/resources/default-config/carving/cave.yml +++ b/src/main/resources/default-config/carving/cave.yml @@ -20,9 +20,9 @@ cut: top: 0 bottom: 1 mutate: - x: 2 - y: 6 - z: 2 + x: 2 + y: 6 + z: 2 radius: 0.125 palette: inner: diff --git a/src/main/resources/default-config/carving/cave_ocean.yml b/src/main/resources/default-config/carving/cave_ocean.yml index 4a6259110..e384226f9 100644 --- a/src/main/resources/default-config/carving/cave_ocean.yml +++ b/src/main/resources/default-config/carving/cave_ocean.yml @@ -20,9 +20,9 @@ cut: top: 0 bottom: 0 mutate: - x: 2 - y: 6 - z: 2 + x: 2 + y: 6 + z: 2 radius: 0.125 palette: inner: diff --git a/src/main/resources/default-config/carving/cave_swamp.yml b/src/main/resources/default-config/carving/cave_swamp.yml index 658e20fb1..a29a65c89 100644 --- a/src/main/resources/default-config/carving/cave_swamp.yml +++ b/src/main/resources/default-config/carving/cave_swamp.yml @@ -20,9 +20,9 @@ cut: top: 0 bottom: 0 mutate: - x: 2 - y: 6 - z: 2 + x: 2 + y: 6 + z: 2 radius: 0.125 palette: inner: diff --git a/src/main/resources/default-config/carving/cave_tundra.yml b/src/main/resources/default-config/carving/cave_tundra.yml index 69edda00b..62cd090c4 100644 --- a/src/main/resources/default-config/carving/cave_tundra.yml +++ b/src/main/resources/default-config/carving/cave_tundra.yml @@ -20,10 +20,10 @@ cut: top: 0 bottom: 0 mutate: - x: 2 - y: 6 - z: 2 - radius: 0.125 + x: 2 + y: 6 + z: 2 + radius: 0.125 palette: inner: replace-blacklist: true diff --git a/src/main/resources/default-config/carving/cavern.yml b/src/main/resources/default-config/carving/cavern.yml index d1058c47a..86c37cb0d 100644 --- a/src/main/resources/default-config/carving/cavern.yml +++ b/src/main/resources/default-config/carving/cavern.yml @@ -20,10 +20,10 @@ cut: top: 0 bottom: 1 mutate: - x: 2 - y: 6 - z: 2 - radius: 0.125 + x: 2 + y: 6 + z: 2 + radius: 0.125 palette: inner: replace-blacklist: true diff --git a/src/main/resources/default-config/carving/ravine.yml b/src/main/resources/default-config/carving/ravine.yml index 3b4e49d4c..caedc59da 100644 --- a/src/main/resources/default-config/carving/ravine.yml +++ b/src/main/resources/default-config/carving/ravine.yml @@ -20,10 +20,10 @@ cut: top: 1 bottom: 2 mutate: - x: 1 - y: 4 - z: 1 - radius: 0.125 + x: 1 + y: 4 + z: 1 + radius: 0.125 palette: inner: replace-blacklist: true diff --git a/src/main/resources/default-config/ores/deposits/andesite_pocket.yml b/src/main/resources/default-config/ores/deposits/andesite_pocket.yml index 9eb0238d3..612b7b2fe 100644 --- a/src/main/resources/default-config/ores/deposits/andesite_pocket.yml +++ b/src/main/resources/default-config/ores/deposits/andesite_pocket.yml @@ -2,8 +2,8 @@ material: "minecraft:andesite" radius: min: 3 max: 4 -deform: 0.75 +deform: 0.75 deform-frequency: 0.1 -id: "ANDESITE" +id: "ANDESITE" replace: - "minecraft:stone" \ No newline at end of file diff --git a/src/main/resources/default-config/ores/deposits/diorite_pocket.yml b/src/main/resources/default-config/ores/deposits/diorite_pocket.yml index df268bd9d..65e15d323 100644 --- a/src/main/resources/default-config/ores/deposits/diorite_pocket.yml +++ b/src/main/resources/default-config/ores/deposits/diorite_pocket.yml @@ -2,8 +2,8 @@ material: "minecraft:diorite" radius: min: 3 max: 4 -deform: 0.75 +deform: 0.75 deform-frequency: 0.1 -id: "DIORITE" +id: "DIORITE" replace: - "minecraft:stone" \ No newline at end of file diff --git a/src/main/resources/default-config/ores/deposits/dirt_pocket.yml b/src/main/resources/default-config/ores/deposits/dirt_pocket.yml index 0fbaf7fac..76312b589 100644 --- a/src/main/resources/default-config/ores/deposits/dirt_pocket.yml +++ b/src/main/resources/default-config/ores/deposits/dirt_pocket.yml @@ -2,8 +2,8 @@ material: "minecraft:dirt" radius: min: 3 max: 4 -deform: 0.75 +deform: 0.75 deform-frequency: 0.1 -id: "DIRT" +id: "DIRT" replace: - "minecraft:stone" \ No newline at end of file diff --git a/src/main/resources/default-config/ores/deposits/granite_pocket.yml b/src/main/resources/default-config/ores/deposits/granite_pocket.yml index cc8fb36bd..d50fe47af 100644 --- a/src/main/resources/default-config/ores/deposits/granite_pocket.yml +++ b/src/main/resources/default-config/ores/deposits/granite_pocket.yml @@ -2,8 +2,8 @@ material: "minecraft:granite" radius: min: 3 max: 4 -deform: 0.75 +deform: 0.75 deform-frequency: 0.1 -id: "GRANITE" +id: "GRANITE" replace: - "minecraft:stone" \ No newline at end of file diff --git a/src/main/resources/default-config/ores/deposits/gravel_pocket.yml b/src/main/resources/default-config/ores/deposits/gravel_pocket.yml index 6fc50aea7..dd74170bd 100644 --- a/src/main/resources/default-config/ores/deposits/gravel_pocket.yml +++ b/src/main/resources/default-config/ores/deposits/gravel_pocket.yml @@ -2,8 +2,8 @@ material: "minecraft:gravel" radius: min: 3 max: 4 -deform: 0.75 +deform: 0.75 deform-frequency: 0.1 -id: "GRAVEL" +id: "GRAVEL" replace: - "minecraft:stone" \ No newline at end of file diff --git a/src/main/resources/default-config/ores/minerals/coal.yml b/src/main/resources/default-config/ores/minerals/coal.yml index c2718e2af..8a3e7a63c 100644 --- a/src/main/resources/default-config/ores/minerals/coal.yml +++ b/src/main/resources/default-config/ores/minerals/coal.yml @@ -2,8 +2,8 @@ material: "minecraft:coal_ore" radius: min: 1 max: 2 -deform: 0.75 +deform: 0.75 deform-frequency: 0.2 -id: "COAL_ORE" +id: "COAL_ORE" replace: - "minecraft:stone" \ No newline at end of file diff --git a/src/main/resources/default-config/ores/minerals/diamond.yml b/src/main/resources/default-config/ores/minerals/diamond.yml index 4649f2eee..2b1f32a56 100644 --- a/src/main/resources/default-config/ores/minerals/diamond.yml +++ b/src/main/resources/default-config/ores/minerals/diamond.yml @@ -2,8 +2,8 @@ material: "minecraft:diamond_ore" radius: min: 0 max: 1 -deform: 0.75 +deform: 0.75 deform-frequency: 0.2 -id: "DIAMOND_ORE" +id: "DIAMOND_ORE" replace: - "minecraft:stone" \ No newline at end of file diff --git a/src/main/resources/default-config/ores/minerals/gold.yml b/src/main/resources/default-config/ores/minerals/gold.yml index 97311d056..fc5954eb7 100644 --- a/src/main/resources/default-config/ores/minerals/gold.yml +++ b/src/main/resources/default-config/ores/minerals/gold.yml @@ -2,8 +2,8 @@ material: "minecraft:gold_ore" radius: min: 1 max: 1 -deform: 0.75 +deform: 0.75 deform-frequency: 0.2 -id: "GOLD_ORE" +id: "GOLD_ORE" replace: - "minecraft:stone" \ No newline at end of file diff --git a/src/main/resources/default-config/ores/minerals/iron.yml b/src/main/resources/default-config/ores/minerals/iron.yml index 0e4676c9a..0b2cf36a3 100644 --- a/src/main/resources/default-config/ores/minerals/iron.yml +++ b/src/main/resources/default-config/ores/minerals/iron.yml @@ -2,8 +2,8 @@ material: "minecraft:iron_ore" radius: min: 1 max: 1 -deform: 0.75 +deform: 0.75 deform-frequency: 0.2 -id: "IRON_ORE" +id: "IRON_ORE" replace: - "minecraft:stone" \ No newline at end of file diff --git a/src/main/resources/default-config/ores/minerals/lapis.yml b/src/main/resources/default-config/ores/minerals/lapis.yml index 55decabf8..4c626b72a 100644 --- a/src/main/resources/default-config/ores/minerals/lapis.yml +++ b/src/main/resources/default-config/ores/minerals/lapis.yml @@ -2,8 +2,8 @@ material: "minecraft:lapis_ore" radius: min: 1 max: 1 -deform: 0.75 +deform: 0.75 deform-frequency: 0.2 -id: "LAPIS_ORE" +id: "LAPIS_ORE" replace: - "minecraft:stone" \ No newline at end of file diff --git a/src/main/resources/default-config/ores/minerals/redstone.yml b/src/main/resources/default-config/ores/minerals/redstone.yml index 4d399bf63..dcf76b6a6 100644 --- a/src/main/resources/default-config/ores/minerals/redstone.yml +++ b/src/main/resources/default-config/ores/minerals/redstone.yml @@ -2,8 +2,8 @@ material: "minecraft:redstone_ore" radius: min: 1 max: 1 -deform: 0.75 +deform: 0.75 deform-frequency: 0.2 -id: "REDSTONE_ORE" +id: "REDSTONE_ORE" replace: - "minecraft:stone" \ No newline at end of file diff --git a/src/main/resources/default-config/pack.yml b/src/main/resources/default-config/pack.yml index 81563bceb..11f709da2 100644 --- a/src/main/resources/default-config/pack.yml +++ b/src/main/resources/default-config/pack.yml @@ -46,11 +46,11 @@ blend: frequency: 0.125 amplitude: 10 erode: - enable: true - frequency: 0.001 - threshold: 0.0015 - octaves: 5 - grid: "BIOME:RIVER" + enable: true + frequency: 0.001 + threshold: 0.0015 + octaves: 5 + grid: "BIOME:RIVER" noise: octaves: 5 frequency: 0.0075 diff --git a/src/main/resources/default-config/palettes/mountains/arid.yml b/src/main/resources/default-config/palettes/mountains/arid.yml index c27a4f153..9aeaef4f2 100644 --- a/src/main/resources/default-config/palettes/mountains/arid.yml +++ b/src/main/resources/default-config/palettes/mountains/arid.yml @@ -1,29 +1,29 @@ layers: - materials: - - "minecraft:grass_block": 1 + - "minecraft:grass_block": 1 - "minecraft:grass_block": 1 - "minecraft:grass_path": 1 - "minecraft:grass_block": 1 - "minecraft:grass_block": 1 - "minecraft:grass_block": 1 - - "minecraft:grass_block": 1 - - "minecraft:grass_block": 1 - - "minecraft:grass_path": 1 - - "minecraft:grass_block": 1 - - "minecraft:grass_block": 1 - - "minecraft:grass_block": 1 - - "minecraft:grass_block": 1 - - "minecraft:grass_block": 1 - - "minecraft:white_terracotta": 2 + - "minecraft:grass_block": 1 + - "minecraft:grass_block": 1 + - "minecraft:grass_path": 1 + - "minecraft:grass_block": 1 + - "minecraft:grass_block": 1 + - "minecraft:grass_block": 1 + - "minecraft:grass_block": 1 + - "minecraft:grass_block": 1 + - "minecraft:white_terracotta": 2 layers: 1 - - materials: - - "minecraft:dirt": 7 - - "minecraft:white_terracotta": 1 - layers: 2 - - materials: - - "minecraft:stone": 1 - layers: 1 -id: "ARID" -simplex: true + - materials: + - "minecraft:dirt": 7 + - "minecraft:white_terracotta": 1 + layers: 2 + - materials: + - "minecraft:stone": 1 + layers: 1 +id: "ARID" +simplex: true frequency: 0.05 -seed: 3 \ No newline at end of file +seed: 3 \ No newline at end of file diff --git a/src/main/resources/default-config/palettes/mountains/grass.yml b/src/main/resources/default-config/palettes/mountains/grass.yml index 4f227aa90..f4d857e2e 100644 --- a/src/main/resources/default-config/palettes/mountains/grass.yml +++ b/src/main/resources/default-config/palettes/mountains/grass.yml @@ -1,18 +1,18 @@ layers: - - materials: - - "minecraft:cyan_terracotta": 1 - - "minecraft:grass_block": 2 - - "minecraft:snow_block": 3 - layers: 1 - - materials: - - "minecraft:cyan_terracotta": 1 - - "minecraft:dirt": 2 - - "minecraft:snow_block": 3 - layers: 2 - - materials: - - "minecraft:stone": 1 - layers: 1 -id: "MOUNTAIN_GRASS" -simplex: true + - materials: + - "minecraft:cyan_terracotta": 1 + - "minecraft:grass_block": 2 + - "minecraft:snow_block": 3 + layers: 1 + - materials: + - "minecraft:cyan_terracotta": 1 + - "minecraft:dirt": 2 + - "minecraft:snow_block": 3 + layers: 2 + - materials: + - "minecraft:stone": 1 + layers: 1 +id: "MOUNTAIN_GRASS" +simplex: true frequency: 0.075 -seed: 3 \ No newline at end of file +seed: 3 \ No newline at end of file diff --git a/src/main/resources/default-config/palettes/mountains/jungle.yml b/src/main/resources/default-config/palettes/mountains/jungle.yml index 9e8ba9867..ac514fe04 100644 --- a/src/main/resources/default-config/palettes/mountains/jungle.yml +++ b/src/main/resources/default-config/palettes/mountains/jungle.yml @@ -1,20 +1,20 @@ layers: - - materials: - - "minecraft:brown_terracotta": 2 - - "minecraft:grass_block": 10 - - "minecraft:cobblestone": 1 - - "minecraft:stone": 1 - layers: 1 - - materials: - - "minecraft:brown_terracotta": 2 - - "minecraft:dirt": 10 - - "minecraft:cobblestone": 1 - - "minecraft:stone": 1 - layers: 2 - - materials: - - "minecraft:stone": 1 - layers: 1 -id: "MOUNTAIN_JUNGLE" -simplex: true + - materials: + - "minecraft:brown_terracotta": 2 + - "minecraft:grass_block": 10 + - "minecraft:cobblestone": 1 + - "minecraft:stone": 1 + layers: 1 + - materials: + - "minecraft:brown_terracotta": 2 + - "minecraft:dirt": 10 + - "minecraft:cobblestone": 1 + - "minecraft:stone": 1 + layers: 2 + - materials: + - "minecraft:stone": 1 + layers: 1 +id: "MOUNTAIN_JUNGLE" +simplex: true frequency: 0.04 -seed: 3 \ No newline at end of file +seed: 3 \ No newline at end of file diff --git a/src/main/resources/default-config/palettes/mountains/pretty_mountains.yml b/src/main/resources/default-config/palettes/mountains/pretty_mountains.yml index 14864e392..cb0b88703 100644 --- a/src/main/resources/default-config/palettes/mountains/pretty_mountains.yml +++ b/src/main/resources/default-config/palettes/mountains/pretty_mountains.yml @@ -1,24 +1,24 @@ layers: - - materials: - - "minecraft:cyan_terracotta": 2 - - "minecraft:clay": 2 - - "minecraft:light_gray_terracotta": 2 - - "minecraft:grass_block": 10 - - "minecraft:cobblestone": 1 - - "minecraft:stone": 1 - layers: 1 - - materials: - - "minecraft:cyan_terracotta": 2 - - "minecraft:clay": 2 - - "minecraft:light_gray_terracotta": 2 - - "minecraft:dirt": 10 - - "minecraft:cobblestone": 1 - - "minecraft:stone": 1 - layers: 2 - - materials: - - "minecraft:stone": 1 - layers: 1 -id: "MOUNTAIN_PRETTY" -simplex: true + - materials: + - "minecraft:cyan_terracotta": 2 + - "minecraft:clay": 2 + - "minecraft:light_gray_terracotta": 2 + - "minecraft:grass_block": 10 + - "minecraft:cobblestone": 1 + - "minecraft:stone": 1 + layers: 1 + - materials: + - "minecraft:cyan_terracotta": 2 + - "minecraft:clay": 2 + - "minecraft:light_gray_terracotta": 2 + - "minecraft:dirt": 10 + - "minecraft:cobblestone": 1 + - "minecraft:stone": 1 + layers: 2 + - materials: + - "minecraft:stone": 1 + layers: 1 +id: "MOUNTAIN_PRETTY" +simplex: true frequency: 0.03 -seed: 3 \ No newline at end of file +seed: 3 \ No newline at end of file diff --git a/src/main/resources/default-config/palettes/mountains/stone.yml b/src/main/resources/default-config/palettes/mountains/stone.yml index 76a0bb271..a99dac41a 100644 --- a/src/main/resources/default-config/palettes/mountains/stone.yml +++ b/src/main/resources/default-config/palettes/mountains/stone.yml @@ -1,14 +1,14 @@ layers: - - materials: - - "minecraft:cyan_terracotta": 1 - - "minecraft:stone": 2 - - "minecraft:snow_block": 3 - - "minecraft:cobblestone": 1 - layers: 3 - - materials: - - "minecraft:stone": 1 - layers: 1 -id: "MOUNTAIN_STONE" -simplex: true + - materials: + - "minecraft:cyan_terracotta": 1 + - "minecraft:stone": 2 + - "minecraft:snow_block": 3 + - "minecraft:cobblestone": 1 + layers: 3 + - materials: + - "minecraft:stone": 1 + layers: 1 +id: "MOUNTAIN_STONE" +simplex: true frequency: 0.075 -seed: 3 \ No newline at end of file +seed: 3 \ No newline at end of file diff --git a/src/main/resources/default-config/palettes/mountains/stone_grass.yml b/src/main/resources/default-config/palettes/mountains/stone_grass.yml index 0ec174614..e6abe73d0 100644 --- a/src/main/resources/default-config/palettes/mountains/stone_grass.yml +++ b/src/main/resources/default-config/palettes/mountains/stone_grass.yml @@ -1,22 +1,22 @@ layers: - - materials: - - "minecraft:cyan_terracotta": 1 - - "minecraft:stone": 2 - - "minecraft:grass_block": 2 - - "minecraft:snow_block": 4 - - "minecraft:cobblestone": 1 + - materials: + - "minecraft:cyan_terracotta": 1 + - "minecraft:stone": 2 + - "minecraft:grass_block": 2 + - "minecraft:snow_block": 4 + - "minecraft:cobblestone": 1 layers: 1 - - materials: - - "minecraft:cyan_terracotta": 1 - - "minecraft:stone": 2 - - "minecraft:dirt": 2 - - "minecraft:snow_block": 4 - - "minecraft:cobblestone": 1 - layers: 2 - - materials: - - "minecraft:stone": 1 - layers: 1 -id: "MOUNTAIN_STONE_GRASS" -simplex: true + - materials: + - "minecraft:cyan_terracotta": 1 + - "minecraft:stone": 2 + - "minecraft:dirt": 2 + - "minecraft:snow_block": 4 + - "minecraft:cobblestone": 1 + layers: 2 + - materials: + - "minecraft:stone": 1 + layers: 1 +id: "MOUNTAIN_STONE_GRASS" +simplex: true frequency: 0.075 -seed: 3 \ No newline at end of file +seed: 3 \ No newline at end of file diff --git a/src/main/resources/default-config/palettes/river_bottom.yml b/src/main/resources/default-config/palettes/river_bottom.yml index 3b7d8ea9e..da88c45ac 100644 --- a/src/main/resources/default-config/palettes/river_bottom.yml +++ b/src/main/resources/default-config/palettes/river_bottom.yml @@ -1,13 +1,13 @@ layers: - - materials: - - "minecraft:gravel": 1 - - "minecraft:dirt": 4 - - "minecraft:sand": 2 - layers: 2 - - materials: - - "minecraft:stone": 1 - layers: 1 -id: "RIVER_BOTTOM" -simplex: true + - materials: + - "minecraft:gravel": 1 + - "minecraft:dirt": 4 + - "minecraft:sand": 2 + layers: 2 + - materials: + - "minecraft:stone": 1 + layers: 1 +id: "RIVER_BOTTOM" +simplex: true frequency: 0.05 -seed: 3 \ No newline at end of file +seed: 3 \ No newline at end of file diff --git a/src/main/resources/default-config/palettes/river_shore.yml b/src/main/resources/default-config/palettes/river_shore.yml index ab0aaa6cc..7fca87bd2 100644 --- a/src/main/resources/default-config/palettes/river_shore.yml +++ b/src/main/resources/default-config/palettes/river_shore.yml @@ -1,16 +1,16 @@ layers: - - materials: - - "minecraft:gravel": 1 - - "minecraft:grass_block": 4 - - "minecraft:sand": 2 - layers: 1 - - materials: - - "minecraft:dirt": 1 - layers: 2 - - materials: - - "minecraft:stone": 1 - layers: 1 -id: "RIVER_SHORE" -simplex: true + - materials: + - "minecraft:gravel": 1 + - "minecraft:grass_block": 4 + - "minecraft:sand": 2 + layers: 1 + - materials: + - "minecraft:dirt": 1 + layers: 2 + - materials: + - "minecraft:stone": 1 + layers: 1 +id: "RIVER_SHORE" +simplex: true frequency: 0.05 -seed: 3 \ No newline at end of file +seed: 3 \ No newline at end of file diff --git a/src/main/resources/default-config/palettes/slabs/mountainslabs.yml b/src/main/resources/default-config/palettes/slabs/mountainslabs.yml index 5727f6e7c..bcfd45052 100644 --- a/src/main/resources/default-config/palettes/slabs/mountainslabs.yml +++ b/src/main/resources/default-config/palettes/slabs/mountainslabs.yml @@ -1,9 +1,9 @@ layers: - - materials: - - "minecraft:cobblestone_slab": 1 - - "minecraft:stone_slab": 3 - layers: 1 -id: "MOUNTAIN_SLABS" -simplex: true + - materials: + - "minecraft:cobblestone_slab": 1 + - "minecraft:stone_slab": 3 + layers: 1 +id: "MOUNTAIN_SLABS" +simplex: true frequency: 0.1 -seed: 4 \ No newline at end of file +seed: 4 \ No newline at end of file diff --git a/src/main/resources/default-config/palettes/slabs/mountainstairs.yml b/src/main/resources/default-config/palettes/slabs/mountainstairs.yml index a6c2967ac..a59794945 100644 --- a/src/main/resources/default-config/palettes/slabs/mountainstairs.yml +++ b/src/main/resources/default-config/palettes/slabs/mountainstairs.yml @@ -1,9 +1,9 @@ layers: - - materials: - - "minecraft:cobblestone_stairs": 1 - - "minecraft:stone_stairs": 3 - layers: 1 -id: "MOUNTAIN_STAIRS" -simplex: true + - materials: + - "minecraft:cobblestone_stairs": 1 + - "minecraft:stone_stairs": 3 + layers: 1 +id: "MOUNTAIN_STAIRS" +simplex: true frequency: 0.1 -seed: 4 \ No newline at end of file +seed: 4 \ No newline at end of file diff --git a/src/main/resources/default-config/palettes/taiga.yml b/src/main/resources/default-config/palettes/taiga.yml index 06fd944a5..e1792890b 100644 --- a/src/main/resources/default-config/palettes/taiga.yml +++ b/src/main/resources/default-config/palettes/taiga.yml @@ -1,15 +1,15 @@ layers: - - materials: - - "minecraft:grass_block": 2 - - "minecraft:podzol": 1 - layers: 1 - - materials: - - "minecraft:dirt": 1 - layers: 2 - - materials: - - "minecraft:stone": 1 - layers: 1 -id: "TAIGA" -simplex: true + - materials: + - "minecraft:grass_block": 2 + - "minecraft:podzol": 1 + layers: 1 + - materials: + - "minecraft:dirt": 1 + layers: 2 + - materials: + - "minecraft:stone": 1 + layers: 1 +id: "TAIGA" +simplex: true frequency: 0.03 -seed: 3 \ No newline at end of file +seed: 3 \ No newline at end of file diff --git a/src/main/resources/default-config/palettes/tundra.yml b/src/main/resources/default-config/palettes/tundra.yml index 0988421a9..24d2f9787 100644 --- a/src/main/resources/default-config/palettes/tundra.yml +++ b/src/main/resources/default-config/palettes/tundra.yml @@ -1,21 +1,21 @@ layers: - - materials: - - "minecraft:gravel": 1 - - "minecraft:stone": 1 - - "minecraft:gravel": 1 - - "minecraft:gravel": 1 - - "minecraft:stone": 1 - - "minecraft:snow_block": 2 - - "minecraft:gravel": 1 - - "minecraft:snow_block": 2 - layers: 2 - - materials: - - "minecraft:stone": 1 - layers: 4 - - materials: - - "minecraft:stone": 1 - layers: 1 -id: "TUNDRA" -simplex: true + - materials: + - "minecraft:gravel": 1 + - "minecraft:stone": 1 + - "minecraft:gravel": 1 + - "minecraft:gravel": 1 + - "minecraft:stone": 1 + - "minecraft:snow_block": 2 + - "minecraft:gravel": 1 + - "minecraft:snow_block": 2 + layers: 2 + - materials: + - "minecraft:stone": 1 + layers: 4 + - materials: + - "minecraft:stone": 1 + layers: 1 +id: "TUNDRA" +simplex: true frequency: 0.04 -seed: 4 \ No newline at end of file +seed: 4 \ No newline at end of file diff --git a/src/main/resources/default-config/structures/single/mansion.yml b/src/main/resources/default-config/structures/single/mansion.yml index 16ac5285b..a67f828b4 100644 --- a/src/main/resources/default-config/structures/single/mansion.yml +++ b/src/main/resources/default-config/structures/single/mansion.yml @@ -13,29 +13,29 @@ spawn: loot: 1: arrows features: - - ENTITY_FEATURE: - entity: VINDICATOR - attempts: 100 - in-height: 1 - amount: - min: 60 - max: 80 - spawnable-on: - - "minecraft:birch_planks" - spawnable-in: - - "minecraft:air" - - "minecraft:red_carpet" - - "minecraft:white_carpet" - - ENTITY_FEATURE: - entity: EVOKER - attempts: 50 - in-height: 2 - amount: - min: 1 - max: 3 - spawnable-on: - - "minecraft:birch_planks" - spawnable-in: - - "minecraft:air" - - "minecraft:red_carpet" - - "minecraft:white_carpet" \ No newline at end of file + - ENTITY_FEATURE: + entity: VINDICATOR + attempts: 100 + in-height: 1 + amount: + min: 60 + max: 80 + spawnable-on: + - "minecraft:birch_planks" + spawnable-in: + - "minecraft:air" + - "minecraft:red_carpet" + - "minecraft:white_carpet" + - ENTITY_FEATURE: + entity: EVOKER + attempts: 50 + in-height: 2 + amount: + min: 1 + max: 3 + spawnable-on: + - "minecraft:birch_planks" + spawnable-in: + - "minecraft:air" + - "minecraft:red_carpet" + - "minecraft:white_carpet" \ No newline at end of file diff --git a/src/main/resources/default-config/structures/single/stronghold.yml b/src/main/resources/default-config/structures/single/stronghold.yml index f7cd0778d..af81bdbd2 100644 --- a/src/main/resources/default-config/structures/single/stronghold.yml +++ b/src/main/resources/default-config/structures/single/stronghold.yml @@ -15,29 +15,29 @@ loot: 2: cobble_house 3: cobble_house features: - - ENTITY_FEATURE: - entity: SILVERFISH - attempts: 40 - in-height: 1 - amount: - min: 20 - max: 30 - spawnable-on: - - "minecraft:stone" - - "minecraft:stone_bricks" - - "minecraft:mossy_stone_bricks" - spawnable-in: - - "minecraft:air" - - ENTITY_FEATURE: - entity: ZOMBIE - attempts: 20 - in-height: 2 - amount: - min: 10 - max: 15 - spawnable-on: - - "minecraft:stone" - - "minecraft:stone_bricks" - - "minecraft:mossy_stone_bricks" - spawnable-in: - - "minecraft:air" \ No newline at end of file + - ENTITY_FEATURE: + entity: SILVERFISH + attempts: 40 + in-height: 1 + amount: + min: 20 + max: 30 + spawnable-on: + - "minecraft:stone" + - "minecraft:stone_bricks" + - "minecraft:mossy_stone_bricks" + spawnable-in: + - "minecraft:air" + - ENTITY_FEATURE: + entity: ZOMBIE + attempts: 20 + in-height: 2 + amount: + min: 10 + max: 15 + spawnable-on: + - "minecraft:stone" + - "minecraft:stone_bricks" + - "minecraft:mossy_stone_bricks" + spawnable-in: + - "minecraft:air" \ No newline at end of file diff --git a/src/main/resources/lang/afr_sa.yml b/src/main/resources/lang/afr_sa.yml index acb73665b..e173680e5 100644 --- a/src/main/resources/lang/afr_sa.yml +++ b/src/main/resources/lang/afr_sa.yml @@ -5,45 +5,45 @@ enable: disable: - "Dankie dat u Terra gebruik!" command: - debug-only: "Hierdie opdrag moet gebruik word as die ontfoutmodus geaktiveer is!" - player-only: "Hierdie opdrag is slegs vir spelers!" - invalid: "Ongeldige opdrag.(verwag %1$s argumente, argumente gevind is %2$s)." - players-only: "Hierdie opdrag is slegs vir spelers." - world: "This command must be executed in a Terra world!" - reload: "Terra instel herlaai" - version: "Hierdie bediener gebruik die Terra-weergawe \"%s\"" - main-menu: - - "--------------------Terra--------------------" - - "Herlaai - Herlaai konfigurasiedata" - - "bioom - Kry huidige bioom" - - "erts - Genereer 'n ertsader op die plek waar u te staan kom (vir foutopsporing)" - - "stoor-data - Stoor bevolkingsdata" - - "struktuur - Laai en stoor strukture" - - "profiel - Profielopsies" - - "beeld - Beeld / GUI-opsies" - biome: - biome-found: "Bioom geleë te (%1$s, %2$s)" - unable-to-locate: "Kan bioom nie opspoor nie." - invalid-radius: "Ongeldige radius: \"%s\"" - invalid: "Ongeldige Biome-ID: \"%s\"" - in: "Jy is in \"%s\"" - ore: + debug-only: "Hierdie opdrag moet gebruik word as die ontfoutmodus geaktiveer is!" + player-only: "Hierdie opdrag is slegs vir spelers!" + invalid: "Ongeldige opdrag.(verwag %1$s argumente, argumente gevind is %2$s)." + players-only: "Hierdie opdrag is slegs vir spelers." + world: "This command must be executed in a Terra world!" + reload: "Terra instel herlaai" + version: "Hierdie bediener gebruik die Terra-weergawe \"%s\"" main-menu: + - "--------------------Terra--------------------" + - "Herlaai - Herlaai konfigurasiedata" + - "bioom - Kry huidige bioom" + - "erts - Genereer 'n ertsader op die plek waar u te staan kom (vir foutopsporing)" + - "stoor-data - Stoor bevolkingsdata" + - "struktuur - Laai en stoor strukture" + - "profiel - Profielopsies" + - "beeld - Beeld / GUI-opsies" + biome: + biome-found: "Bioom geleë te (%1$s, %2$s)" + unable-to-locate: "Kan bioom nie opspoor nie." + invalid-radius: "Ongeldige radius: \"%s\"" + invalid: "Ongeldige Biome-ID: \"%s\"" + in: "Jy is in \"%s\"" + ore: + main-menu: - "---------------Terra/erts---------------" - "Genereer 'n ertsader by die blok waarna u kyk." out-of-range: "Blok buite bereik" - invalid-ore: "Kan nie Erts vind nie \"%s\"" + invalid-ore: "Kan nie Erts vind nie \"%s\"" geometry: - main-menu: + main-menu: - "---------------Terra/meetkunde----------------" - "Verskeie opsporingsopdragte vir voxel-meetkunde" - "sfeer - Genereer 'n sfeer" - "vervorming - Genereer 'n misvormde sfeer" - "tube - Genereer 'n tube" - deform: - invalid-radius: "Ongeldige radius: \"%s\"" - invalid-deform: "Ongeldige vervorm: \"%s\"" - invalid-frequency: "Ongeldige frekwensie: \"%s\"" + deform: + invalid-radius: "Ongeldige radius: \"%s\"" + invalid-deform: "Ongeldige vervorm: \"%s\"" + invalid-frequency: "Ongeldige frekwensie: \"%s\"" sphere: invalid-radius: "Ongeldige radius: \"%s\"" tube: @@ -73,20 +73,20 @@ command: start: "Profiler het begin." stop: "Profiler het opgehou." structure: - main-menu: - - "---------------Terra/struktuur---------------" - - "uitvoer - voer u huidige WorldEdit-keuse uit as 'n Terra-struktuur." - - "laai - Laai 'n Terra-struktuur" - invalid-radius: "Ongeldig radius: \"%s\"" - invalid-rotation: "Ongeldige rotasie: \"%s\"" - invalid: "Ongeldig Struktuur ID: \"%s\"" - export: "struktuur gestoor na \"%s\"" + main-menu: + - "---------------Terra/struktuur---------------" + - "uitvoer - voer u huidige WorldEdit-keuse uit as 'n Terra-struktuur." + - "laai - Laai 'n Terra-struktuur" + invalid-radius: "Ongeldig radius: \"%s\"" + invalid-rotation: "Ongeldige rotasie: \"%s\"" + invalid: "Ongeldig Struktuur ID: \"%s\"" + export: "struktuur gestoor na \"%s\"" world-config: - loading: "Laai wêreldkonfigurasiewaardes vir wêreld %s..." - not-found: "Konfigurasie vir wêreld \"%s\" nie gevind nie. Kopieer standaardinstelling." - using-image: "Laai wêreld vanaf prent." - error: "Kon nie konfigurasie vir wêreld laai nie %s" - done: "Wêreldlading voltooi. Tyd verloop: %sms" + loading: "Laai wêreldkonfigurasiewaardes vir wêreld %s..." + not-found: "Konfigurasie vir wêreld \"%s\" nie gevind nie. Kopieer standaardinstelling." + using-image: "Laai wêreld vanaf prent." + error: "Kon nie konfigurasie vir wêreld laai nie %s" + done: "Wêreldlading voltooi. Tyd verloop: %sms" config-pack: loaded: "Laai konfigurasie %1$s in %2$sms." config: diff --git a/src/main/resources/lang/de_de.yml b/src/main/resources/lang/de_de.yml index 091a31617..ac00f24b1 100644 --- a/src/main/resources/lang/de_de.yml +++ b/src/main/resources/lang/de_de.yml @@ -5,88 +5,88 @@ enable: disable: - "Danke, dass du Terra benutzt!!" command: - debug-only: "Dieser Befehl kann nur im Debugmodus benutzt werden!" - player-only: "Dieser Befehl kann nur von Spielern benutzt werden!" - invalid: "Ungültiger Befehl. (Erwartet %1$s Argumente, fand %2$s)." - players-only: "Dieser Befehl kann nur von Spielern benutzt werden." - world: "Dieser Befehl muss in einer von Terra generierten Welt ausgeführt werden!" - reload: "Terra-Konfiguration wurde neu geladen." - version: "Dieser Server verwendet Terra \"%s\"" - main-menu: - - "--------------------Terra--------------------" - - "reload - Lädt die Konfiguration neu" - - "biome - Zeigt dir das derzeitige Biom" - - "ore - Erzader an derzeitiger Position erzeugen (zum Debuggen)" - - "save-data - Bevölkerungsdaten speichern" - - "structure - Laden/Exportieren von Strukturen" - - "profile - Profiler-Optionen" - - "image - Bild-/GUI-Optionen" - biome: - biome-found: "Biom gefunden bei: (%1$s, %2$s)" - unable-to-locate: "Biom konnte nicht gefunden werden!" - invalid-radius: "Ungültiger Radius: \"%s\"" - invalid: "Ungültige Biom-ID: \"%s\"" - in: "Du bist in: \"%s\"" - ore: + debug-only: "Dieser Befehl kann nur im Debugmodus benutzt werden!" + player-only: "Dieser Befehl kann nur von Spielern benutzt werden!" + invalid: "Ungültiger Befehl. (Erwartet %1$s Argumente, fand %2$s)." + players-only: "Dieser Befehl kann nur von Spielern benutzt werden." + world: "Dieser Befehl muss in einer von Terra generierten Welt ausgeführt werden!" + reload: "Terra-Konfiguration wurde neu geladen." + version: "Dieser Server verwendet Terra \"%s\"" main-menu: - - "---------------Terra/Erz---------------" - - "Generiert eine Erzader an dem Block, den du anguckst" - out-of-range: "Block außer Reichweite" - invalid-ore: "Kann Erz \"%s\" nicht finden" - geometry: - main-menu: - - "---------------Terra/Geometrie----------------" - - "Verschiedene Debugging-Befehle für die Voxelgeometrie" - - "sphere - Generiert eine Kugel" - - "deformsphere - Generiert eine deformierte Kugel" - - "tube - Generiert ein Rohr" - deform: - invalid-radius: "Ungültiger Radius: \"%s\"" - invalid-deform: "Ungültiger Deformation: \"%s\"" - invalid-frequency: "Ungültige Frequenz: \"%s\"" - sphere: - invalid-radius: "Ungültiger Radius: \"%s\"" - tube: - invalid-radius: "Ungültiger Radius: \"%s\"" - image: - main-menu: - - "---------------Terra/Bilde---------------" - - "render - Rendert ein Bild mit einer bestimmten Breite und Höhe, das später als Welt importiert werden kann." - - "gui - Debug-GUI öffnen (muss in der Konfiguration aktiviert sein)" - gui: - main-menu: - - "-------------Terra/image/gui-------------" - - "raw - Öffnet eine GUI mit Biome-Rohdaten" - - "step - Daten erneut rendern, um Ränder deutlicher darzustellen" + - "--------------------Terra--------------------" + - "reload - Lädt die Konfiguration neu" + - "biome - Zeigt dir das derzeitige Biom" + - "ore - Erzader an derzeitiger Position erzeugen (zum Debuggen)" + - "save-data - Bevölkerungsdaten speichern" + - "structure - Laden/Exportieren von Strukturen" + - "profile - Profiler-Optionen" + - "image - Bild-/GUI-Optionen" + biome: + biome-found: "Biom gefunden bei: (%1$s, %2$s)" + unable-to-locate: "Biom konnte nicht gefunden werden!" + invalid-radius: "Ungültiger Radius: \"%s\"" + invalid: "Ungültige Biom-ID: \"%s\"" + in: "Du bist in: \"%s\"" + ore: + main-menu: + - "---------------Terra/Erz---------------" + - "Generiert eine Erzader an dem Block, den du anguckst" + out-of-range: "Block außer Reichweite" + invalid-ore: "Kann Erz \"%s\" nicht finden" + geometry: + main-menu: + - "---------------Terra/Geometrie----------------" + - "Verschiedene Debugging-Befehle für die Voxelgeometrie" + - "sphere - Generiert eine Kugel" + - "deformsphere - Generiert eine deformierte Kugel" + - "tube - Generiert ein Rohr" + deform: + invalid-radius: "Ungültiger Radius: \"%s\"" + invalid-deform: "Ungültiger Deformation: \"%s\"" + invalid-frequency: "Ungültige Frequenz: \"%s\"" + sphere: + invalid-radius: "Ungültiger Radius: \"%s\"" + tube: + invalid-radius: "Ungültiger Radius: \"%s\"" + image: + main-menu: + - "---------------Terra/Bilde---------------" + - "render - Rendert ein Bild mit einer bestimmten Breite und Höhe, das später als Welt importiert werden kann." + - "gui - Debug-GUI öffnen (muss in der Konfiguration aktiviert sein)" + gui: + main-menu: + - "-------------Terra/image/gui-------------" + - "raw - Öffnet eine GUI mit Biome-Rohdaten" + - "step - Daten erneut rendern, um Ränder deutlicher darzustellen" debug: "Der Debug-Modus muss aktiviert sein, um die Debug-GUI verwenden zu können! Die Debug-GUI ist NICHT PRODUKTIONSSICHER!" render: save: "Bild gespeichert unter: \"%s\"" error: "Beim speichern ist ein Fehler aufgetreten!" profile: - main-menu: - - "---------------Terra/Profiler---------------" - - "start - Startet den Profiler" - - "stop - Stoppt den Profiler" - - "query - Profiler-Daten anzeigen" - - "reset - Profiler-Daten zurücksetzen" - reset: "Profiler-Daten wurden zurückgesetzt." - start: "Der Profiler wurde gestartet." - stop: "Der Profiler wurde gestoppt." - structure: - main-menu: - - "---------------Terra/Strukturen---------------" - - "export - Exportiert deine aktuelle WorldEdit-Auswahl als Terra-Struktur." - - "load - Ladt eine Terra-Struktur." - invalid-radius: "Ungültiger Radius: \"%s\"" - invalid-rotation: "Ungültige Rotation: \"%s\"" - invalid: "Ungültige Strukturen-ID: \"%s\"" - export: "Struktur unter \"%s\" gespeichert." + main-menu: + - "---------------Terra/Profiler---------------" + - "start - Startet den Profiler" + - "stop - Stoppt den Profiler" + - "query - Profiler-Daten anzeigen" + - "reset - Profiler-Daten zurücksetzen" + reset: "Profiler-Daten wurden zurückgesetzt." + start: "Der Profiler wurde gestartet." + stop: "Der Profiler wurde gestoppt." + structure: + main-menu: + - "---------------Terra/Strukturen---------------" + - "export - Exportiert deine aktuelle WorldEdit-Auswahl als Terra-Struktur." + - "load - Ladt eine Terra-Struktur." + invalid-radius: "Ungültiger Radius: \"%s\"" + invalid-rotation: "Ungültige Rotation: \"%s\"" + invalid: "Ungültige Strukturen-ID: \"%s\"" + export: "Struktur unter \"%s\" gespeichert." world-config: - loading: "Lade Weltkonfigurationswerte für Welt %s..." - not-found: "Weltkonfigurationswerte für Welt \"%s\" nicht gefunden. Lade Standardwerte." - using-image: "Lade Welt von Bild." - error: "Konfiguration für Welt %s kann nicht geladen werden!" - done: "Laden der Welt abgeschlossen. Ladedauer: %sms" + loading: "Lade Weltkonfigurationswerte für Welt %s..." + not-found: "Weltkonfigurationswerte für Welt \"%s\" nicht gefunden. Lade Standardwerte." + using-image: "Lade Welt von Bild." + error: "Konfiguration für Welt %s kann nicht geladen werden!" + done: "Laden der Welt abgeschlossen. Ladedauer: %sms" config-pack: loaded: "Konfiguration %1$s wurde in %2$sms geladen." config: diff --git a/src/main/resources/lang/en_us.yml b/src/main/resources/lang/en_us.yml index 0c0e052c3..a7e11c02b 100644 --- a/src/main/resources/lang/en_us.yml +++ b/src/main/resources/lang/en_us.yml @@ -5,88 +5,88 @@ enable: disable: - "Thank you for using Terra!" command: - debug-only: "This command must be used with debug mode enabled!" - player-only: "This command is for players only!" - invalid: "Invalid command. (Expected %1$s arguments, found %2$s)." - players-only: "Command is for players only." - world: "This command must be executed in a Terra world!" - reload: "Reloaded Terra config." - version: "This server is running Terra version \"%s\"" - main-menu: - - "--------------------Terra--------------------" - - "reload - Reload configuration data" - - "biome - Get current biome" - - "ore - Generate an ore vein at the location you are facing (For debugging)" - - "save-data - Save population data" - - "structure - Load and export structures" - - "profile - Profiler options" - - "image - Image/GUI options" - biome: - biome-found: "Located biome at (%1$s, %2$s)" - unable-to-locate: "Unable to locate biome." - invalid-radius: "Invalid radius: \"%s\"" - invalid: "Invalid Biome ID: \"%s\"" - in: "You are in \"%s\"" - ore: + debug-only: "This command must be used with debug mode enabled!" + player-only: "This command is for players only!" + invalid: "Invalid command. (Expected %1$s arguments, found %2$s)." + players-only: "Command is for players only." + world: "This command must be executed in a Terra world!" + reload: "Reloaded Terra config." + version: "This server is running Terra version \"%s\"" main-menu: - - "---------------Terra/ore---------------" - - "Generates a vein of ore at the block you are looking at." - out-of-range: "Block out of range" - invalid-ore: "Unable to find Ore \"%s\"" - geometry: - main-menu: - - "---------------Terra/geometry----------------" - - "Various voxel geometry debugging commands" - - "sphere - Generate a sphere" - - "deformsphere - Generate a deformed sphere" - - "tube - Generate a tube" - deform: - invalid-radius: "Invalid radius: \"%s\"" - invalid-deform: "Invalid deform: \"%s\"" - invalid-frequency: "Invalid frequency: \"%s\"" - sphere: - invalid-radius: "Invalid radius: \"%s\"" - tube: - invalid-radius: "Invalid radius: \"%s\"" - image: - main-menu: - - "---------------Terra/image---------------" - - "render - Render an image with a given width and height, that can later be imported as a world." - - "gui - Open debug GUI (Must be enabled in config)" - gui: - main-menu: - - "-------------Terra/image/gui-------------" - - "raw - Open GUI with raw Biome data" - - "step - Re-render data to show borders more clearly" + - "--------------------Terra--------------------" + - "reload - Reload configuration data" + - "biome - Get current biome" + - "ore - Generate an ore vein at the location you are facing (For debugging)" + - "save-data - Save population data" + - "structure - Load and export structures" + - "profile - Profiler options" + - "image - Image/GUI options" + biome: + biome-found: "Located biome at (%1$s, %2$s)" + unable-to-locate: "Unable to locate biome." + invalid-radius: "Invalid radius: \"%s\"" + invalid: "Invalid Biome ID: \"%s\"" + in: "You are in \"%s\"" + ore: + main-menu: + - "---------------Terra/ore---------------" + - "Generates a vein of ore at the block you are looking at." + out-of-range: "Block out of range" + invalid-ore: "Unable to find Ore \"%s\"" + geometry: + main-menu: + - "---------------Terra/geometry----------------" + - "Various voxel geometry debugging commands" + - "sphere - Generate a sphere" + - "deformsphere - Generate a deformed sphere" + - "tube - Generate a tube" + deform: + invalid-radius: "Invalid radius: \"%s\"" + invalid-deform: "Invalid deform: \"%s\"" + invalid-frequency: "Invalid frequency: \"%s\"" + sphere: + invalid-radius: "Invalid radius: \"%s\"" + tube: + invalid-radius: "Invalid radius: \"%s\"" + image: + main-menu: + - "---------------Terra/image---------------" + - "render - Render an image with a given width and height, that can later be imported as a world." + - "gui - Open debug GUI (Must be enabled in config)" + gui: + main-menu: + - "-------------Terra/image/gui-------------" + - "raw - Open GUI with raw Biome data" + - "step - Re-render data to show borders more clearly" debug: "Debug mode must be enabled to use the debug GUI! The debug GUI is NOT PRODUCTION SAFE!" render: save: "Saved image as \"%s\"" error: "An error occurred while generating the image!" profile: - main-menu: - - "---------------Terra/profile---------------" - - "start - Starts the profiler" - - "stop - Stops the profiler" - - "query - Fetches profiler data" - - "reset - Resets profiler data" - reset: "Profiler has been reset." - start: "Profiler has started." - stop: "Profiler has stopped." - structure: - main-menu: - - "---------------Terra/structure---------------" - - "export - Export your current WorldEdit selection as a Terra structure." - - "load - Load a Terra structure" - invalid-radius: "Invalid radius: \"%s\"" - invalid-rotation: "Invalid rotation: \"%s\"" - invalid: "Invalid Structure ID: \"%s\"" - export: "Saved structure to \"%s\"" + main-menu: + - "---------------Terra/profile---------------" + - "start - Starts the profiler" + - "stop - Stops the profiler" + - "query - Fetches profiler data" + - "reset - Resets profiler data" + reset: "Profiler has been reset." + start: "Profiler has started." + stop: "Profiler has stopped." + structure: + main-menu: + - "---------------Terra/structure---------------" + - "export - Export your current WorldEdit selection as a Terra structure." + - "load - Load a Terra structure" + invalid-radius: "Invalid radius: \"%s\"" + invalid-rotation: "Invalid rotation: \"%s\"" + invalid: "Invalid Structure ID: \"%s\"" + export: "Saved structure to \"%s\"" world-config: - loading: "Loading world configuration values for world %s..." - not-found: "Configuration for world \"%s\" not found. Copying default config." - using-image: "Loading world from image." - error: "Unable to load configuration for world %s" - done: "World load complete. Time elapsed: %sms" + loading: "Loading world configuration values for world %s..." + not-found: "Configuration for world \"%s\" not found. Copying default config." + using-image: "Loading world from image." + error: "Unable to load configuration for world %s" + done: "World load complete. Time elapsed: %sms" config-pack: loaded: "Loaded config %1$s in %2$sms." config: diff --git a/src/main/resources/lang/es.yml b/src/main/resources/lang/es.yml index 269c56b30..be7e74ecb 100644 --- a/src/main/resources/lang/es.yml +++ b/src/main/resources/lang/es.yml @@ -5,86 +5,86 @@ enable: disable: - "Gracias por usar Terra!" command: - player-only: "Este comando solo puede ser usado por jugadores!" - terra-world: "Este comando solo puede ser usado en un mundo Terra!" - invalid: "Comando invalido. (Expected %1$s arguments, found %2$s)." - players-only: "Este comando solo puede ser usado por jugadores" - world: "Este comando puede ejecutarse solo en un mundo terra!" - reload: "La configuración Terra ha sido recargada." - main-menu: - - "--------------------Terra--------------------" - - "reload - Recarga los datos de configuración del plugin." - - "biome - Obtienes información del bioma actual" - - "ore - Genera una mena de ore en el lugar que estes mirando.(For debugging)" - - "save-data - Guarda los datos actuales." - - "structure - Cargar o exportar estructuras." - - "profile - Opciones de perfil." - - "image - Opciones de imagen/GUI." - biome: - biome-found: "Bioma localizado en (%1$s, %2$s)" - unable-to-locate: "No se pudo localizar el bioma." - invalid-radius: "Radio invalido: \"%s\"" - invalid: "ID del bioma invalido: \"%s\"" - in: "Te encuentras en \"%s\"" - ore: + player-only: "Este comando solo puede ser usado por jugadores!" + terra-world: "Este comando solo puede ser usado en un mundo Terra!" + invalid: "Comando invalido. (Expected %1$s arguments, found %2$s)." + players-only: "Este comando solo puede ser usado por jugadores" + world: "Este comando puede ejecutarse solo en un mundo terra!" + reload: "La configuración Terra ha sido recargada." main-menu: - - "---------------Terra/ore---------------" - - "Generas una mena de ore en el bloque que te encuentres mirando." - out-of-range: "Bloque fuera de rango." - invalid-ore: "No se pudo encontrar el Ore \"%s\"" - geometry: - main-menu: - - "---------------Terra/geometry----------------" - - "Various voxel geometry debugging commands" - - "sphere - Generas un sphere" - - "deformsphere - Generas un sphere deformado" - - "tube - Generas un tube" - deform: - invalid-radius: "Radio invalido: \"%s\"" - invalid-deform: "Deform invalido: \"%s\"" - invalid-frequency: "Frequencia invalida: \"%s\"" - sphere: - invalid-radius: "Radio invalido: \"%s\"" - tube: - invalid-radius: "Radio invalido: \"%s\"" - image: - main-menu: - - "---------------Terra/image---------------" - - "render - Renderiza una imagen con alto y ancho, y este después podrá ser importado como un mundo." - - "gui - Abre el debug GUI.(Puede ser habilitado en la configuración)" - gui: - main-menu: - - "-------------Terra/image/gui-------------" - - "raw - Abre el GUI con la configuración del bioma sin procesar." - - "step - Vuelve a renderizar la configuración para mostrar los límites más claro." + - "--------------------Terra--------------------" + - "reload - Recarga los datos de configuración del plugin." + - "biome - Obtienes información del bioma actual" + - "ore - Genera una mena de ore en el lugar que estes mirando.(For debugging)" + - "save-data - Guarda los datos actuales." + - "structure - Cargar o exportar estructuras." + - "profile - Opciones de perfil." + - "image - Opciones de imagen/GUI." + biome: + biome-found: "Bioma localizado en (%1$s, %2$s)" + unable-to-locate: "No se pudo localizar el bioma." + invalid-radius: "Radio invalido: \"%s\"" + invalid: "ID del bioma invalido: \"%s\"" + in: "Te encuentras en \"%s\"" + ore: + main-menu: + - "---------------Terra/ore---------------" + - "Generas una mena de ore en el bloque que te encuentres mirando." + out-of-range: "Bloque fuera de rango." + invalid-ore: "No se pudo encontrar el Ore \"%s\"" + geometry: + main-menu: + - "---------------Terra/geometry----------------" + - "Various voxel geometry debugging commands" + - "sphere - Generas un sphere" + - "deformsphere - Generas un sphere deformado" + - "tube - Generas un tube" + deform: + invalid-radius: "Radio invalido: \"%s\"" + invalid-deform: "Deform invalido: \"%s\"" + invalid-frequency: "Frequencia invalida: \"%s\"" + sphere: + invalid-radius: "Radio invalido: \"%s\"" + tube: + invalid-radius: "Radio invalido: \"%s\"" + image: + main-menu: + - "---------------Terra/image---------------" + - "render - Renderiza una imagen con alto y ancho, y este después podrá ser importado como un mundo." + - "gui - Abre el debug GUI.(Puede ser habilitado en la configuración)" + gui: + main-menu: + - "-------------Terra/image/gui-------------" + - "raw - Abre el GUI con la configuración del bioma sin procesar." + - "step - Vuelve a renderizar la configuración para mostrar los límites más claro." debug: "El modo debug puede habilitarse para usar el debug GUI! LA CREACIÓN DEL DEBUG GUI NO PODRÍA SER SEGURA!" render: save: "Guarda una imagen como \"%s\"" error: "Un error ha ocurrido mientras se generaba la imagen!" profile: - main-menu: - - "---------------Terra/profile---------------" - - "start - Se incia la generación del Profiler." - - "stop - Se detiene la generación del Profiler." - - "query - Fetches profiler data" - - "reset - Reinicia la configuración del Profiler." - reset: "El Profiler ha sido reiniciado." - start: "El Profiler se ha iniciado." - stop: "El Profiler se ha detenido." - structure: - main-menu: - - "---------------Terra/structure---------------" - - "export - Exporta tus estructuras de Worldedit como estructuras Terra." - - "load - Carga una estructura Terra." - invalid-radius: "Radio invalido: \"%s\"" - invalid: "ID de la estructura es invalida: \"%s\"" - export: "Estructura guardada como \"%s\"" + main-menu: + - "---------------Terra/profile---------------" + - "start - Se incia la generación del Profiler." + - "stop - Se detiene la generación del Profiler." + - "query - Fetches profiler data" + - "reset - Reinicia la configuración del Profiler." + reset: "El Profiler ha sido reiniciado." + start: "El Profiler se ha iniciado." + stop: "El Profiler se ha detenido." + structure: + main-menu: + - "---------------Terra/structure---------------" + - "export - Exporta tus estructuras de Worldedit como estructuras Terra." + - "load - Carga una estructura Terra." + invalid-radius: "Radio invalido: \"%s\"" + invalid: "ID de la estructura es invalida: \"%s\"" + export: "Estructura guardada como \"%s\"" world-config: - loading: "Carga los parametros de configuración para el mundo %s..." - not-found: "La configuración para el mundo \"%s\" no se puede encontrar. Copiando la configuración por defecto." - using-image: "Carga el mundo a partir de una imagen." - error: "No se pudo cargar la configuración para el mundo %s" - done: "el mundo se ha cargado completamente. Tiempo transcurrido: %sms" + loading: "Carga los parametros de configuración para el mundo %s..." + not-found: "La configuración para el mundo \"%s\" no se puede encontrar. Copiando la configuración por defecto." + using-image: "Carga el mundo a partir de una imagen." + error: "No se pudo cargar la configuración para el mundo %s" + done: "el mundo se ha cargado completamente. Tiempo transcurrido: %sms" config-pack: loaded: "Configuración %1$s fue cargada en %2$sms." config: diff --git a/src/main/resources/lang/ja_jp.yml b/src/main/resources/lang/ja_jp.yml index 92c3ccd49..e9ab552e2 100644 --- a/src/main/resources/lang/ja_jp.yml +++ b/src/main/resources/lang/ja_jp.yml @@ -5,86 +5,86 @@ enable: disable: - "Terraをご利用いただきありがとうございます！" command: - player-only: "このコマンドはプレイヤー専用です！" - terra-world: "このコマンドはTerraのワールドで実行する必要があります!" - invalid: "無効なコマンド(期待される %1$s 引数、%2$s が見つかりました。)" - players-only: "コマンドはプレイヤー専用です。" - world: "このコマンドはTerraのワールドで実行する必要があります!" - reload: "Terraの設定を再読み込みしました。" - main-menu: - - "--------------------Terra--------------------" - - "reload - 設定データを再読み込み" - - "biome - 現在のバイオームを取得" - - "ore - 向いている場所に鉱石を生成する(デバッグ用)" - - "save-data - データを保存" - - "structure - ストラクチャーのロード及びエクスポート" - - "profile - プロファイラ オプション" - - "image - 画像/GUI オプション" - biome: - biome-found: "バイオームの座標 (%1$s, %2$s)" - unable-to-locate: "バイオームが見つけられません。" - invalid-radius: "無効な半径: \"%s\"" - invalid: "無効なバイオームID: \"%s\"" - in: "あなたは \"%s\" にいます。" - ore: + player-only: "このコマンドはプレイヤー専用です！" + terra-world: "このコマンドはTerraのワールドで実行する必要があります!" + invalid: "無効なコマンド(期待される %1$s 引数、%2$s が見つかりました。)" + players-only: "コマンドはプレイヤー専用です。" + world: "このコマンドはTerraのワールドで実行する必要があります!" + reload: "Terraの設定を再読み込みしました。" main-menu: - - "---------------Terra/ore---------------" - - "見ているブロックに鉱石を生成します。" - out-of-range: "範囲外のブロック" - invalid-ore: "鉱石 \"%s\" が見つかりません。" - geometry: - main-menu: - - "---------------Terra/geometry----------------" - - "様々なボクセルジオメトリのデバッグコマンド" - - "sphere - 球体を生成" - - "deformsphere - 変形した球体を生成" - - "tube - チューブを生成" - deform: - invalid-radius: "無効な半径: \"%s\"" - invalid-deform: "無効な変形: \"%s\"" - invalid-frequency: "無効な周波数: \"%s\"" - sphere: - invalid-radius: "無効な半径: \"%s\"" - tube: - invalid-radius: "無効な半径: \"%s\"" - image: - main-menu: - - "---------------Terra/image---------------" - - "render - 指定された幅と高さの画像をレンダリングします。" - - "gui - デバッグGUIを開く(設定で有効にする必要があります)" - gui: - main-menu: - - "-------------Terra/image/gui-------------" - - "raw - 生のBiomeデータを利用したGUIを開く" - - "step - 境界線をより明確に表示するためにデータを再レンダリング" + - "--------------------Terra--------------------" + - "reload - 設定データを再読み込み" + - "biome - 現在のバイオームを取得" + - "ore - 向いている場所に鉱石を生成する(デバッグ用)" + - "save-data - データを保存" + - "structure - ストラクチャーのロード及びエクスポート" + - "profile - プロファイラ オプション" + - "image - 画像/GUI オプション" + biome: + biome-found: "バイオームの座標 (%1$s, %2$s)" + unable-to-locate: "バイオームが見つけられません。" + invalid-radius: "無効な半径: \"%s\"" + invalid: "無効なバイオームID: \"%s\"" + in: "あなたは \"%s\" にいます。" + ore: + main-menu: + - "---------------Terra/ore---------------" + - "見ているブロックに鉱石を生成します。" + out-of-range: "範囲外のブロック" + invalid-ore: "鉱石 \"%s\" が見つかりません。" + geometry: + main-menu: + - "---------------Terra/geometry----------------" + - "様々なボクセルジオメトリのデバッグコマンド" + - "sphere - 球体を生成" + - "deformsphere - 変形した球体を生成" + - "tube - チューブを生成" + deform: + invalid-radius: "無効な半径: \"%s\"" + invalid-deform: "無効な変形: \"%s\"" + invalid-frequency: "無効な周波数: \"%s\"" + sphere: + invalid-radius: "無効な半径: \"%s\"" + tube: + invalid-radius: "無効な半径: \"%s\"" + image: + main-menu: + - "---------------Terra/image---------------" + - "render - 指定された幅と高さの画像をレンダリングします。" + - "gui - デバッグGUIを開く(設定で有効にする必要があります)" + gui: + main-menu: + - "-------------Terra/image/gui-------------" + - "raw - 生のBiomeデータを利用したGUIを開く" + - "step - 境界線をより明確に表示するためにデータを再レンダリング" debug: "デバッグGUIを使用するには、デバッグモードを有効にする必要があります。デバッグGUIは安全ではありません！" render: save: "\"%s\" として画像を保存" error: "画像生成中にエラーが発生しました！" profile: - main-menu: - - "---------------Terra/profile---------------" - - "start - プロファイラを起動" - - "stop - プロファイラを停止" - - "query - プロファイラデータを取得" - - "reset - プロファイラのデータをリセット" - reset: "プロファイラがリセットされました。" - start: "プロファイラが起動しました。" - stop: "プロファイラが停止しました。" - structure: - main-menu: - - "---------------Terra/structure---------------" - - "export - 現在のWorldEditの選択範囲をTerraストラクチャーとしてエクスポート" - - "load - Terraストラクチャーを読み込む" - invalid-radius: "無効な半径: \"%s\"" - invalid: "無効なストラクチャーID: \"%s\"" - export: "\"%s\" にストラクチャーを保存" + main-menu: + - "---------------Terra/profile---------------" + - "start - プロファイラを起動" + - "stop - プロファイラを停止" + - "query - プロファイラデータを取得" + - "reset - プロファイラのデータをリセット" + reset: "プロファイラがリセットされました。" + start: "プロファイラが起動しました。" + stop: "プロファイラが停止しました。" + structure: + main-menu: + - "---------------Terra/structure---------------" + - "export - 現在のWorldEditの選択範囲をTerraストラクチャーとしてエクスポート" + - "load - Terraストラクチャーを読み込む" + invalid-radius: "無効な半径: \"%s\"" + invalid: "無効なストラクチャーID: \"%s\"" + export: "\"%s\" にストラクチャーを保存" world-config: - loading: "ワールド %s のワールド設定を読込中..." - not-found: "ワールド \"%s\" の設定が見つかりませんでした。デフォルトの設定をコピーします。" - using-image: "画像からワールドを読み込みます。" - error: "ワールド %s の設定を読み込めませんでした" - done: "ワールドの読み込みが完了しました。経過時間: %sms" + loading: "ワールド %s のワールド設定を読込中..." + not-found: "ワールド \"%s\" の設定が見つかりませんでした。デフォルトの設定をコピーします。" + using-image: "画像からワールドを読み込みます。" + error: "ワールド %s の設定を読み込めませんでした" + done: "ワールドの読み込みが完了しました。経過時間: %sms" config-pack: loaded: "%2$sms で設定 %1$s が読み込まれました。" config: diff --git a/src/main/resources/lang/pl.yml b/src/main/resources/lang/pl.yml index 245ac7014..9033470d6 100644 --- a/src/main/resources/lang/pl.yml +++ b/src/main/resources/lang/pl.yml @@ -5,88 +5,88 @@ enable: disable: - "Dziekuje za korzystanie z Terra!" command: - debug-only: "Ta komenda musi byc uzyta z trybem debugowym wlaczonym!" - player-only: "Ta komenda jest tylko dla graczy!" - invalid: "Niepoprawna komenda. (Oczekiwane %1$s argumenty, znalezione %2$s)." - players-only: "Komenda jest tylko dla graczy." - world: "Ta komenda musi byc wpisana w swiecie Terra!" - reload: "Przeladowano plik konfiguracyjny Terra." - version: "Ten serwer korzysta z wersji Terra \"%s\"" - main-menu: - - "--------------------Terra--------------------" - - "reload - Przeladuj dane konfiguracyjne" - - "biome - Otrzymaj informacje o obecnym biomie" - - "ore - Wygeneruj zloze rud w strone w ktora patrzysz (Do debugowania)" - - "save-data - Zapisz dane" - - "structure - Zaladuj i wyeksportuj dane struktur" - - "profile - Opcje profilera" - - "image - Opcje obrazu/GUI" - biome: - biome-found: "Zlokalizowano biom na (%1$s, %2$s)" - unable-to-locate: "Nie moglismy zlokalizowac biomu." - invalid-radius: "Niepoprawny zakres: \"%s\"" - invalid: "Niepoprawne Biome ID: \"%s\"" - in: "Jestes na \"%s\"" - ore: + debug-only: "Ta komenda musi byc uzyta z trybem debugowym wlaczonym!" + player-only: "Ta komenda jest tylko dla graczy!" + invalid: "Niepoprawna komenda. (Oczekiwane %1$s argumenty, znalezione %2$s)." + players-only: "Komenda jest tylko dla graczy." + world: "Ta komenda musi byc wpisana w swiecie Terra!" + reload: "Przeladowano plik konfiguracyjny Terra." + version: "Ten serwer korzysta z wersji Terra \"%s\"" main-menu: - - "---------------Terra/rudy---------------" - - "Generuje zloze rud w strone w ktora patrzysz." - out-of-range: "Blok spoza zakresu" - invalid-ore: "Niemoglismy znalezc Rudy \"%s\"" - geometry: - main-menu: - - "---------------Terra/geometria----------------" - - "Zroznicowane komendy geometrii voxeli do debugowania" - - "sphere - Generuje kule" - - "deformsphere - Generuje zdeformowana kul" - - "tube - Generaje tube" - deform: - invalid-radius: "Niepoprawny zakres: \"%s\"" - invalid-deform: "Niepoprawna deformacja: \"%s\"" - invalid-frequency: "Niepoprawna czestotliwosc: \"%s\"" - sphere: - invalid-radius: "Niepoprawny zakres: \"%s\"" - tube: - invalid-radius: "Niepoprawny zakres: \"%s\"" - image: - main-menu: - - "---------------Terra/obraz---------------" - - "render - Renderuje obraz o podanej szerokosci i wysokosci, moze byc potem zaimportowane jako swiat." - - "gui - Otwiera GUI debugowania (Musi byc wlaczone w pliku konfiguracyjnym)" - gui: - main-menu: - - "-------------Terra/obraz/gui-------------" - - "raw - Otwiera GUI z surowymi danymi Biomu" - - "step - Przerenderowuje dane aby pokazac granice bardziej przejrzyscie" + - "--------------------Terra--------------------" + - "reload - Przeladuj dane konfiguracyjne" + - "biome - Otrzymaj informacje o obecnym biomie" + - "ore - Wygeneruj zloze rud w strone w ktora patrzysz (Do debugowania)" + - "save-data - Zapisz dane" + - "structure - Zaladuj i wyeksportuj dane struktur" + - "profile - Opcje profilera" + - "image - Opcje obrazu/GUI" + biome: + biome-found: "Zlokalizowano biom na (%1$s, %2$s)" + unable-to-locate: "Nie moglismy zlokalizowac biomu." + invalid-radius: "Niepoprawny zakres: \"%s\"" + invalid: "Niepoprawne Biome ID: \"%s\"" + in: "Jestes na \"%s\"" + ore: + main-menu: + - "---------------Terra/rudy---------------" + - "Generuje zloze rud w strone w ktora patrzysz." + out-of-range: "Blok spoza zakresu" + invalid-ore: "Niemoglismy znalezc Rudy \"%s\"" + geometry: + main-menu: + - "---------------Terra/geometria----------------" + - "Zroznicowane komendy geometrii voxeli do debugowania" + - "sphere - Generuje kule" + - "deformsphere - Generuje zdeformowana kul" + - "tube - Generaje tube" + deform: + invalid-radius: "Niepoprawny zakres: \"%s\"" + invalid-deform: "Niepoprawna deformacja: \"%s\"" + invalid-frequency: "Niepoprawna czestotliwosc: \"%s\"" + sphere: + invalid-radius: "Niepoprawny zakres: \"%s\"" + tube: + invalid-radius: "Niepoprawny zakres: \"%s\"" + image: + main-menu: + - "---------------Terra/obraz---------------" + - "render - Renderuje obraz o podanej szerokosci i wysokosci, moze byc potem zaimportowane jako swiat." + - "gui - Otwiera GUI debugowania (Musi byc wlaczone w pliku konfiguracyjnym)" + gui: + main-menu: + - "-------------Terra/obraz/gui-------------" + - "raw - Otwiera GUI z surowymi danymi Biomu" + - "step - Przerenderowuje dane aby pokazac granice bardziej przejrzyscie" debug: "Tryb debugowania musi byc wlaczony aby debugowac za pomoca GUI! GUI debugowania NIE JEST STABILNE!" render: save: "Zapisano obraz jako \"%s\"" error: "Wystapil error podczas generowania obrazu!" profile: - main-menu: - - "---------------Terra/profil---------------" - - "start - Rozpoczyna dzialanie profilera" - - "stop - Zatrzymuje dzialanie profilera" - - "query - Wydobywa dane profilera" - - "reset - Resetuje dane profilera" - reset: "Profiler zostal zresetowany." - start: "Profiler zostal wlaczony." - stop: "Profiler zostal wylaczony." - structure: - main-menu: - - "---------------Terra/struktury---------------" - - "export - Wyeksportuj obecne zaznaczenie w WorldEdicie jako strukture Terra." - - "load - Zaladuj strukture Terra" - invalid-radius: "Niepoprawny zakres: \"%s\"" - invalid-rotation: "Niepoprawny zakres: \"%s\"" - invalid: "Niepoprawne ID Struktury: \"%s\"" - export: "Zapisano strukture jak \"%s\"" + main-menu: + - "---------------Terra/profil---------------" + - "start - Rozpoczyna dzialanie profilera" + - "stop - Zatrzymuje dzialanie profilera" + - "query - Wydobywa dane profilera" + - "reset - Resetuje dane profilera" + reset: "Profiler zostal zresetowany." + start: "Profiler zostal wlaczony." + stop: "Profiler zostal wylaczony." + structure: + main-menu: + - "---------------Terra/struktury---------------" + - "export - Wyeksportuj obecne zaznaczenie w WorldEdicie jako strukture Terra." + - "load - Zaladuj strukture Terra" + invalid-radius: "Niepoprawny zakres: \"%s\"" + invalid-rotation: "Niepoprawny zakres: \"%s\"" + invalid: "Niepoprawne ID Struktury: \"%s\"" + export: "Zapisano strukture jak \"%s\"" world-config: - loading: "Ladowanie wartosci konfiguracji dla swiata %s..." - not-found: "Konfiguracja dla swiata \"%s\" nie zostala znaleziona. Kopiuje domyslny plik konfiguracyjny." - using-image: "Ladowania swiata z obrazu." - error: "Nie udalo sie zaladowac konfiguracji dla swiata %s" - done: "Ladowanie swiata gotowe. Wykonano to w: %sms" + loading: "Ladowanie wartosci konfiguracji dla swiata %s..." + not-found: "Konfiguracja dla swiata \"%s\" nie zostala znaleziona. Kopiuje domyslny plik konfiguracyjny." + using-image: "Ladowania swiata z obrazu." + error: "Nie udalo sie zaladowac konfiguracji dla swiata %s" + done: "Ladowanie swiata gotowe. Wykonano to w: %sms" config-pack: loaded: "Zaladowano plik konfiguracyjny %1$s w %2$sms." config: diff --git a/src/main/resources/lang/zh_cn.yml b/src/main/resources/lang/zh_cn.yml index 6eb215fb3..e44659b9b 100644 --- a/src/main/resources/lang/zh_cn.yml +++ b/src/main/resources/lang/zh_cn.yml @@ -5,86 +5,86 @@ enable: disable: - "感谢使用Terra！" command: - player-only: "该指令只能由玩家使用！" - terra-world: "该指令只能在Terra世界内使用！" - invalid: "无效的指令。(应有%1$s项参数，现在只有%2$s项)。" - players-only: "指令只能由玩家使用。" - world: "该指令只能在Terra世界内使用！" - reload: "重载Terra配置。" - main-menu: - - "--------------------Terra--------------------" - - "reload - 重载配置数据" - - "biome - 查看所在群系" - - "ore - 在你面朝的位置生成矿脉(用于调试)" - - "save-data - 保存数据" - - "structure - 加载和导出建筑" - - "profile - 分析工具选项" - - "image - 图像/GUI 选项" - biome: - biome-found: "群系位于(%1$s, %2$s)" - unable-to-locate: "无法定位群系。" - invalid-radius: "无效范围：\"%s\"" - invalid: "无效的群系ID: \"%s\"" - in: "你位于\"%s\"" - ore: + player-only: "该指令只能由玩家使用！" + terra-world: "该指令只能在Terra世界内使用！" + invalid: "无效的指令。(应有%1$s项参数，现在只有%2$s项)。" + players-only: "指令只能由玩家使用。" + world: "该指令只能在Terra世界内使用！" + reload: "重载Terra配置。" main-menu: - - "---------------Terra/矿物---------------" - - "在你所视位置生成矿脉。" - out-of-range: "所视方块超出范围" - invalid-ore: "找不到矿物 \"%s\"" - geometry: - main-menu: - - "---------------Terra/几何----------------" - - "各种几何调试指令" - - "sphere - 生成球体" - - "deformsphere - 生成变形球体" - - "tube - 生成管形" - deform: - invalid-radius: "无效范围：\"%s\"" - invalid-deform: "无效变形：\"%s\"" - invalid-frequency: "无效频率：\"%s\"" - sphere: - invalid-radius: "无效范围：\"%s\"" - tube: - invalid-radius: "无效范围：\"%s\"" - image: - main-menu: - - "---------------Terra/图像---------------" - - "render - 根据给定宽度和高度渲染图像，以便于之后导入到世界内。" - - "gui - 打开调试GUI (必须先在配置内启用)" - gui: - main-menu: - - "-------------Terra/图像/GUI-------------" - - "raw - 打开纯群系数据的GUI" - - "step - 重渲染数据以更清晰地显示边界" + - "--------------------Terra--------------------" + - "reload - 重载配置数据" + - "biome - 查看所在群系" + - "ore - 在你面朝的位置生成矿脉(用于调试)" + - "save-data - 保存数据" + - "structure - 加载和导出建筑" + - "profile - 分析工具选项" + - "image - 图像/GUI 选项" + biome: + biome-found: "群系位于(%1$s, %2$s)" + unable-to-locate: "无法定位群系。" + invalid-radius: "无效范围：\"%s\"" + invalid: "无效的群系ID: \"%s\"" + in: "你位于\"%s\"" + ore: + main-menu: + - "---------------Terra/矿物---------------" + - "在你所视位置生成矿脉。" + out-of-range: "所视方块超出范围" + invalid-ore: "找不到矿物 \"%s\"" + geometry: + main-menu: + - "---------------Terra/几何----------------" + - "各种几何调试指令" + - "sphere - 生成球体" + - "deformsphere - 生成变形球体" + - "tube - 生成管形" + deform: + invalid-radius: "无效范围：\"%s\"" + invalid-deform: "无效变形：\"%s\"" + invalid-frequency: "无效频率：\"%s\"" + sphere: + invalid-radius: "无效范围：\"%s\"" + tube: + invalid-radius: "无效范围：\"%s\"" + image: + main-menu: + - "---------------Terra/图像---------------" + - "render - 根据给定宽度和高度渲染图像，以便于之后导入到世界内。" + - "gui - 打开调试GUI (必须先在配置内启用)" + gui: + main-menu: + - "-------------Terra/图像/GUI-------------" + - "raw - 打开纯群系数据的GUI" + - "step - 重渲染数据以更清晰地显示边界" debug: "必须先启用调试模式才能使用GUI！调试GUI不适合在运行中的服务器里使用！" render: save: "已将图像保存为\"%s\"" error: "生成图像时出错！" profile: - main-menu: - - "---------------Terra/分析---------------" - - "start - 启动分析工具" - - "stop - 关闭分析工具" - - "query - 获取分析数据" - - "reset - 重置分析数据" - reset: "分析工具已重置。" - start: "分析工具已启动。" - stop: "分析工具已关闭。" - structure: - main-menu: - - "---------------Terra/建筑---------------" - - "export - 导出你当前的WorldEdit选区为Terra的建筑。" - - "load - 加载Terra的建筑。" - invalid-radius: "无效范围：\"%s\"" - invalid: "无效建筑ID：\"%s\"" - export: "已将建筑保存为\"%s\"" + main-menu: + - "---------------Terra/分析---------------" + - "start - 启动分析工具" + - "stop - 关闭分析工具" + - "query - 获取分析数据" + - "reset - 重置分析数据" + reset: "分析工具已重置。" + start: "分析工具已启动。" + stop: "分析工具已关闭。" + structure: + main-menu: + - "---------------Terra/建筑---------------" + - "export - 导出你当前的WorldEdit选区为Terra的建筑。" + - "load - 加载Terra的建筑。" + invalid-radius: "无效范围：\"%s\"" + invalid: "无效建筑ID：\"%s\"" + export: "已将建筑保存为\"%s\"" world-config: - loading: "正在加载世界%s配置数值……" - not-found: "找不到世界\"%s\"的配置。正应用默认配置。" - using-image: "加载图像中" - error: "无法加载世界%s的配置" - done: "加载世界完成。耗时：%sms" + loading: "正在加载世界%s配置数值……" + not-found: "找不到世界\"%s\"的配置。正应用默认配置。" + using-image: "加载图像中" + error: "无法加载世界%s的配置" + done: "加载世界完成。耗时：%sms" config-pack: loaded: "已加载配置%1$s，耗时%2$sms。" config: diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index ff9a48d83..d43fcc691 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -1,17 +1,17 @@ -name: "Terra" +name: "Terra" depend: [ "Gaea" ] -main: "com.dfsek.terra.Terra" -version: "1.1.1-BETA" -load: "STARTUP" +main: "com.dfsek.terra.Terra" +version: "1.1.1-BETA" +load: "STARTUP" api-version: "1.16" softdepend: [ "WorldEdit" ] commands: - terra: - description: "Terra base command" - usage: "/terra " - aliases: [ "te" ] - permission: "terra.command" - locate: - description: "Locate a Terra Structure" - usage: "/locate " - permission: "terra.locate" \ No newline at end of file + terra: + description: "Terra base command" + usage: "/terra " + aliases: [ "te" ] + permission: "terra.command" + locate: + description: "Locate a Terra Structure" + usage: "/locate " + permission: "terra.locate" \ No newline at end of file