Update default config

2026-04-03 06:16:10 +00:00 · 2020-10-24 01:54:35 -07:00
parent b0a3cf9ffe
commit ecf3882fa2
38 changed files with 64 additions and 69 deletions
--- 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
--- 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:
--- 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:
--- 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:
--- 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:
--- 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:
--- 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:
--- 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:
--- 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
--- 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
--- 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
--- 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:
--- 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



--- 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
--- 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
+  octaves: 5
+  frequency: 0.0075
+locatable:
+  STRONGHOLD: JUNGLE
--- a/src/main/resources/default-config/structures/data/mansion.tstructure
+++ b/src/main/resources/default-config/structures/data/mansion.tstructure
--- a/src/main/resources/default-config/structures/data/pull.tstructure
+++ b/src/main/resources/default-config/structures/data/pull.tstructure
--- a/src/main/resources/default-config/structures/data/swamp1.tstructure
+++ b/src/main/resources/default-config/structures/data/swamp1.tstructure
--- a/src/main/resources/default-config/structures/data/swamp2.tstructure
+++ b/src/main/resources/default-config/structures/data/swamp2.tstructure
--- a/src/main/resources/default-config/structures/data/swamp3.tstructure
+++ b/src/main/resources/default-config/structures/data/swamp3.tstructure
--- a/src/main/resources/default-config/structures/data/swamp4.tstructure
+++ b/src/main/resources/default-config/structures/data/swamp4.tstructure
--- a/src/main/resources/default-config/structures/data/swamp5.tstructure
+++ b/src/main/resources/default-config/structures/data/swamp5.tstructure
--- a/src/main/resources/default-config/structures/data/swamp6.tstructure
+++ b/src/main/resources/default-config/structures/data/swamp6.tstructure
--- a/src/main/resources/default-config/structures/data/swamp7.tstructure
+++ b/src/main/resources/default-config/structures/data/swamp7.tstructure
--- a/src/main/resources/default-config/structures/data/swamp8.tstructure
+++ b/src/main/resources/default-config/structures/data/swamp8.tstructure
--- a/src/main/resources/default-config/structures/data/testloot.tstructure
+++ b/src/main/resources/default-config/structures/data/testloot.tstructure
--- 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
--- a/src/main/resources/default-config/structures/single/mansion.yml
+++ 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
--- a/src/main/resources/default-config/structures/single/pull.yml
+++ b/src/main/resources/default-config/structures/single/pull.yml
@@ -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
--- a/src/main/resources/default-config/trees/data/spruce1.tstructure
+++ b/src/main/resources/default-config/trees/data/spruce1.tstructure
--- a/src/main/resources/default-config/trees/data/spruce2.tstructure
+++ b/src/main/resources/default-config/trees/data/spruce2.tstructure
--- a/src/main/resources/default-config/trees/data/spruce3.tstructure
+++ b/src/main/resources/default-config/trees/data/spruce3.tstructure
--- a/src/main/resources/default-config/trees/data/spruce4.tstructure
+++ b/src/main/resources/default-config/trees/data/spruce4.tstructure
--- a/src/main/resources/default-config/trees/data/spruce5.tstructure
+++ b/src/main/resources/default-config/trees/data/spruce5.tstructure
--- a/src/main/resources/default-config/trees/data/spruce6.tstructure
+++ b/src/main/resources/default-config/trees/data/spruce6.tstructure
--- a/src/main/resources/default-config/trees/data/spruce7.tstructure
+++ b/src/main/resources/default-config/trees/data/spruce7.tstructure
--- a/src/main/resources/default-config/trees/data/spruce_tree_1.tstructure
+++ b/src/main/resources/default-config/trees/data/spruce_tree_1.tstructure
--- 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"
+  - "minecraft:grass_block"
+  - "minecraft:podzol"