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 0a4b2bb1a..59d63cc44 100644 --- a/src/main/resources/default-config/abstract/biomes/basic_ores.yml +++ b/src/main/resources/default-config/abstract/biomes/basic_ores.yml @@ -1,9 +1,9 @@ id: "BASIC_ORES" carving: - - CAVE: 30 - - RAVINE: 5 - - CAVERN: 5 + CAVE: 30 + RAVINE: 5 + CAVERN: 5 ores: DIRT: min: 0 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 66f96f838..7e0017981 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 @@ -26,7 +26,7 @@ flora: max: 64 carving: - - CAVE_OCEAN: 35 + CAVE_OCEAN: 35 ores: DIRT: 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 9710470c0..099879fb4 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 @@ -2,9 +2,9 @@ noise-equation: "((-((y / 76)^2)) + 1) + ((noise2(x, z)+0.5) / 3) + abs(noise2(x id: "MOUNTAINS_PRETTY" carving: - - CAVE: 30 - - RAVINE: 5 - - CAVERN: 5 + CAVE: 30 + RAVINE: 5 + CAVERN: 5 ores: DIRT: 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 2524fabc0..c7564a450 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 @@ -2,9 +2,9 @@ noise-equation: "((-((y / 64)^2)) + 1) + ((noise2(x, z)+0.5) / 3) + abs(noise2(x id: "MOUNTAINS_PRETTY_0" carving: - - CAVE: 30 - - RAVINE: 5 - - CAVERN: 5 + CAVE: 30 + RAVINE: 5 + CAVERN: 5 ores: DIRT: 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 8d8f20e55..94d6743a9 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 @@ -2,9 +2,9 @@ noise-equation: "((-((y / 70)^2)) + 1) + ((noise2(x, z)+0.5) / 3) + abs(noise2(x id: "MOUNTAINS_PRETTY_1" carving: - - CAVE: 30 - - RAVINE: 5 - - CAVERN: 5 + CAVE: 30 + RAVINE: 5 + CAVERN: 5 ores: DIRT: 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 142553b54..0a2788c93 100644 --- a/src/main/resources/default-config/abstract/biomes/ocean_abstract.yml +++ b/src/main/resources/default-config/abstract/biomes/ocean_abstract.yml @@ -26,7 +26,7 @@ flora: max: 64 carving: - - CAVE_OCEAN: 35 + CAVE_OCEAN: 35 ores: DIRT: 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 db15649e8..9357175b2 100644 --- a/src/main/resources/default-config/abstract/biomes/plains_abstract.yml +++ b/src/main/resources/default-config/abstract/biomes/plains_abstract.yml @@ -1,10 +1,10 @@ -noise-equation: "((-((y / 64)^2)) + 1) + |(noise2(x, z) / 3) + 0.1|" +noise-equation: "((-((y / 63)^2)) + 1) + |(noise2(x, z) / 3) + 0.1|" id: "PLAINS_ABSTRACT" carving: - - CAVE: 30 - - RAVINE: 5 - - CAVERN: 5 + CAVE: 30 + RAVINE: 5 + CAVERN: 5 erodible: true ores: 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 c098b4081..d7e571dae 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 @@ -26,7 +26,7 @@ flora: max: 64 carving: - - CAVE_OCEAN: 35 + CAVE_OCEAN: 35 ores: DIRT: 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 c718f5716..4deb18fef 100644 --- a/src/main/resources/default-config/biomes/forest/dark_forest.yml +++ b/src/main/resources/default-config/biomes/forest/dark_forest.yml @@ -3,6 +3,8 @@ extends: "BASIC_ORES" id: "DARK_FOREST" name: "Birch Forest" +structures: + - MANSION palette: - BEDROCK: 0 - BEDROCK_MOST: 1 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 8fc775bf8..2c201d3c2 100644 --- a/src/main/resources/default-config/biomes/forest/snowy_taiga.yml +++ b/src/main/resources/default-config/biomes/forest/snowy_taiga.yml @@ -41,15 +41,10 @@ flora: max: 84 trees: - density: 125 + density: 75 items: - SPRUCE: + SPRUCE_CUSTOM: weight: 1 y: min: 58 max: 84 - LARGE_SPRUCE: - weight: 1 - y: - min: 58 - max: 84 \ No newline at end of file diff --git a/src/main/resources/default-config/biomes/forest/taiga.yml b/src/main/resources/default-config/biomes/forest/taiga.yml index 0aa156ca9..0b018c30f 100644 --- a/src/main/resources/default-config/biomes/forest/taiga.yml +++ b/src/main/resources/default-config/biomes/forest/taiga.yml @@ -35,15 +35,10 @@ flora: max: 84 trees: - density: 125 + density: 75 items: - SPRUCE: + SPRUCE_CUSTOM: weight: 1 y: min: 58 max: 84 - LARGE_SPRUCE: - weight: 1 - y: - min: 58 - max: 84 \ No newline at end of file diff --git a/src/main/resources/default-config/biomes/plains.yml b/src/main/resources/default-config/biomes/plains.yml index 5db536dea..b9188116b 100644 --- a/src/main/resources/default-config/biomes/plains.yml +++ b/src/main/resources/default-config/biomes/plains.yml @@ -18,23 +18,22 @@ flora: attempts: 1 items: TALL_GRASS: - weight: 160 + weight: 29 y: min: 62 max: 84 GRASS: - weight: 100 + weight: 70 y: min: 62 max: 84 SUNFLOWER: - weight: 8 + weight: 1 y: min: 62 max: 84 trees: - chance: 1 density: 1 items: OAK: diff --git a/src/main/resources/default-config/biomes/swamp.yml b/src/main/resources/default-config/biomes/swamp.yml index ad447ed8e..0327f88ca 100644 --- a/src/main/resources/default-config/biomes/swamp.yml +++ b/src/main/resources/default-config/biomes/swamp.yml @@ -41,7 +41,7 @@ flora: max: 84 carving: - - CAVE_SWAMP: 30 + CAVE_SWAMP: 30 diff --git a/src/main/resources/default-config/biomes/tundra.yml b/src/main/resources/default-config/biomes/tundra.yml index ac04ddea2..6a8c127ac 100644 --- a/src/main/resources/default-config/biomes/tundra.yml +++ b/src/main/resources/default-config/biomes/tundra.yml @@ -10,9 +10,9 @@ palette: - TUNDRA: 255 vanilla: SNOWY_TUNDRA carving: - - CAVE_TUNDRA: 35 - - RAVINE: 5 - - CAVERN: 5 + CAVE_TUNDRA: 35 + RAVINE: 5 + CAVERN: 5 snow: - min: 0 diff --git a/src/main/resources/default-config/pack.yml b/src/main/resources/default-config/pack.yml index eff23ffc6..4e10152b4 100644 --- a/src/main/resources/default-config/pack.yml +++ b/src/main/resources/default-config/pack.yml @@ -1,4 +1,4 @@ -id: DEFAULT +id: OVERWORLD_DEMO grids: - OCEAN_DEEP - OCEAN_DEEP @@ -58,10 +58,12 @@ blend: amplitude: 10 erode: enable: true - frequency: 0.005 - threshold: 0.001 - octaves: 4 + frequency: 0.001 + threshold: 0.0015 + octaves: 5 grid: "BIOME:RIVER" noise: - octaves: 4 - frequency: 0.01 \ No newline at end of file + octaves: 5 + frequency: 0.0075 +locatable: + STRONGHOLD: JUNGLE \ No newline at end of file diff --git a/src/main/resources/default-config/structures/data/mansion.tstructure b/src/main/resources/default-config/structures/data/mansion.tstructure new file mode 100644 index 000000000..e9e267cd2 Binary files /dev/null and b/src/main/resources/default-config/structures/data/mansion.tstructure differ diff --git a/src/main/resources/default-config/structures/data/pull.tstructure b/src/main/resources/default-config/structures/data/pull.tstructure deleted file mode 100644 index 683ef1825..000000000 Binary files a/src/main/resources/default-config/structures/data/pull.tstructure and /dev/null differ diff --git a/src/main/resources/default-config/structures/data/swamp1.tstructure b/src/main/resources/default-config/structures/data/swamp1.tstructure deleted file mode 100644 index fda1890f7..000000000 Binary files a/src/main/resources/default-config/structures/data/swamp1.tstructure and /dev/null differ diff --git a/src/main/resources/default-config/structures/data/swamp2.tstructure b/src/main/resources/default-config/structures/data/swamp2.tstructure deleted file mode 100644 index 5c34d3861..000000000 Binary files a/src/main/resources/default-config/structures/data/swamp2.tstructure and /dev/null differ diff --git a/src/main/resources/default-config/structures/data/swamp3.tstructure b/src/main/resources/default-config/structures/data/swamp3.tstructure deleted file mode 100644 index f9e471933..000000000 Binary files a/src/main/resources/default-config/structures/data/swamp3.tstructure and /dev/null differ diff --git a/src/main/resources/default-config/structures/data/swamp4.tstructure b/src/main/resources/default-config/structures/data/swamp4.tstructure deleted file mode 100644 index c24811199..000000000 Binary files a/src/main/resources/default-config/structures/data/swamp4.tstructure and /dev/null differ diff --git a/src/main/resources/default-config/structures/data/swamp5.tstructure b/src/main/resources/default-config/structures/data/swamp5.tstructure deleted file mode 100644 index 8d6af79be..000000000 Binary files a/src/main/resources/default-config/structures/data/swamp5.tstructure and /dev/null differ diff --git a/src/main/resources/default-config/structures/data/swamp6.tstructure b/src/main/resources/default-config/structures/data/swamp6.tstructure deleted file mode 100644 index 8bc1b0167..000000000 Binary files a/src/main/resources/default-config/structures/data/swamp6.tstructure and /dev/null differ diff --git a/src/main/resources/default-config/structures/data/swamp7.tstructure b/src/main/resources/default-config/structures/data/swamp7.tstructure deleted file mode 100644 index 8aa06238a..000000000 Binary files a/src/main/resources/default-config/structures/data/swamp7.tstructure and /dev/null differ diff --git a/src/main/resources/default-config/structures/data/swamp8.tstructure b/src/main/resources/default-config/structures/data/swamp8.tstructure deleted file mode 100644 index e82a8db26..000000000 Binary files a/src/main/resources/default-config/structures/data/swamp8.tstructure and /dev/null differ diff --git a/src/main/resources/default-config/structures/data/testloot.tstructure b/src/main/resources/default-config/structures/data/testloot.tstructure deleted file mode 100644 index 49e27e6ca..000000000 Binary files a/src/main/resources/default-config/structures/data/testloot.tstructure and /dev/null differ diff --git a/src/main/resources/default-config/structures/single/jungle.yml b/src/main/resources/default-config/structures/single/jungle.yml index 7ea32f1bc..5e9277fc3 100644 --- a/src/main/resources/default-config/structures/single/jungle.yml +++ b/src/main/resources/default-config/structures/single/jungle.yml @@ -8,11 +8,8 @@ spawn: bound: min: 48 max: 96 - type: DISTRIBUTE - width: 75 - padding: 25 - search: DOWN - enable: true + width: 250 + padding: 50 loot: 0: arrows 1: cobble_house \ 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 new file mode 100644 index 000000000..bab03077b --- /dev/null +++ b/src/main/resources/default-config/structures/single/mansion.yml @@ -0,0 +1,14 @@ +files: + mansion: 1 +id: "MANSION" +spawn: + start: + min: 72 + max: 72 + bound: + min: 48 + max: 96 + width: 250 + padding: 100 +loot: + 1: arrows \ No newline at end of file diff --git a/src/main/resources/default-config/structures/single/pull.yml b/src/main/resources/default-config/structures/single/pull.yml deleted file mode 100644 index e99a6487b..000000000 --- a/src/main/resources/default-config/structures/single/pull.yml +++ /dev/null @@ -1,15 +0,0 @@ -files: - pull: 1 -id: "PULL" -spawn: - start: - min: 96 - max: 96 - bound: - min: 48 - max: 128 - type: DISTRIBUTE - width: 25 - padding: 10 - search: DOWN - enable: true \ No newline at end of file diff --git a/src/main/resources/default-config/trees/data/spruce1.tstructure b/src/main/resources/default-config/trees/data/spruce1.tstructure index 15cf9a16f..1a90102ed 100644 Binary files a/src/main/resources/default-config/trees/data/spruce1.tstructure and b/src/main/resources/default-config/trees/data/spruce1.tstructure differ diff --git a/src/main/resources/default-config/trees/data/spruce2.tstructure b/src/main/resources/default-config/trees/data/spruce2.tstructure index 9b43d6191..4d700529a 100644 Binary files a/src/main/resources/default-config/trees/data/spruce2.tstructure and b/src/main/resources/default-config/trees/data/spruce2.tstructure differ diff --git a/src/main/resources/default-config/trees/data/spruce3.tstructure b/src/main/resources/default-config/trees/data/spruce3.tstructure new file mode 100644 index 000000000..215a1104f Binary files /dev/null and b/src/main/resources/default-config/trees/data/spruce3.tstructure differ diff --git a/src/main/resources/default-config/trees/data/spruce4.tstructure b/src/main/resources/default-config/trees/data/spruce4.tstructure new file mode 100644 index 000000000..dc8120cfd Binary files /dev/null and b/src/main/resources/default-config/trees/data/spruce4.tstructure differ diff --git a/src/main/resources/default-config/trees/data/spruce5.tstructure b/src/main/resources/default-config/trees/data/spruce5.tstructure new file mode 100644 index 000000000..79b473e4d Binary files /dev/null and b/src/main/resources/default-config/trees/data/spruce5.tstructure differ diff --git a/src/main/resources/default-config/trees/data/spruce6.tstructure b/src/main/resources/default-config/trees/data/spruce6.tstructure new file mode 100644 index 000000000..b5470c0b2 Binary files /dev/null and b/src/main/resources/default-config/trees/data/spruce6.tstructure differ diff --git a/src/main/resources/default-config/trees/data/spruce7.tstructure b/src/main/resources/default-config/trees/data/spruce7.tstructure new file mode 100644 index 000000000..751638384 Binary files /dev/null and b/src/main/resources/default-config/trees/data/spruce7.tstructure differ diff --git a/src/main/resources/default-config/trees/data/spruce_tree_1.tstructure b/src/main/resources/default-config/trees/data/spruce_tree_1.tstructure new file mode 100644 index 000000000..40ae29a88 Binary files /dev/null and b/src/main/resources/default-config/trees/data/spruce_tree_1.tstructure differ diff --git a/src/main/resources/default-config/trees/trees/spruce.yml b/src/main/resources/default-config/trees/trees/spruce.yml index f651b6272..e5ab346aa 100644 --- a/src/main/resources/default-config/trees/trees/spruce.yml +++ b/src/main/resources/default-config/trees/trees/spruce.yml @@ -1,7 +1,13 @@ files: spruce1: 1 - spruce2: 2 + spruce2: 1 + spruce3: 1 + spruce4: 1 + spruce5: 1 + spruce6: 1 + spruce7: 1 id: SPRUCE_CUSTOM y-offset: 0 spawnable: - - "minecraft:grass_block" \ No newline at end of file + - "minecraft:grass_block" + - "minecraft:podzol" \ No newline at end of file