From eb3ff1bc83cab9a69cef1d2b7b687f9518afec6c Mon Sep 17 00:00:00 2001 From: dfsek Date: Sun, 25 Oct 2020 15:31:38 -0700 Subject: [PATCH] Clean up default config --- .../dfsek/terra/config/base/WorldConfig.java | 2 +- .../abstract/biomes/beach_abstract.yml | 2 +- .../abstract/biomes/deep_ocean_abstract.yml | 2 +- .../abstract/biomes/ocean_abstract.yml | 2 +- .../abstract/biomes/shelf_ocean_abstract.yml | 2 +- .../default-config/biomes/beach/beach.yml | 1 - .../biomes/beach/beach_cold.yml | 3 +- .../biomes/beach/beach_frozen.yml | 2 +- .../biomes/beach/beach_warm.yml | 3 +- .../default-config/biomes/desert.yml | 3 +- .../biomes/forest/birch_forest.yml | 3 +- .../biomes/forest/dark_forest.yml | 3 +- .../default-config/biomes/forest/jungle.yml | 3 +- .../biomes/forest/oak_forest.yml | 3 +- .../default-config/biomes/forest/savanna.yml | 3 +- .../biomes/forest/snowy_taiga.yml | 2 +- .../default-config/biomes/forest/taiga.yml | 3 +- .../resources/default-config/biomes/mesa.yml | 3 +- .../biomes/mountain/arid_mountains.yml | 2 +- .../mountain/arid_mountains_border_0.yml | 2 +- .../mountain/arid_mountains_border_1.yml | 2 +- .../biomes/mountain/mountains_jungle.yml | 2 +- .../mountain/mountains_jungle_border_0.yml | 2 +- .../mountain/mountains_jungle_border_1.yml | 2 +- .../biomes/mountain/mountains_pretty.yml | 2 +- .../mountain/mountains_pretty_border_0.yml | 2 +- .../mountain/mountains_pretty_border_1.yml | 2 +- .../biomes/mountain/mountains_stone.yml | 2 +- .../mountain/mountains_stone_border_0.yml | 2 +- .../mountain/mountains_stone_border_1.yml | 2 +- .../default-config/biomes/mountains.yml | 3 +- .../default-config/biomes/ocean/ocean.yml | 1 - .../biomes/ocean/ocean_cold.yml | 3 +- .../biomes/ocean/ocean_frozen.yml | 3 +- .../biomes/ocean/ocean_lukewarm.yml | 3 +- .../biomes/ocean/ocean_warm.yml | 3 +- .../biomes/ocean_deep/ocean_cold.yml | 2 +- .../biomes/ocean_deep/ocean_frozen.yml | 2 +- .../biomes/ocean_deep/ocean_lukewarm.yml | 2 +- .../biomes/ocean_deep/ocean_warm.yml | 2 +- .../biomes/ocean_shelf/ocean_cold.yml | 2 +- .../biomes/ocean_shelf/ocean_frozen.yml | 2 +- .../biomes/ocean_shelf/ocean_lukewarm.yml | 2 +- .../biomes/ocean_shelf/ocean_warm.yml | 2 +- .../default-config/biomes/plains.yml | 2 +- .../default-config/biomes/plains_islands.yml | 43 ------------------- .../resources/default-config/biomes/river.yml | 3 +- .../resources/default-config/biomes/swamp.yml | 3 +- .../default-config/biomes/tundra.yml | 3 +- .../default-config/carving/cavern.yml | 2 +- .../default-config/carving/ravine.yml | 2 +- .../resources/default-config/flora/button.yml | 3 +- .../default-config/flora/caves/stalactite.yml | 2 +- .../default-config/flora/caves/stalagmite.yml | 2 +- .../default-config/flora/kelp/kelp_mid.yml | 3 +- .../default-config/flora/kelp/kelp_short.yml | 3 +- .../default-config/flora/kelp/kelp_tall.yml | 3 +- .../resources/default-config/flora/leaves.yml | 3 +- .../resources/default-config/flora/root.yml | 3 +- .../default-config/flora/seagrass.yml | 3 +- .../default-config/flora/tall_seagrass.yml | 3 +- .../resources/default-config/grids/beach.yml | 2 +- .../resources/default-config/grids/land.yml | 2 +- .../default-config/grids/mountain.yml | 2 +- .../grids/mountain_border_flat.yml | 2 +- .../grids/mountain_border_mid.yml | 2 +- .../resources/default-config/grids/ocean.yml | 2 +- .../default-config/grids/ocean_deep.yml | 2 +- .../default-config/grids/ocean_shelf.yml | 2 +- .../ores/deposits/andesite_pocket.yml | 2 +- .../ores/deposits/diorite_pocket.yml | 2 +- .../ores/deposits/dirt_pocket.yml | 2 +- .../ores/deposits/granite_pocket.yml | 2 +- .../ores/deposits/gravel_pocket.yml | 2 +- .../default-config/ores/minerals/coal.yml | 2 +- .../default-config/ores/minerals/diamond.yml | 2 +- .../default-config/ores/minerals/gold.yml | 2 +- .../default-config/ores/minerals/iron.yml | 2 +- .../default-config/ores/minerals/lapis.yml | 2 +- .../default-config/ores/minerals/redstone.yml | 2 +- src/main/resources/default-config/pack.yml | 5 --- .../palettes/bedrock/bedrock.yml | 6 --- .../palettes/bedrock/bedrock_half.yml | 3 +- .../palettes/bedrock/bedrock_little.yml | 3 +- .../palettes/bedrock/bedrock_most.yml | 3 +- .../default-config/palettes/cold_ocean.yml | 2 +- .../default-config/palettes/desert/desert.yml | 1 - .../palettes/desert/red_desert.yml | 3 +- .../default-config/palettes/grassy.yml | 2 +- .../default-config/palettes/gravelly.yml | 3 +- .../palettes/mountains/arid.yml | 2 +- .../palettes/mountains/grass.yml | 2 +- .../palettes/mountains/jungle.yml | 2 +- .../palettes/mountains/pretty_mountains.yml | 2 +- .../palettes/mountains/stone.yml | 2 +- .../palettes/mountains/stone_grass.yml | 2 +- .../default-config/palettes/oceanfloor.yml | 3 +- .../default-config/palettes/river_bottom.yml | 2 +- .../default-config/palettes/river_shore.yml | 3 +- .../default-config/palettes/sand_all.yml | 3 +- .../default-config/palettes/sandy.yml | 3 +- .../palettes/slabs/mountainslabs.yml | 3 +- .../palettes/slabs/mountainstairs.yml | 3 +- .../default-config/palettes/slabs/snow.yml | 3 +- .../default-config/palettes/snow.yml | 3 +- .../default-config/palettes/swamp.yml | 3 +- .../default-config/palettes/swamp_border.yml | 27 ------------ .../default-config/palettes/swamp_bottom.yml | 3 +- .../default-config/palettes/taiga.yml | 3 +- .../default-config/palettes/tundra.yml | 3 +- src/main/resources/plugin.yml | 2 +- 111 files changed, 104 insertions(+), 231 deletions(-) delete mode 100644 src/main/resources/default-config/biomes/plains_islands.yml delete mode 100644 src/main/resources/default-config/palettes/bedrock/bedrock.yml delete mode 100644 src/main/resources/default-config/palettes/swamp_border.yml 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 9fb25bcbb..7e29aa084 100644 --- a/src/main/java/com/dfsek/terra/config/base/WorldConfig.java +++ b/src/main/java/com/dfsek/terra/config/base/WorldConfig.java @@ -65,7 +65,7 @@ public class WorldConfig { tConfig = ConfigPack.fromID(configID); - if(tConfig == null) throw new ConfigException("No such config pack: \"" + configID + "\"", worldID); + 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 { 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 3c05223dd..03106c46c 100644 --- a/src/main/resources/default-config/abstract/biomes/beach_abstract.yml +++ b/src/main/resources/default-config/abstract/biomes/beach_abstract.yml @@ -3,7 +3,7 @@ id: "BEACH_ABSTRACT" palette: - - BEDROCK: 0 + - "BLOCK:minecraft:bedrock": 0 - BEDROCK_MOST: 1 - BEDROCK_HALF: 2 - BEDROCK_LITTLE: 3 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 b00c3f9ef..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 @@ -3,7 +3,7 @@ id: "DEEP_OCEAN_ABSTRACT" palette: - - BEDROCK: 0 + - "BLOCK:minecraft:bedrock": 0 - BEDROCK_MOST: 1 - BEDROCK_HALF: 2 - BEDROCK_LITTLE: 3 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 400205f4d..08c9951b9 100644 --- a/src/main/resources/default-config/abstract/biomes/ocean_abstract.yml +++ b/src/main/resources/default-config/abstract/biomes/ocean_abstract.yml @@ -3,7 +3,7 @@ id: "OCEAN_ABSTRACT" palette: - - BEDROCK: 0 + - "BLOCK:minecraft:bedrock": 0 - BEDROCK_MOST: 1 - BEDROCK_HALF: 2 - BEDROCK_LITTLE: 3 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 910291f51..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 @@ -5,7 +5,7 @@ structures: - STRONGHOLD palette: - - BEDROCK: 0 + - "BLOCK:minecraft:bedrock": 0 - BEDROCK_MOST: 1 - BEDROCK_HALF: 2 - BEDROCK_LITTLE: 3 diff --git a/src/main/resources/default-config/biomes/beach/beach.yml b/src/main/resources/default-config/biomes/beach/beach.yml index ad831a055..99ad276d7 100644 --- a/src/main/resources/default-config/biomes/beach/beach.yml +++ b/src/main/resources/default-config/biomes/beach/beach.yml @@ -1,5 +1,4 @@ extends: "BEACH_ABSTRACT" id: "BEACH" -name: "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 238d1e260..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,8 +1,7 @@ extends: "BEACH_ABSTRACT" id: "COLD_BEACH" -name: "Cold Beach" palette: - - BEDROCK: 0 + - "BLOCK:minecraft:bedrock": 0 - BEDROCK_MOST: 1 - BEDROCK_HALF: 2 - BEDROCK_LITTLE: 3 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 bc5defbbc..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,7 +1,7 @@ extends: "BEACH_ABSTRACT" id: "FROZEN_BEACH" palette: - - BEDROCK: 0 + - "BLOCK:minecraft:bedrock": 0 - BEDROCK_MOST: 1 - BEDROCK_HALF: 2 - BEDROCK_LITTLE: 3 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 14f490b64..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,11 +1,10 @@ extends: "BEACH_ABSTRACT" id: "WARM_BEACH" -name: "Warm Beach" vanilla: BEACH erodible: true palette: - - BEDROCK: 0 + - "BLOCK:minecraft:bedrock": 0 - BEDROCK_MOST: 1 - BEDROCK_HALF: 2 - BEDROCK_LITTLE: 3 diff --git a/src/main/resources/default-config/biomes/desert.yml b/src/main/resources/default-config/biomes/desert.yml index 6ce18283a..8418c9d21 100644 --- a/src/main/resources/default-config/biomes/desert.yml +++ b/src/main/resources/default-config/biomes/desert.yml @@ -1,9 +1,8 @@ extends: "PLAINS_ABSTRACT" id: "DESERT" -name: "Desert" palette: - - BEDROCK: 0 + - "BLOCK:minecraft:bedrock": 0 - BEDROCK_MOST: 1 - BEDROCK_HALF: 2 - BEDROCK_LITTLE: 3 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 093c8127f..c6d34cba4 100644 --- a/src/main/resources/default-config/biomes/forest/birch_forest.yml +++ b/src/main/resources/default-config/biomes/forest/birch_forest.yml @@ -1,10 +1,9 @@ noise-equation: "((-((y / 63)^2)) + 1) + ((noise2(x, z)+0.5) / 3)" extends: "BASIC_ORES" id: "BIRCH_FOREST" -name: "Birch Forest" palette: - - BEDROCK: 0 + - "BLOCK:minecraft:bedrock": 0 - BEDROCK_MOST: 1 - BEDROCK_HALF: 2 - BEDROCK_LITTLE: 3 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 52363700d..eaf40f8a3 100644 --- a/src/main/resources/default-config/biomes/forest/dark_forest.yml +++ b/src/main/resources/default-config/biomes/forest/dark_forest.yml @@ -1,13 +1,12 @@ noise-equation: "((-((y / 63)^2)) + 1) + ((noise2(x, z)+0.5) / 3)" extends: "BASIC_ORES" id: "DARK_FOREST" -name: "Birch Forest" structures: - MANSION - STRONGHOLD palette: - - BEDROCK: 0 + - "BLOCK:minecraft:bedrock": 0 - BEDROCK_MOST: 1 - BEDROCK_HALF: 2 - BEDROCK_LITTLE: 3 diff --git a/src/main/resources/default-config/biomes/forest/jungle.yml b/src/main/resources/default-config/biomes/forest/jungle.yml index 446c15b9d..ec17219ff 100644 --- a/src/main/resources/default-config/biomes/forest/jungle.yml +++ b/src/main/resources/default-config/biomes/forest/jungle.yml @@ -1,10 +1,9 @@ noise-equation: "((-((y / 63)^2)) + 1) + ((noise2(x, z)+0.25) / 3)" extends: "BASIC_ORES" id: "JUNGLE" -name: "Jungle" palette: - - BEDROCK: 0 + - "BLOCK:minecraft:bedrock": 0 - BEDROCK_MOST: 1 - BEDROCK_HALF: 2 - BEDROCK_LITTLE: 3 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 24cea814c..6362a7d6a 100644 --- a/src/main/resources/default-config/biomes/forest/oak_forest.yml +++ b/src/main/resources/default-config/biomes/forest/oak_forest.yml @@ -1,10 +1,9 @@ noise-equation: "((-((y / 63)^2)) + 1) + ((noise2(x, z)+0.5) / 2)" extends: "BASIC_ORES" id: "FOREST" -name: "Oak Forest" palette: - - BEDROCK: 0 + - "BLOCK:minecraft:bedrock": 0 - BEDROCK_MOST: 1 - BEDROCK_HALF: 2 - BEDROCK_LITTLE: 3 diff --git a/src/main/resources/default-config/biomes/forest/savanna.yml b/src/main/resources/default-config/biomes/forest/savanna.yml index 94741ac42..86406c443 100644 --- a/src/main/resources/default-config/biomes/forest/savanna.yml +++ b/src/main/resources/default-config/biomes/forest/savanna.yml @@ -1,10 +1,9 @@ noise-equation: "((-((y / 63)^2)) + 1) + ((noise2(x, z)+0.5) / 3)" extends: "BASIC_ORES" id: "SAVANNA" -name: "Savanna" palette: - - BEDROCK: 0 + - "BLOCK:minecraft:bedrock": 0 - BEDROCK_MOST: 1 - BEDROCK_HALF: 2 - BEDROCK_LITTLE: 3 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 2c201d3c2..7d6164ea3 100644 --- a/src/main/resources/default-config/biomes/forest/snowy_taiga.yml +++ b/src/main/resources/default-config/biomes/forest/snowy_taiga.yml @@ -5,7 +5,7 @@ erodible: true palette: - - BEDROCK: 0 + - "BLOCK:minecraft:bedrock": 0 - BEDROCK_MOST: 1 - BEDROCK_HALF: 2 - BEDROCK_LITTLE: 3 diff --git a/src/main/resources/default-config/biomes/forest/taiga.yml b/src/main/resources/default-config/biomes/forest/taiga.yml index 0b018c30f..22f9c91d5 100644 --- a/src/main/resources/default-config/biomes/forest/taiga.yml +++ b/src/main/resources/default-config/biomes/forest/taiga.yml @@ -1,10 +1,9 @@ noise-equation: "((-((y / 63)^2)) + 1) + ((noise2(x, z)+0.5) / 2)" extends: "BASIC_ORES" id: "TAIGA" -name: "Taiga Forest" palette: - - BEDROCK: 0 + - "BLOCK:minecraft:bedrock": 0 - BEDROCK_MOST: 1 - BEDROCK_HALF: 2 - BEDROCK_LITTLE: 3 diff --git a/src/main/resources/default-config/biomes/mesa.yml b/src/main/resources/default-config/biomes/mesa.yml index 78c19b8fe..1832099f1 100644 --- a/src/main/resources/default-config/biomes/mesa.yml +++ b/src/main/resources/default-config/biomes/mesa.yml @@ -1,10 +1,9 @@ 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" -name: "Mesa" palette: - - BEDROCK: 0 + - "BLOCK:minecraft:bedrock": 0 - BEDROCK_MOST: 1 - BEDROCK_HALF: 2 - BEDROCK_LITTLE: 3 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 625842899..0e941cb15 100644 --- a/src/main/resources/default-config/biomes/mountain/arid_mountains.yml +++ b/src/main/resources/default-config/biomes/mountain/arid_mountains.yml @@ -5,7 +5,7 @@ extends: "BASIC_ORES" palette: - - BEDROCK: 0 + - "BLOCK:minecraft:bedrock": 0 - BEDROCK_MOST: 1 - BEDROCK_HALF: 2 - BEDROCK_LITTLE: 3 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 865f5efeb..647ceeffa 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 @@ -5,7 +5,7 @@ extends: "BASIC_ORES" palette: - - BEDROCK: 0 + - "BLOCK:minecraft:bedrock": 0 - BEDROCK_MOST: 1 - BEDROCK_HALF: 2 - BEDROCK_LITTLE: 3 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 0572891c9..78e95c034 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 @@ -5,7 +5,7 @@ extends: "BASIC_ORES" palette: - - BEDROCK: 0 + - "BLOCK:minecraft:bedrock": 0 - BEDROCK_MOST: 1 - BEDROCK_HALF: 2 - BEDROCK_LITTLE: 3 diff --git a/src/main/resources/default-config/biomes/mountain/mountains_jungle.yml b/src/main/resources/default-config/biomes/mountain/mountains_jungle.yml index 02c089d6c..ec58caf08 100644 --- a/src/main/resources/default-config/biomes/mountain/mountains_jungle.yml +++ b/src/main/resources/default-config/biomes/mountain/mountains_jungle.yml @@ -2,7 +2,7 @@ extends: "MOUNTAINS_PRETTY" id: "MOUNTAINS_JUNGLE" palette: - - BEDROCK: 0 + - "BLOCK:minecraft:bedrock": 0 - BEDROCK_MOST: 1 - BEDROCK_HALF: 2 - BEDROCK_LITTLE: 3 diff --git a/src/main/resources/default-config/biomes/mountain/mountains_jungle_border_0.yml b/src/main/resources/default-config/biomes/mountain/mountains_jungle_border_0.yml index 05df0b2d4..a18b629c5 100644 --- a/src/main/resources/default-config/biomes/mountain/mountains_jungle_border_0.yml +++ b/src/main/resources/default-config/biomes/mountain/mountains_jungle_border_0.yml @@ -2,7 +2,7 @@ extends: "MOUNTAINS_PRETTY_0" id: "MOUNTAINS_JUNGLE_0" palette: - - BEDROCK: 0 + - "BLOCK:minecraft:bedrock": 0 - BEDROCK_MOST: 1 - BEDROCK_HALF: 2 - BEDROCK_LITTLE: 3 diff --git a/src/main/resources/default-config/biomes/mountain/mountains_jungle_border_1.yml b/src/main/resources/default-config/biomes/mountain/mountains_jungle_border_1.yml index 88ef7acb0..381375082 100644 --- a/src/main/resources/default-config/biomes/mountain/mountains_jungle_border_1.yml +++ b/src/main/resources/default-config/biomes/mountain/mountains_jungle_border_1.yml @@ -2,7 +2,7 @@ extends: "MOUNTAINS_PRETTY_1" id: "MOUNTAINS_JUNGLE_1" palette: - - BEDROCK: 0 + - "BLOCK:minecraft:bedrock": 0 - BEDROCK_MOST: 1 - BEDROCK_HALF: 2 - BEDROCK_LITTLE: 3 diff --git a/src/main/resources/default-config/biomes/mountain/mountains_pretty.yml b/src/main/resources/default-config/biomes/mountain/mountains_pretty.yml index 5990807c0..e999f5ae2 100644 --- a/src/main/resources/default-config/biomes/mountain/mountains_pretty.yml +++ b/src/main/resources/default-config/biomes/mountain/mountains_pretty.yml @@ -2,7 +2,7 @@ extends: "MOUNTAINS_PRETTY" id: "MOUNTAINS_PRETTY" palette: - - BEDROCK: 0 + - "BLOCK:minecraft:bedrock": 0 - BEDROCK_MOST: 1 - BEDROCK_HALF: 2 - BEDROCK_LITTLE: 3 diff --git a/src/main/resources/default-config/biomes/mountain/mountains_pretty_border_0.yml b/src/main/resources/default-config/biomes/mountain/mountains_pretty_border_0.yml index 2330def15..079a453d6 100644 --- a/src/main/resources/default-config/biomes/mountain/mountains_pretty_border_0.yml +++ b/src/main/resources/default-config/biomes/mountain/mountains_pretty_border_0.yml @@ -2,7 +2,7 @@ extends: "MOUNTAINS_PRETTY_0" id: "MOUNTAINS_PRETTY_0" palette: - - BEDROCK: 0 + - "BLOCK:minecraft:bedrock": 0 - BEDROCK_MOST: 1 - BEDROCK_HALF: 2 - BEDROCK_LITTLE: 3 diff --git a/src/main/resources/default-config/biomes/mountain/mountains_pretty_border_1.yml b/src/main/resources/default-config/biomes/mountain/mountains_pretty_border_1.yml index cf669ffaf..d1672d40f 100644 --- a/src/main/resources/default-config/biomes/mountain/mountains_pretty_border_1.yml +++ b/src/main/resources/default-config/biomes/mountain/mountains_pretty_border_1.yml @@ -2,7 +2,7 @@ extends: "MOUNTAINS_PRETTY_1" id: "MOUNTAINS_PRETTY_1" palette: - - BEDROCK: 0 + - "BLOCK:minecraft:bedrock": 0 - BEDROCK_MOST: 1 - BEDROCK_HALF: 2 - BEDROCK_LITTLE: 3 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 65056541a..f92b19f41 100644 --- a/src/main/resources/default-config/biomes/mountain/mountains_stone.yml +++ b/src/main/resources/default-config/biomes/mountain/mountains_stone.yml @@ -3,7 +3,7 @@ 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: - - BEDROCK: 0 + - "BLOCK:minecraft:bedrock": 0 - BEDROCK_MOST: 1 - BEDROCK_HALF: 2 - BEDROCK_LITTLE: 3 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 a03c44135..83e5d1e31 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 @@ -3,7 +3,7 @@ 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: - - BEDROCK: 0 + - "BLOCK:minecraft:bedrock": 0 - BEDROCK_MOST: 1 - BEDROCK_HALF: 2 - BEDROCK_LITTLE: 3 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 88fff85c7..d299c34c3 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 @@ -3,7 +3,7 @@ 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: - - BEDROCK: 0 + - "BLOCK:minecraft:bedrock": 0 - BEDROCK_MOST: 1 - BEDROCK_HALF: 2 - BEDROCK_LITTLE: 3 diff --git a/src/main/resources/default-config/biomes/mountains.yml b/src/main/resources/default-config/biomes/mountains.yml index 931b49b28..0c8c23831 100644 --- a/src/main/resources/default-config/biomes/mountains.yml +++ b/src/main/resources/default-config/biomes/mountains.yml @@ -1,10 +1,9 @@ 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" -name: "Mountains" palette: - - BEDROCK: 0 + - "BLOCK:minecraft:bedrock": 0 - BEDROCK_MOST: 1 - BEDROCK_HALF: 2 - BEDROCK_LITTLE: 3 diff --git a/src/main/resources/default-config/biomes/ocean/ocean.yml b/src/main/resources/default-config/biomes/ocean/ocean.yml index 11818f5bf..5c463cc13 100644 --- a/src/main/resources/default-config/biomes/ocean/ocean.yml +++ b/src/main/resources/default-config/biomes/ocean/ocean.yml @@ -1,5 +1,4 @@ extends: "OCEAN_ABSTRACT" id: "OCEAN" -name: "Ocean" vanilla: OCEAN diff --git a/src/main/resources/default-config/biomes/ocean/ocean_cold.yml b/src/main/resources/default-config/biomes/ocean/ocean_cold.yml index d2fdd3c66..b0db7961d 100644 --- a/src/main/resources/default-config/biomes/ocean/ocean_cold.yml +++ b/src/main/resources/default-config/biomes/ocean/ocean_cold.yml @@ -1,9 +1,8 @@ extends: "OCEAN_ABSTRACT" id: "COLD_OCEAN" -name: "Cold Ocean" vanilla: COLD_OCEAN palette: - - BEDROCK: 0 + - "BLOCK:minecraft:bedrock": 0 - BEDROCK_MOST: 1 - BEDROCK_HALF: 2 - BEDROCK_LITTLE: 3 diff --git a/src/main/resources/default-config/biomes/ocean/ocean_frozen.yml b/src/main/resources/default-config/biomes/ocean/ocean_frozen.yml index 9e15f3cd7..3b3790ef0 100644 --- a/src/main/resources/default-config/biomes/ocean/ocean_frozen.yml +++ b/src/main/resources/default-config/biomes/ocean/ocean_frozen.yml @@ -1,9 +1,8 @@ extends: "OCEAN_ABSTRACT" id: "FROZEN_OCEAN" -name: "Cold Ocean" vanilla: COLD_OCEAN palette: - - BEDROCK: 0 + - "BLOCK:minecraft:bedrock": 0 - BEDROCK_MOST: 1 - BEDROCK_HALF: 2 - BEDROCK_LITTLE: 3 diff --git a/src/main/resources/default-config/biomes/ocean/ocean_lukewarm.yml b/src/main/resources/default-config/biomes/ocean/ocean_lukewarm.yml index a5fdbbd93..213187cdd 100644 --- a/src/main/resources/default-config/biomes/ocean/ocean_lukewarm.yml +++ b/src/main/resources/default-config/biomes/ocean/ocean_lukewarm.yml @@ -1,9 +1,8 @@ extends: "OCEAN_ABSTRACT" id: "LUKEWARM_OCEAN" -name: "Ocean" vanilla: LUKEWARM_OCEAN palette: - - BEDROCK: 0 + - "BLOCK:minecraft:bedrock": 0 - BEDROCK_MOST: 1 - BEDROCK_HALF: 2 - BEDROCK_LITTLE: 3 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 89e8aea08..d348eeab5 100644 --- a/src/main/resources/default-config/biomes/ocean/ocean_warm.yml +++ b/src/main/resources/default-config/biomes/ocean/ocean_warm.yml @@ -1,9 +1,8 @@ extends: "OCEAN_ABSTRACT" id: "WARM_OCEAN" -name: "Ocean" vanilla: WARM_OCEAN palette: - - BEDROCK: 0 + - "BLOCK:minecraft:bedrock": 0 - BEDROCK_MOST: 1 - BEDROCK_HALF: 2 - BEDROCK_LITTLE: 3 diff --git a/src/main/resources/default-config/biomes/ocean_deep/ocean_cold.yml b/src/main/resources/default-config/biomes/ocean_deep/ocean_cold.yml index 5ba30826b..521289508 100644 --- a/src/main/resources/default-config/biomes/ocean_deep/ocean_cold.yml +++ b/src/main/resources/default-config/biomes/ocean_deep/ocean_cold.yml @@ -2,7 +2,7 @@ extends: "DEEP_OCEAN_ABSTRACT" id: "COLD_OCEAN_DEEP" vanilla: COLD_OCEAN palette: - - BEDROCK: 0 + - "BLOCK:minecraft:bedrock": 0 - BEDROCK_MOST: 1 - BEDROCK_HALF: 2 - BEDROCK_LITTLE: 3 diff --git a/src/main/resources/default-config/biomes/ocean_deep/ocean_frozen.yml b/src/main/resources/default-config/biomes/ocean_deep/ocean_frozen.yml index 6c0cfff64..021663357 100644 --- a/src/main/resources/default-config/biomes/ocean_deep/ocean_frozen.yml +++ b/src/main/resources/default-config/biomes/ocean_deep/ocean_frozen.yml @@ -2,7 +2,7 @@ extends: "DEEP_OCEAN_ABSTRACT" id: "FROZEN_OCEAN_DEEP" vanilla: COLD_OCEAN palette: - - BEDROCK: 0 + - "BLOCK:minecraft:bedrock": 0 - BEDROCK_MOST: 1 - BEDROCK_HALF: 2 - BEDROCK_LITTLE: 3 diff --git a/src/main/resources/default-config/biomes/ocean_deep/ocean_lukewarm.yml b/src/main/resources/default-config/biomes/ocean_deep/ocean_lukewarm.yml index 6809b2bd2..3d128a83a 100644 --- a/src/main/resources/default-config/biomes/ocean_deep/ocean_lukewarm.yml +++ b/src/main/resources/default-config/biomes/ocean_deep/ocean_lukewarm.yml @@ -2,7 +2,7 @@ extends: "DEEP_OCEAN_ABSTRACT" id: "LUKEWARM_OCEAN_DEEP" vanilla: LUKEWARM_OCEAN palette: - - BEDROCK: 0 + - "BLOCK:minecraft:bedrock": 0 - BEDROCK_MOST: 1 - BEDROCK_HALF: 2 - BEDROCK_LITTLE: 3 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 a852cb0ee..73fc57b81 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 @@ -2,7 +2,7 @@ extends: "DEEP_OCEAN_ABSTRACT" id: "WARM_OCEAN_DEEP" vanilla: WARM_OCEAN palette: - - BEDROCK: 0 + - "BLOCK:minecraft:bedrock": 0 - BEDROCK_MOST: 1 - BEDROCK_HALF: 2 - BEDROCK_LITTLE: 3 diff --git a/src/main/resources/default-config/biomes/ocean_shelf/ocean_cold.yml b/src/main/resources/default-config/biomes/ocean_shelf/ocean_cold.yml index ee2cf16d5..6d79fc329 100644 --- a/src/main/resources/default-config/biomes/ocean_shelf/ocean_cold.yml +++ b/src/main/resources/default-config/biomes/ocean_shelf/ocean_cold.yml @@ -2,7 +2,7 @@ extends: "SHELF_OCEAN_ABSTRACT" id: "COLD_OCEAN_SHELF" vanilla: COLD_OCEAN palette: - - BEDROCK: 0 + - "BLOCK:minecraft:bedrock": 0 - BEDROCK_MOST: 1 - BEDROCK_HALF: 2 - BEDROCK_LITTLE: 3 diff --git a/src/main/resources/default-config/biomes/ocean_shelf/ocean_frozen.yml b/src/main/resources/default-config/biomes/ocean_shelf/ocean_frozen.yml index d256edf4c..f5bfeefb7 100644 --- a/src/main/resources/default-config/biomes/ocean_shelf/ocean_frozen.yml +++ b/src/main/resources/default-config/biomes/ocean_shelf/ocean_frozen.yml @@ -2,7 +2,7 @@ extends: "SHELF_OCEAN_ABSTRACT" id: "FROZEN_OCEAN_SHELF" vanilla: COLD_OCEAN palette: - - BEDROCK: 0 + - "BLOCK:minecraft:bedrock": 0 - BEDROCK_MOST: 1 - BEDROCK_HALF: 2 - BEDROCK_LITTLE: 3 diff --git a/src/main/resources/default-config/biomes/ocean_shelf/ocean_lukewarm.yml b/src/main/resources/default-config/biomes/ocean_shelf/ocean_lukewarm.yml index 2aa1c2c9c..8d09a52d6 100644 --- a/src/main/resources/default-config/biomes/ocean_shelf/ocean_lukewarm.yml +++ b/src/main/resources/default-config/biomes/ocean_shelf/ocean_lukewarm.yml @@ -2,7 +2,7 @@ extends: "SHELF_OCEAN_ABSTRACT" id: "LUKEWARM_OCEAN_SHELF" vanilla: LUKEWARM_OCEAN palette: - - BEDROCK: 0 + - "BLOCK:minecraft:bedrock": 0 - BEDROCK_MOST: 1 - BEDROCK_HALF: 2 - BEDROCK_LITTLE: 3 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 1902f20d1..39566c99a 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 @@ -2,7 +2,7 @@ extends: "SHELF_OCEAN_ABSTRACT" id: "WARM_OCEAN_SHELF" vanilla: WARM_OCEAN palette: - - BEDROCK: 0 + - "BLOCK:minecraft:bedrock": 0 - BEDROCK_MOST: 1 - BEDROCK_HALF: 2 - BEDROCK_LITTLE: 3 diff --git a/src/main/resources/default-config/biomes/plains.yml b/src/main/resources/default-config/biomes/plains.yml index b9188116b..b8c8721b7 100644 --- a/src/main/resources/default-config/biomes/plains.yml +++ b/src/main/resources/default-config/biomes/plains.yml @@ -2,7 +2,7 @@ extends: "PLAINS_ABSTRACT" id: "PLAINS" palette: - - BEDROCK: 0 + - "BLOCK:minecraft:bedrock": 0 - BEDROCK_MOST: 1 - BEDROCK_HALF: 2 - BEDROCK_LITTLE: 3 diff --git a/src/main/resources/default-config/biomes/plains_islands.yml b/src/main/resources/default-config/biomes/plains_islands.yml deleted file mode 100644 index 05d4b78d6..000000000 --- a/src/main/resources/default-config/biomes/plains_islands.yml +++ /dev/null @@ -1,43 +0,0 @@ -noise-equation: "-(y-62)*(y-156)*(y+25)*(y-160)*0.0000001 + if(max(y-72, 0), noise3(x, y, z)*0.75, (noise2(x, z)+0.5) / 2)" -extends: "BASIC_ORES" -id: "PLAINS_ISLANDS" -name: "Plains Islands" - -palette: - - BEDROCK: 0 - - BEDROCK_MOST: 1 - - BEDROCK_HALF: 2 - - BEDROCK_LITTLE: 3 - - SANDY: 62 - - GRASSY: 255 -vanilla: PLAINS - -flora: - chance: 60 - attempts: 1 - items: - TALL_GRASS: - weight: 160 - y: - min: 62 - max: 84 - GRASS: - weight: 100 - y: - min: 62 - max: 84 - SUNFLOWER: - weight: 8 - y: - min: 62 - max: 84 - -trees: - chance: 1 - density: 1 - items: - OAK: - weight: 1 - y: - min: 58 - max: 72 \ No newline at end of file diff --git a/src/main/resources/default-config/biomes/river.yml b/src/main/resources/default-config/biomes/river.yml index c61652f1c..d5981f23b 100644 --- a/src/main/resources/default-config/biomes/river.yml +++ b/src/main/resources/default-config/biomes/river.yml @@ -1,9 +1,8 @@ noise-equation: "((-((y / 58)^2)) + 1) + ((noise2(x, z)/4))" extends: "BASIC_ORES" id: "RIVER" -name: "River" palette: - - BEDROCK: 0 + - "BLOCK:minecraft:bedrock": 0 - BEDROCK_MOST: 1 - BEDROCK_HALF: 2 - BEDROCK_LITTLE: 3 diff --git a/src/main/resources/default-config/biomes/swamp.yml b/src/main/resources/default-config/biomes/swamp.yml index 0327f88ca..71c83b936 100644 --- a/src/main/resources/default-config/biomes/swamp.yml +++ b/src/main/resources/default-config/biomes/swamp.yml @@ -1,9 +1,8 @@ noise-equation: "((-((y / 62)^2)) + 1) + ((noise2(x, z)/4))" extends: "BASIC_ORES" id: "SWAMP" -name: "Swamp" palette: - - BEDROCK: 0 + - "BLOCK:minecraft:bedrock": 0 - BEDROCK_MOST: 1 - BEDROCK_HALF: 2 - BEDROCK_LITTLE: 3 diff --git a/src/main/resources/default-config/biomes/tundra.yml b/src/main/resources/default-config/biomes/tundra.yml index 6a8c127ac..256e564d2 100644 --- a/src/main/resources/default-config/biomes/tundra.yml +++ b/src/main/resources/default-config/biomes/tundra.yml @@ -1,9 +1,8 @@ extends: "PLAINS_ABSTRACT" id: "TUNDRA" -name: "Tundra" palette: - - BEDROCK: 0 + - "BLOCK:minecraft:bedrock": 0 - BEDROCK_MOST: 1 - BEDROCK_HALF: 2 - BEDROCK_LITTLE: 3 diff --git a/src/main/resources/default-config/carving/cavern.yml b/src/main/resources/default-config/carving/cavern.yml index 71a349711..8c1bb4331 100644 --- a/src/main/resources/default-config/carving/cavern.yml +++ b/src/main/resources/default-config/carving/cavern.yml @@ -1,4 +1,4 @@ -id: CAVERN +id: "CAVERN" length: min: 1 max: 1 diff --git a/src/main/resources/default-config/carving/ravine.yml b/src/main/resources/default-config/carving/ravine.yml index 03764c61f..a188a0588 100644 --- a/src/main/resources/default-config/carving/ravine.yml +++ b/src/main/resources/default-config/carving/ravine.yml @@ -1,4 +1,4 @@ -id: RAVINE +id: "RAVINE" length: min: 30 max: 60 diff --git a/src/main/resources/default-config/flora/button.yml b/src/main/resources/default-config/flora/button.yml index ee0b0cc0d..a1746a0db 100644 --- a/src/main/resources/default-config/flora/button.yml +++ b/src/main/resources/default-config/flora/button.yml @@ -3,8 +3,7 @@ layers: - "minecraft:stone_button[facing=east,face=floor]": 1 - "minecraft:stone_button[facing=south,face=floor]": 1 layers: 1 -id: SMALL_ROCK -name: "Stone button \"rock\"" +id: "SMALL_ROCK" spawnable: - "minecraft:stone" - "minecraft:sand" diff --git a/src/main/resources/default-config/flora/caves/stalactite.yml b/src/main/resources/default-config/flora/caves/stalactite.yml index efe956c9b..ebaef2092 100644 --- a/src/main/resources/default-config/flora/caves/stalactite.yml +++ b/src/main/resources/default-config/flora/caves/stalactite.yml @@ -9,7 +9,7 @@ layers: - materials: - "minecraft:iron_bars": 1 layers: 1 -id: STALACTITE +id: "STALACTITE" spawnable: - "minecraft:stone" replaceable: diff --git a/src/main/resources/default-config/flora/caves/stalagmite.yml b/src/main/resources/default-config/flora/caves/stalagmite.yml index ee23a53e0..009c8cbe7 100644 --- a/src/main/resources/default-config/flora/caves/stalagmite.yml +++ b/src/main/resources/default-config/flora/caves/stalagmite.yml @@ -10,7 +10,7 @@ layers: - "minecraft:cobblestone_wall": 1 layers: 1 -id: STALAGMITE +id: "STALAGMITE" spawnable: - "minecraft:stone" replaceable: diff --git a/src/main/resources/default-config/flora/kelp/kelp_mid.yml b/src/main/resources/default-config/flora/kelp/kelp_mid.yml index 9b3588e9e..9b48cf56a 100644 --- a/src/main/resources/default-config/flora/kelp/kelp_mid.yml +++ b/src/main/resources/default-config/flora/kelp/kelp_mid.yml @@ -6,8 +6,7 @@ layers: - "minecraft:kelp_plant": 1 layers: 6 -id: KELP_MEDIUM -name: "Medium Kelp" +id: "KELP_MEDIUM" spawnable: - "minecraft:sand" - "minecraft:stone" diff --git a/src/main/resources/default-config/flora/kelp/kelp_short.yml b/src/main/resources/default-config/flora/kelp/kelp_short.yml index 75e6c2b5e..6ee55e4e2 100644 --- a/src/main/resources/default-config/flora/kelp/kelp_short.yml +++ b/src/main/resources/default-config/flora/kelp/kelp_short.yml @@ -6,8 +6,7 @@ layers: - "minecraft:kelp_plant": 1 layers: 3 -id: KELP_SHORT -name: "Short Kelp" +id: "KELP_SHORT" spawnable: - "minecraft:sand" - "minecraft:stone" diff --git a/src/main/resources/default-config/flora/kelp/kelp_tall.yml b/src/main/resources/default-config/flora/kelp/kelp_tall.yml index 6463b502a..0de534fc1 100644 --- a/src/main/resources/default-config/flora/kelp/kelp_tall.yml +++ b/src/main/resources/default-config/flora/kelp/kelp_tall.yml @@ -6,8 +6,7 @@ layers: - "minecraft:kelp_plant": 1 layers: 9 -id: KELP_TALL -name: "Tall Kelp" +id: "KELP_TALL" spawnable: - "minecraft:sand" - "minecraft:stone" diff --git a/src/main/resources/default-config/flora/leaves.yml b/src/main/resources/default-config/flora/leaves.yml index c15cf7f15..9a2fd6b81 100644 --- a/src/main/resources/default-config/flora/leaves.yml +++ b/src/main/resources/default-config/flora/leaves.yml @@ -2,8 +2,7 @@ layers: - materials: - "minecraft:oak_leaves[persistent=true]": 1 layers: 1 -id: LEAVES -name: "Stone button \"rock\"" +id: "LEAVES" spawnable: - "minecraft:stone" - "minecraft:sand" diff --git a/src/main/resources/default-config/flora/root.yml b/src/main/resources/default-config/flora/root.yml index 83c7cd5df..20b0bb270 100644 --- a/src/main/resources/default-config/flora/root.yml +++ b/src/main/resources/default-config/flora/root.yml @@ -14,8 +14,7 @@ layers: - "minecraft:oak_log": 1 layers: 1 -id: ROOT -name: "Swamp Root" +id: "ROOT" spawnable: - "minecraft:grass_block" - "minecraft:coarse_dirt" diff --git a/src/main/resources/default-config/flora/seagrass.yml b/src/main/resources/default-config/flora/seagrass.yml index e36a17abb..8d719e506 100644 --- a/src/main/resources/default-config/flora/seagrass.yml +++ b/src/main/resources/default-config/flora/seagrass.yml @@ -2,8 +2,7 @@ layers: - materials: - "minecraft:seagrass": 1 layers: 1 -id: SEAGRASS -name: "Short Sea Grass" +id: "SEAGRASS" spawnable: - "minecraft:sand" - "minecraft:stone" diff --git a/src/main/resources/default-config/flora/tall_seagrass.yml b/src/main/resources/default-config/flora/tall_seagrass.yml index 588f7368d..ce0e8f63d 100644 --- a/src/main/resources/default-config/flora/tall_seagrass.yml +++ b/src/main/resources/default-config/flora/tall_seagrass.yml @@ -5,8 +5,7 @@ layers: - materials: - "minecraft:tall_seagrass[half=lower]": 1 layers: 1 -id: TALL_SEAGRASS -name: "Tall Sea Grass" +id: "TALL_SEAGRASS" spawnable: - "minecraft:sand" - "minecraft:stone" diff --git a/src/main/resources/default-config/grids/beach.yml b/src/main/resources/default-config/grids/beach.yml index 910d0022b..a3bc90073 100644 --- a/src/main/resources/default-config/grids/beach.yml +++ b/src/main/resources/default-config/grids/beach.yml @@ -10,4 +10,4 @@ grid: - ["FROZEN_BEACH", "FROZEN_BEACH", "COLD_BEACH", "COLD_BEACH", "BEACH", "SWAMP", "SWAMP", "SWAMP", "WARM_BEACH", "WARM_BEACH", "WARM_BEACH"] - ["FROZEN_BEACH", "FROZEN_BEACH", "COLD_BEACH", "COLD_BEACH", "BEACH", "SWAMP", "SWAMP", "SWAMP", "SWAMP", "WARM_BEACH", "WARM_BEACH"] - ["FROZEN_BEACH", "FROZEN_BEACH", "COLD_BEACH", "COLD_BEACH", "BEACH", "SWAMP", "SWAMP", "SWAMP", "SWAMP", "WARM_BEACH", "WARM_BEACH"] -id: BEACH \ No newline at end of file +id: "BEACH" \ No newline at end of file diff --git a/src/main/resources/default-config/grids/land.yml b/src/main/resources/default-config/grids/land.yml index 44913f6a4..8e8ee670e 100644 --- a/src/main/resources/default-config/grids/land.yml +++ b/src/main/resources/default-config/grids/land.yml @@ -10,4 +10,4 @@ grid: - ["SNOWY_TAIGA", "SNOWY_TAIGA", "TAIGA", "DARK_FOREST", "DARK_FOREST", "FOREST", "FOREST", "FOREST", "JUNGLE", "JUNGLE", "JUNGLE"] - ["SNOWY_TAIGA", "SNOWY_TAIGA", "TAIGA", "DARK_FOREST", "DARK_FOREST", "FOREST", "FOREST", "JUNGLE", "JUNGLE", "JUNGLE", "JUNGLE"] - ["SNOWY_TAIGA", "SNOWY_TAIGA", "TAIGA", "DARK_FOREST", "DARK_FOREST", "FOREST", "FOREST", "JUNGLE", "JUNGLE", "JUNGLE", "JUNGLE"] -id: LAND \ No newline at end of file +id: "LAND" \ No newline at end of file diff --git a/src/main/resources/default-config/grids/mountain.yml b/src/main/resources/default-config/grids/mountain.yml index f817bad3f..cbe681ad8 100644 --- a/src/main/resources/default-config/grids/mountain.yml +++ b/src/main/resources/default-config/grids/mountain.yml @@ -10,4 +10,4 @@ grid: - ["MOUNTAINS_STONE", "MOUNTAINS_STONE", "MOUNTAINS_PRETTY_1", "MOUNTAINS_PRETTY", "MOUNTAINS_PRETTY", "MOUNTAINS_PRETTY", "MOUNTAINS_PRETTY", "MOUNTAINS_PRETTY", "MOUNTAINS_JUNGLE", "MOUNTAINS_JUNGLE", "MOUNTAINS_JUNGLE"] - ["MOUNTAINS_STONE", "MOUNTAINS_STONE", "MOUNTAINS_PRETTY_1", "MOUNTAINS_PRETTY", "MOUNTAINS_PRETTY", "MOUNTAINS_PRETTY", "MOUNTAINS_PRETTY", "MOUNTAINS_JUNGLE", "MOUNTAINS_JUNGLE", "MOUNTAINS_JUNGLE", "MOUNTAINS_JUNGLE"] - ["MOUNTAINS_STONE", "MOUNTAINS_STONE", "MOUNTAINS_PRETTY_1", "MOUNTAINS_PRETTY", "MOUNTAINS_PRETTY", "MOUNTAINS_PRETTY", "MOUNTAINS_PRETTY", "MOUNTAINS_JUNGLE", "MOUNTAINS_JUNGLE", "MOUNTAINS_JUNGLE", "MOUNTAINS_JUNGLE"] -id: MOUNTAIN \ No newline at end of file +id: "MOUNTAIN" \ No newline at end of file diff --git a/src/main/resources/default-config/grids/mountain_border_flat.yml b/src/main/resources/default-config/grids/mountain_border_flat.yml index f4b6a6537..c1bd77224 100644 --- a/src/main/resources/default-config/grids/mountain_border_flat.yml +++ b/src/main/resources/default-config/grids/mountain_border_flat.yml @@ -10,4 +10,4 @@ grid: - ["MOUNTAINS_STONE_0", "MOUNTAINS_STONE_0", "MOUNTAINS_PRETTY_0", "MOUNTAINS_PRETTY_0", "MOUNTAINS_PRETTY_0", "MOUNTAINS_PRETTY_0", "MOUNTAINS_PRETTY_0", "MOUNTAINS_PRETTY_0", "MOUNTAINS_JUNGLE_0", "MOUNTAINS_JUNGLE_0", "MOUNTAINS_JUNGLE_0"] - ["MOUNTAINS_STONE_0", "MOUNTAINS_STONE_0", "MOUNTAINS_PRETTY_0", "MOUNTAINS_PRETTY_0", "MOUNTAINS_PRETTY_0", "MOUNTAINS_PRETTY_0", "MOUNTAINS_PRETTY_0", "MOUNTAINS_JUNGLE_0", "MOUNTAINS_JUNGLE_0", "MOUNTAINS_JUNGLE_0", "MOUNTAINS_JUNGLE_0"] - ["MOUNTAINS_STONE_0", "MOUNTAINS_STONE_0", "MOUNTAINS_PRETTY_0", "MOUNTAINS_PRETTY_0", "MOUNTAINS_PRETTY_0", "MOUNTAINS_PRETTY_0", "MOUNTAINS_PRETTY_0", "MOUNTAINS_JUNGLE_0", "MOUNTAINS_JUNGLE_0", "MOUNTAINS_JUNGLE_0", "MOUNTAINS_JUNGLE_0"] -id: MOUNTAIN_0 \ No newline at end of file +id: "MOUNTAIN_0" \ No newline at end of file diff --git a/src/main/resources/default-config/grids/mountain_border_mid.yml b/src/main/resources/default-config/grids/mountain_border_mid.yml index ab0522205..4bdcc9870 100644 --- a/src/main/resources/default-config/grids/mountain_border_mid.yml +++ b/src/main/resources/default-config/grids/mountain_border_mid.yml @@ -10,4 +10,4 @@ grid: - ["MOUNTAINS_STONE_1", "MOUNTAINS_STONE_1", "MOUNTAINS_PRETTY_0", "MOUNTAINS_PRETTY_1", "MOUNTAINS_PRETTY_1", "MOUNTAINS_PRETTY_1", "MOUNTAINS_PRETTY_1", "MOUNTAINS_PRETTY_1", "MOUNTAINS_JUNGLE_1", "MOUNTAINS_JUNGLE_1", "MOUNTAINS_JUNGLE_1"] - ["MOUNTAINS_STONE_1", "MOUNTAINS_STONE_1", "MOUNTAINS_PRETTY_0", "MOUNTAINS_PRETTY_1", "MOUNTAINS_PRETTY_1", "MOUNTAINS_PRETTY_1", "MOUNTAINS_PRETTY_1", "MOUNTAINS_JUNGLE_1", "MOUNTAINS_JUNGLE_1", "MOUNTAINS_JUNGLE_1", "MOUNTAINS_JUNGLE_1"] - ["MOUNTAINS_STONE_1", "MOUNTAINS_STONE_1", "MOUNTAINS_PRETTY_0", "MOUNTAINS_PRETTY_1", "MOUNTAINS_PRETTY_1", "MOUNTAINS_PRETTY_1", "MOUNTAINS_PRETTY_1", "MOUNTAINS_JUNGLE_1", "MOUNTAINS_JUNGLE_1", "MOUNTAINS_JUNGLE_1", "MOUNTAINS_JUNGLE_1"] -id: MOUNTAIN_1 \ No newline at end of file +id: "MOUNTAIN_1" \ No newline at end of file diff --git a/src/main/resources/default-config/grids/ocean.yml b/src/main/resources/default-config/grids/ocean.yml index 92c7bfc0d..f3a80c0ae 100644 --- a/src/main/resources/default-config/grids/ocean.yml +++ b/src/main/resources/default-config/grids/ocean.yml @@ -10,4 +10,4 @@ grid: - ["FROZEN_OCEAN", "FROZEN_OCEAN", "COLD_OCEAN", "COLD_OCEAN", "OCEAN", "SWAMP", "SWAMP", "SWAMP", "LUKEWARM_OCEAN", "WARM_OCEAN", "WARM_OCEAN"] - ["FROZEN_OCEAN", "FROZEN_OCEAN", "COLD_OCEAN", "COLD_OCEAN", "OCEAN", "SWAMP", "SWAMP", "SWAMP", "SWAMP", "LUKEWARM_OCEAN", "WARM_OCEAN"] - ["FROZEN_OCEAN", "FROZEN_OCEAN", "COLD_OCEAN", "COLD_OCEAN", "OCEAN", "SWAMP", "SWAMP", "SWAMP", "SWAMP", "LUKEWARM_OCEAN", "WARM_OCEAN"] -id: OCEAN \ No newline at end of file +id: "OCEAN" \ No newline at end of file diff --git a/src/main/resources/default-config/grids/ocean_deep.yml b/src/main/resources/default-config/grids/ocean_deep.yml index 21f8e9ee6..94ff5a5a9 100644 --- a/src/main/resources/default-config/grids/ocean_deep.yml +++ b/src/main/resources/default-config/grids/ocean_deep.yml @@ -10,4 +10,4 @@ grid: - ["FROZEN_OCEAN_DEEP", "FROZEN_OCEAN_DEEP", "COLD_OCEAN_DEEP", "COLD_OCEAN_DEEP", "OCEAN_DEEP", "OCEAN_DEEP", "OCEAN_DEEP", "LUKEWARM_OCEAN_DEEP", "LUKEWARM_OCEAN_DEEP", "WARM_OCEAN_DEEP", "WARM_OCEAN_DEEP"] - ["FROZEN_OCEAN_DEEP", "FROZEN_OCEAN_DEEP", "COLD_OCEAN_DEEP", "COLD_OCEAN_DEEP", "OCEAN_DEEP", "OCEAN_DEEP", "OCEAN_DEEP", "LUKEWARM_OCEAN_DEEP", "LUKEWARM_OCEAN_DEEP", "LUKEWARM_OCEAN_DEEP", "WARM_OCEAN_DEEP"] - ["FROZEN_OCEAN_DEEP", "FROZEN_OCEAN_DEEP", "COLD_OCEAN_DEEP", "COLD_OCEAN_DEEP", "OCEAN_DEEP", "OCEAN_DEEP", "OCEAN_DEEP", "LUKEWARM_OCEAN_DEEP", "LUKEWARM_OCEAN_DEEP", "LUKEWARM_OCEAN_DEEP", "WARM_OCEAN_DEEP"] -id: OCEAN_DEEP \ No newline at end of file +id: "OCEAN_DEEP" \ No newline at end of file diff --git a/src/main/resources/default-config/grids/ocean_shelf.yml b/src/main/resources/default-config/grids/ocean_shelf.yml index 7edf19f28..46c38e741 100644 --- a/src/main/resources/default-config/grids/ocean_shelf.yml +++ b/src/main/resources/default-config/grids/ocean_shelf.yml @@ -10,4 +10,4 @@ grid: - ["FROZEN_OCEAN_SHELF", "FROZEN_OCEAN_SHELF", "COLD_OCEAN_SHELF", "COLD_OCEAN_SHELF", "OCEAN_SHELF", "OCEAN_SHELF", "OCEAN_SHELF", "LUKEWARM_OCEAN_SHELF", "LUKEWARM_OCEAN_SHELF", "WARM_OCEAN_SHELF", "WARM_OCEAN_SHELF"] - ["FROZEN_OCEAN_SHELF", "FROZEN_OCEAN_SHELF", "COLD_OCEAN_SHELF", "COLD_OCEAN_SHELF", "OCEAN_SHELF", "OCEAN_SHELF", "OCEAN_SHELF", "LUKEWARM_OCEAN_SHELF", "LUKEWARM_OCEAN_SHELF", "LUKEWARM_OCEAN_SHELF", "WARM_OCEAN_SHELF"] - ["FROZEN_OCEAN_SHELF", "FROZEN_OCEAN_SHELF", "COLD_OCEAN_SHELF", "COLD_OCEAN_SHELF", "OCEAN_SHELF", "OCEAN_SHELF", "OCEAN_SHELF", "LUKEWARM_OCEAN_SHELF", "LUKEWARM_OCEAN_SHELF", "LUKEWARM_OCEAN_SHELF", "WARM_OCEAN_SHELF"] -id: OCEAN_SHELF \ No newline at end of file +id: "OCEAN_SHELF" \ No newline at end of file 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 d4971219e..612b7b2fe 100644 --- a/src/main/resources/default-config/ores/deposits/andesite_pocket.yml +++ b/src/main/resources/default-config/ores/deposits/andesite_pocket.yml @@ -4,6 +4,6 @@ radius: max: 4 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 8ed8ff4ad..65e15d323 100644 --- a/src/main/resources/default-config/ores/deposits/diorite_pocket.yml +++ b/src/main/resources/default-config/ores/deposits/diorite_pocket.yml @@ -4,6 +4,6 @@ radius: max: 4 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 495eb9e2b..76312b589 100644 --- a/src/main/resources/default-config/ores/deposits/dirt_pocket.yml +++ b/src/main/resources/default-config/ores/deposits/dirt_pocket.yml @@ -4,6 +4,6 @@ radius: max: 4 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 4799b821e..d50fe47af 100644 --- a/src/main/resources/default-config/ores/deposits/granite_pocket.yml +++ b/src/main/resources/default-config/ores/deposits/granite_pocket.yml @@ -4,6 +4,6 @@ radius: max: 4 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 5fa8391d2..dd74170bd 100644 --- a/src/main/resources/default-config/ores/deposits/gravel_pocket.yml +++ b/src/main/resources/default-config/ores/deposits/gravel_pocket.yml @@ -4,6 +4,6 @@ radius: max: 4 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 b2ffc3016..8a3e7a63c 100644 --- a/src/main/resources/default-config/ores/minerals/coal.yml +++ b/src/main/resources/default-config/ores/minerals/coal.yml @@ -4,6 +4,6 @@ radius: max: 2 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 c1d9af614..2b1f32a56 100644 --- a/src/main/resources/default-config/ores/minerals/diamond.yml +++ b/src/main/resources/default-config/ores/minerals/diamond.yml @@ -4,6 +4,6 @@ radius: max: 1 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 1292a4cd0..fc5954eb7 100644 --- a/src/main/resources/default-config/ores/minerals/gold.yml +++ b/src/main/resources/default-config/ores/minerals/gold.yml @@ -4,6 +4,6 @@ radius: max: 1 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 9b51c520b..0b2cf36a3 100644 --- a/src/main/resources/default-config/ores/minerals/iron.yml +++ b/src/main/resources/default-config/ores/minerals/iron.yml @@ -4,6 +4,6 @@ radius: max: 1 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 7ea0629b7..4c626b72a 100644 --- a/src/main/resources/default-config/ores/minerals/lapis.yml +++ b/src/main/resources/default-config/ores/minerals/lapis.yml @@ -4,6 +4,6 @@ radius: max: 1 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 479906719..dcf76b6a6 100644 --- a/src/main/resources/default-config/ores/minerals/redstone.yml +++ b/src/main/resources/default-config/ores/minerals/redstone.yml @@ -4,6 +4,6 @@ radius: max: 1 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 d5be6e5e2..c41bf0dc2 100644 --- a/src/main/resources/default-config/pack.yml +++ b/src/main/resources/default-config/pack.yml @@ -5,8 +5,6 @@ grids: - OCEAN_DEEP - OCEAN_DEEP - OCEAN_DEEP - - OCEAN_DEEP - - OCEAN_DEEP - OCEAN_SHELF - OCEAN - OCEAN @@ -15,7 +13,6 @@ grids: - OCEAN - OCEAN - OCEAN - - OCEAN - BEACH - LAND - LAND @@ -46,8 +43,6 @@ grids: - MOUNTAIN - MOUNTAIN - MOUNTAIN - - MOUNTAIN - - MOUNTAIN frequencies: grid-x: 5120 grid-z: 6144 diff --git a/src/main/resources/default-config/palettes/bedrock/bedrock.yml b/src/main/resources/default-config/palettes/bedrock/bedrock.yml deleted file mode 100644 index da59735de..000000000 --- a/src/main/resources/default-config/palettes/bedrock/bedrock.yml +++ /dev/null @@ -1,6 +0,0 @@ -layers: - - materials: - - "minecraft:bedrock": 1 - layers: 1 -id: BEDROCK -name: "Bedrock Palette" \ No newline at end of file diff --git a/src/main/resources/default-config/palettes/bedrock/bedrock_half.yml b/src/main/resources/default-config/palettes/bedrock/bedrock_half.yml index 063977812..5e26139f8 100644 --- a/src/main/resources/default-config/palettes/bedrock/bedrock_half.yml +++ b/src/main/resources/default-config/palettes/bedrock/bedrock_half.yml @@ -3,5 +3,4 @@ layers: - "minecraft:bedrock": 1 - "minecraft:stone": 1 layers: 1 -id: BEDROCK_HALF -name: "Bedrock Palette" \ No newline at end of file +id: BEDROCK_HALF \ No newline at end of file diff --git a/src/main/resources/default-config/palettes/bedrock/bedrock_little.yml b/src/main/resources/default-config/palettes/bedrock/bedrock_little.yml index b179a7618..46775d531 100644 --- a/src/main/resources/default-config/palettes/bedrock/bedrock_little.yml +++ b/src/main/resources/default-config/palettes/bedrock/bedrock_little.yml @@ -3,5 +3,4 @@ layers: - "minecraft:bedrock": 1 - "minecraft:stone": 2 layers: 1 -id: BEDROCK_LITTLE -name: "Bedrock Palette" \ No newline at end of file +id: BEDROCK_LITTLE \ No newline at end of file diff --git a/src/main/resources/default-config/palettes/bedrock/bedrock_most.yml b/src/main/resources/default-config/palettes/bedrock/bedrock_most.yml index bcd3363f6..b3ee12060 100644 --- a/src/main/resources/default-config/palettes/bedrock/bedrock_most.yml +++ b/src/main/resources/default-config/palettes/bedrock/bedrock_most.yml @@ -3,5 +3,4 @@ layers: - "minecraft:bedrock": 2 - "minecraft:stone": 1 layers: 1 -id: BEDROCK_MOST -name: "Bedrock Palette" \ No newline at end of file +id: BEDROCK_MOST \ No newline at end of file diff --git a/src/main/resources/default-config/palettes/cold_ocean.yml b/src/main/resources/default-config/palettes/cold_ocean.yml index 4403ee26c..3093f4cd5 100644 --- a/src/main/resources/default-config/palettes/cold_ocean.yml +++ b/src/main/resources/default-config/palettes/cold_ocean.yml @@ -5,4 +5,4 @@ layers: - materials: - "minecraft:water": 1 layers: 1 -id: COLD_OCEAN \ No newline at end of file +id: "COLD_OCEAN" \ No newline at end of file diff --git a/src/main/resources/default-config/palettes/desert/desert.yml b/src/main/resources/default-config/palettes/desert/desert.yml index e72fdaf2d..c4ff05342 100644 --- a/src/main/resources/default-config/palettes/desert/desert.yml +++ b/src/main/resources/default-config/palettes/desert/desert.yml @@ -9,4 +9,3 @@ layers: - "minecraft:stone": 1 layers: 1 id: DESERT -name: "Sandy Palette" diff --git a/src/main/resources/default-config/palettes/desert/red_desert.yml b/src/main/resources/default-config/palettes/desert/red_desert.yml index ef0b669d4..ac7104aa2 100644 --- a/src/main/resources/default-config/palettes/desert/red_desert.yml +++ b/src/main/resources/default-config/palettes/desert/red_desert.yml @@ -8,5 +8,4 @@ layers: - materials: - "minecraft:stone": 1 layers: 1 -id: RED_DESERT -name: "Sandy Palette" +id: RED_DESERT \ No newline at end of file diff --git a/src/main/resources/default-config/palettes/grassy.yml b/src/main/resources/default-config/palettes/grassy.yml index 31e10713c..eb0ca3ecb 100644 --- a/src/main/resources/default-config/palettes/grassy.yml +++ b/src/main/resources/default-config/palettes/grassy.yml @@ -8,4 +8,4 @@ layers: - materials: - "minecraft:stone": 1 layers: 1 -id: GRASSY \ No newline at end of file +id: "GRASSY" \ No newline at end of file diff --git a/src/main/resources/default-config/palettes/gravelly.yml b/src/main/resources/default-config/palettes/gravelly.yml index e5ffff8ce..d3fd6e026 100644 --- a/src/main/resources/default-config/palettes/gravelly.yml +++ b/src/main/resources/default-config/palettes/gravelly.yml @@ -8,5 +8,4 @@ layers: - materials: - "minecraft:stone": 1 layers: 1 -id: GRAVEL -name: "Sandy Palette" +id: "GRAVEL" diff --git a/src/main/resources/default-config/palettes/mountains/arid.yml b/src/main/resources/default-config/palettes/mountains/arid.yml index 93bc8bda5..20d799504 100644 --- a/src/main/resources/default-config/palettes/mountains/arid.yml +++ b/src/main/resources/default-config/palettes/mountains/arid.yml @@ -23,7 +23,7 @@ layers: - materials: - "minecraft:stone": 1 layers: 1 -id: ARID +id: "ARID" simplex: true frequency: 0.05 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 5ef0bfbf8..852bcec64 100644 --- a/src/main/resources/default-config/palettes/mountains/grass.yml +++ b/src/main/resources/default-config/palettes/mountains/grass.yml @@ -12,7 +12,7 @@ layers: - materials: - "minecraft:stone": 1 layers: 1 -id: MOUNTAIN_GRASS +id: "MOUNTAIN_GRASS" simplex: true frequency: 0.075 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 430729bc0..fcc8c3a5b 100644 --- a/src/main/resources/default-config/palettes/mountains/jungle.yml +++ b/src/main/resources/default-config/palettes/mountains/jungle.yml @@ -14,7 +14,7 @@ layers: - materials: - "minecraft:stone": 1 layers: 1 -id: MOUNTAIN_JUNGLE +id: "MOUNTAIN_JUNGLE" simplex: true frequency: 0.04 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 1cd4d169a..1e189b628 100644 --- a/src/main/resources/default-config/palettes/mountains/pretty_mountains.yml +++ b/src/main/resources/default-config/palettes/mountains/pretty_mountains.yml @@ -18,7 +18,7 @@ layers: - materials: - "minecraft:stone": 1 layers: 1 -id: MOUNTAIN_PRETTY +id: "MOUNTAIN_PRETTY" simplex: true frequency: 0.03 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 914a5b407..6600ad39e 100644 --- a/src/main/resources/default-config/palettes/mountains/stone.yml +++ b/src/main/resources/default-config/palettes/mountains/stone.yml @@ -8,7 +8,7 @@ layers: - materials: - "minecraft:stone": 1 layers: 1 -id: MOUNTAIN_STONE +id: "MOUNTAIN_STONE" simplex: true frequency: 0.075 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 099b6fa71..11f0c202f 100644 --- a/src/main/resources/default-config/palettes/mountains/stone_grass.yml +++ b/src/main/resources/default-config/palettes/mountains/stone_grass.yml @@ -16,7 +16,7 @@ layers: - materials: - "minecraft:stone": 1 layers: 1 -id: MOUNTAIN_STONE_GRASS +id: "MOUNTAIN_STONE_GRASS" simplex: true frequency: 0.075 seed: 3 \ No newline at end of file diff --git a/src/main/resources/default-config/palettes/oceanfloor.yml b/src/main/resources/default-config/palettes/oceanfloor.yml index 19e82855c..213d7a01a 100644 --- a/src/main/resources/default-config/palettes/oceanfloor.yml +++ b/src/main/resources/default-config/palettes/oceanfloor.yml @@ -9,6 +9,5 @@ layers: - materials: - "minecraft:stone": 1 layers: 1 -id: OCEANFLOOR -name: "Ocean Floor Palette" +id: "OCEANFLOOR" diff --git a/src/main/resources/default-config/palettes/river_bottom.yml b/src/main/resources/default-config/palettes/river_bottom.yml index 2e42a919a..e47b4eb5a 100644 --- a/src/main/resources/default-config/palettes/river_bottom.yml +++ b/src/main/resources/default-config/palettes/river_bottom.yml @@ -7,7 +7,7 @@ layers: - materials: - "minecraft:stone": 1 layers: 1 -id: RIVER_BOTTOM +id: "RIVER_BOTTOM" simplex: true frequency: 0.05 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 f760c8d33..75544719a 100644 --- a/src/main/resources/default-config/palettes/river_shore.yml +++ b/src/main/resources/default-config/palettes/river_shore.yml @@ -10,8 +10,7 @@ layers: - materials: - "minecraft:stone": 1 layers: 1 -id: RIVER_SHORE -name: "Sandy Palette" +id: "RIVER_SHORE" simplex: true frequency: 0.05 seed: 3 \ No newline at end of file diff --git a/src/main/resources/default-config/palettes/sand_all.yml b/src/main/resources/default-config/palettes/sand_all.yml index 6a001dd31..b71b58182 100644 --- a/src/main/resources/default-config/palettes/sand_all.yml +++ b/src/main/resources/default-config/palettes/sand_all.yml @@ -5,5 +5,4 @@ layers: - materials: - "minecraft:stone": 1 layers: 1 -id: SAND_ALL -name: "Sandy Palette" +id: "SAND_ALL" diff --git a/src/main/resources/default-config/palettes/sandy.yml b/src/main/resources/default-config/palettes/sandy.yml index 9748ba2a0..d1b539240 100644 --- a/src/main/resources/default-config/palettes/sandy.yml +++ b/src/main/resources/default-config/palettes/sandy.yml @@ -9,5 +9,4 @@ layers: - materials: - "minecraft:stone": 1 layers: 1 -id: SANDY -name: "Sandy Palette" +id: "SANDY" diff --git a/src/main/resources/default-config/palettes/slabs/mountainslabs.yml b/src/main/resources/default-config/palettes/slabs/mountainslabs.yml index 2870d97e4..128b085dd 100644 --- a/src/main/resources/default-config/palettes/slabs/mountainslabs.yml +++ b/src/main/resources/default-config/palettes/slabs/mountainslabs.yml @@ -3,8 +3,7 @@ layers: - "minecraft:cobblestone_slab": 1 - "minecraft:stone_slab": 3 layers: 1 -id: MOUNTAIN_SLABS -name: "Mountain Slabs palette" +id: "MOUNTAIN_SLABS" simplex: true frequency: 0.1 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 f959ff775..e5b998b3a 100644 --- a/src/main/resources/default-config/palettes/slabs/mountainstairs.yml +++ b/src/main/resources/default-config/palettes/slabs/mountainstairs.yml @@ -3,8 +3,7 @@ layers: - "minecraft:cobblestone_stairs": 1 - "minecraft:stone_stairs": 3 layers: 1 -id: MOUNTAIN_STAIRS -name: "Mountain Stairs palette" +id: "MOUNTAIN_STAIRS" simplex: true frequency: 0.1 seed: 4 \ No newline at end of file diff --git a/src/main/resources/default-config/palettes/slabs/snow.yml b/src/main/resources/default-config/palettes/slabs/snow.yml index 20fef3999..4c7bf486a 100644 --- a/src/main/resources/default-config/palettes/slabs/snow.yml +++ b/src/main/resources/default-config/palettes/slabs/snow.yml @@ -4,5 +4,4 @@ layers: - "minecraft:snow[layers=4]": 1 - "minecraft:snow[layers=5]": 1 layers: 1 -id: SNOW_LAYERS -name: "Mountain Snow palette" \ No newline at end of file +id: "SNOW_LAYERS" \ No newline at end of file diff --git a/src/main/resources/default-config/palettes/snow.yml b/src/main/resources/default-config/palettes/snow.yml index a3f85ff3f..7daa6cbda 100644 --- a/src/main/resources/default-config/palettes/snow.yml +++ b/src/main/resources/default-config/palettes/snow.yml @@ -8,5 +8,4 @@ layers: - materials: - "minecraft:stone": 1 layers: 1 -id: SNOW -name: "Snowy Palette" \ No newline at end of file +id: "SNOW" \ No newline at end of file diff --git a/src/main/resources/default-config/palettes/swamp.yml b/src/main/resources/default-config/palettes/swamp.yml index d7dfff67f..70095179b 100644 --- a/src/main/resources/default-config/palettes/swamp.yml +++ b/src/main/resources/default-config/palettes/swamp.yml @@ -9,5 +9,4 @@ layers: - materials: - "minecraft:stone": 1 layers: 1 -id: SWAMP -name: "Grassy Palette" \ No newline at end of file +id: "SWAMP" \ No newline at end of file diff --git a/src/main/resources/default-config/palettes/swamp_border.yml b/src/main/resources/default-config/palettes/swamp_border.yml deleted file mode 100644 index 8c9d57341..000000000 --- a/src/main/resources/default-config/palettes/swamp_border.yml +++ /dev/null @@ -1,27 +0,0 @@ -layers: - - materials: - - "minecraft:grass_block": 1 - - "minecraft:coarse_dirt": 1 - - "minecraft:grass_block": 1 - - "minecraft:coarse_dirt": 1 - - "minecraft:grass_block": 1 - - "minecraft:coarse_dirt": 1 - - "minecraft:grass_block": 1 - - "minecraft:coarse_dirt": 1 - - "minecraft:grass_block": 1 - - "minecraft:coarse_dirt": 1 - - "minecraft:grass_block": 1 - - "minecraft:coarse_dirt": 1 - - "minecraft:grass_block": 12 - layers: 1 - - materials: - - "minecraft:dirt": 1 - layers: 2 - - materials: - - "minecraft:stone": 1 - layers: 1 -id: SWAMP_BORDER -name: "Grassy Palette" -simplex: true -frequency: 0.1 -seed: 3 \ No newline at end of file diff --git a/src/main/resources/default-config/palettes/swamp_bottom.yml b/src/main/resources/default-config/palettes/swamp_bottom.yml index 0ea10b005..30435c45b 100644 --- a/src/main/resources/default-config/palettes/swamp_bottom.yml +++ b/src/main/resources/default-config/palettes/swamp_bottom.yml @@ -10,5 +10,4 @@ layers: - materials: - "minecraft:stone": 1 layers: 1 -id: SWAMP_BOTTOM -name: "Grassy Palette" \ No newline at end of file +id: "SWAMP_BOTTOM" \ 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 06bb5dd52..bb2c4068e 100644 --- a/src/main/resources/default-config/palettes/taiga.yml +++ b/src/main/resources/default-config/palettes/taiga.yml @@ -9,8 +9,7 @@ layers: - materials: - "minecraft:stone": 1 layers: 1 -id: TAIGA -name: "Taiga Palette" +id: "TAIGA" simplex: true frequency: 0.03 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 544a667e2..d30870eb4 100644 --- a/src/main/resources/default-config/palettes/tundra.yml +++ b/src/main/resources/default-config/palettes/tundra.yml @@ -15,8 +15,7 @@ layers: - materials: - "minecraft:stone": 1 layers: 1 -id: TUNDRA -name: "Tundra Palette" +id: "TUNDRA" simplex: true frequency: 0.04 seed: 4 \ No newline at end of file diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index 7f6070831..435d9dd6b 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -1,7 +1,7 @@ name: Terra depend: [ "Gaea" ] main: com.dfsek.terra.Terra -version: 1.0.0-BETA +version: 1.0.1-BETA load: STARTUP api-version: "1.15" softdepend: ["WorldEdit"]