OWo

2025-12-28 19:29:20 +00:00 · 2020-01-19 04:54:36 -08:00
parent efc834e322
commit 58b652ca39
204 changed files with 131 additions and 110 deletions
--- a/biomes/beach.json
+++ b/biomes/beach.json
@@ -13,8 +13,15 @@
        "CLAY",
        "GRAVEL"
    ],
+    "rock": [
+        "SANDSTONE"
+    ],
+    "scatter":[
+        "DEAD_BUSH=0.008"
+    ],
    "objects": [
-        "tree/palm/medium=0.75",
-        "tree/palm/small=1.88"
+        "tree/palm/medium=0.5",
+        "tree/palm/small=0.4"
+
    ]
 }
--- a/biomes/desert.json
+++ b/biomes/desert.json
@@ -17,10 +17,6 @@
        "DEAD_BUSH=0.008"
    ],
    "objects": [
-        "colossal/dead/massive=0.00023",
-        "bones/medium=0.005",
-        "tree/spruce/dead/medium=0.005",
-        "boulder/stone/medium=0.001",
-        "/colossal/dead/supermassive=0.0001"
-    ]
+        "tree/colossal/dead/massive=0.001",
+        "tree/colossal/dead/superlarge=0.001"    ]
 }
--- a/biomes/desert_hills.json
+++ b/biomes/desert_hills.json
@@ -20,10 +20,8 @@
        "DEAD_BUSH=0.005"
    ],
    "objects": [
-        "colossal/dead/massive=0.00023",
-        "bones/medium=0.005",
-        "tree/spruce/dead/medium=0.005",
-        "boulder/stone/medium=0.001",
-        "/colossal/dead/supermassive=0.0001"
+        "tree/colossal/dead/massive=0.001",
+        "tree/colossal/dead/superlarge=0.001"
+
    ]
 }
--- a/biomes/desert_red.json
+++ b/biomes/desert_red.json
@@ -19,10 +19,7 @@
        "DEAD_BUSH=0.008"
    ],
    "objects": [
-        "colossal/dead/massive=0.00043",
-        "bones/medium=0.005",
-        "tree/spruce/dead/medium=0.005",
-        "boulder/stone/medium=0.001",
-        "/colossal/dead/supermassive=0.0001"
+        "tree/colossal/dead/massive=0.001",
+        "tree/colossal/dead/superlarge=0.001"
    ]
 }
--- a/biomes/forest.json
+++ b/biomes/forest.json
@@ -9,12 +9,7 @@
        "LONG_GRASS:2=0.13"
    ],
    "objects": [
-        "tree/oak/medium=0.83",
-        "tree/oak/small=3.2",
-        "colossal/oak/massive=0.001",
-        "colossal/oak/superlarge=0.0004",
-        "colossal/oak/supermassive=0.0001",
-        "tree/fantasyoak/large=0.18",
-        "tree/fantasyoak/medium=0.18"
+    "tree/oak/medium=0.2",
+    "tree/oak/small=0.2"
    ]
 }
--- a/biomes/forest_birch.json
+++ b/biomes/forest_birch.json
@@ -10,8 +10,9 @@
        "LONG_GRASS:2=0.13"
    ],
    "objects": [
-        "tree/birch/medium=0.63",
-        "tree/birch/large=0.32",
-        "tree/birch/small=3.2"
+        "tree/birch/large=0.2",
+        "tree/birch/medium=0.3",
+        "tree/birch/small=0.3",
+        "house/rustic/medium=0.005"
    ]
 }
--- a/biomes/forest_birch_hills.json
+++ b/biomes/forest_birch_hills.json
@@ -12,8 +12,10 @@
        "LONG_GRASS:2=0.13"
    ],
    "objects": [
-        "tree/birch/medium=0.63",
-        "tree/birch/large=0.32",
-        "tree/birch/small=3.2"
+        "tree/birch/large=0.2",
+        "tree/birch/medium=0.3",
+        "tree/birch/small=0.3",
+        "house/rustic/medium=0.005"
+
    ]
 }
--- a/biomes/forest_dark.json
+++ b/biomes/forest_dark.json
@@ -10,8 +10,8 @@
        "LONG_GRASS:2=0.13"
    ],
    "objects":[
-        "tree/darkoak/small=2.8",
-        "tree/darkoak/medium=0.8",
-        "tree/darkoak/large=0.1"
+        "tree/darkoak/small=0.2",
+        "tree/darkoak/medium=0.25",
+        "tree/darkoak/large=0.35"
    ]
 }
--- a/biomes/forest_haunted.json
+++ b/biomes/forest_haunted.json
@@ -26,11 +26,11 @@
    ],
    "surfaceType": "simplex",
    "objects": [
-        "colossal/dead/fallen/massive=0.0005",
-        "colossal/dead/massive=0.0007",
-        "colossal/dead/tainted/massive=0.0007",
-        "colossal/dead/superlarge=0.0006",
-        "colossal/dead/wilted/supermassive=0.0004",
-        "colossal/dead/supermassive=0.0005"
+        "house/norms/medium=0.007",
+        "tree/fantasyoak/large=0.02",
+        "tree/fantasyoak/medium=0.2",
+        "tree/darkoak/small=0.2",
+        "tree/darkoak/medium=0.25",
+        "tree/darkoak/large=0.35"
    ]
 }
--- a/biomes/forest_hills.json
+++ b/biomes/forest_hills.json
@@ -12,12 +12,7 @@
        "LONG_GRASS:2=0.13"
    ],
    "objects": [
-        "tree/oak/medium=0.83",
-        "tree/oak/small=2.8",
-        "colossal/oak/massive=0.001",
-        "colossal/oak/superlarge=0.0004",
-        "colossal/oak/supermassive=0.0001",
-        "tree/fantasyoak/large=0.18",
-        "tree/fantasyoak/medium=0.18"
+        "tree/oak/medium=0.2",
+        "tree/oak/small=0.2"
    ]
 }
--- a/biomes/forest_mountains.json
+++ b/biomes/forest_mountains.json
@@ -17,8 +17,7 @@
        "LONG_GRASS:2=0.13"
    ],
    "objects": [
-        "tree/spruce/medium=0.67",
-        "tree/spruce/small=2.7",
-        "tree/spruce/dead/medium=0.09"
+        "tree/oak/medium=0.2",
+        "tree/oak/small=0.2"
    ]
 }
--- a/biomes/frozen_beach.json
+++ b/biomes/frozen_beach.json
@@ -0,0 +1,17 @@
+{
+    "name": "Frozen Beach",
+    "derivative": "COLD_BEACH",
+    "type": "FRONT",
+    "height": 0,
+    "snow": 0.5,
+    "surface": [
+        "PACKED_ICE"
+    ],
+    "subSurface": [
+        "SAND",
+        "SAND",
+        "SAND",
+        "CLAY",
+        "GRAVEL"
+    ]
+}
--- a/biomes/ice_forest.json
+++ b/biomes/ice_forest.json
@@ -14,11 +14,8 @@
        "PACKED_ICE"
    ],
    "objects": [
-        "tree/spruce/medium=0.87",
-        "tree/spruce/small=3.7",
-        "tree/spruce/dead/medium=0.01",
-        "tree/evergreen/large=0.17",
-        "tree/evergreen/medium=0.22",
-        "mushroom/ice=0.03"
+        "tree/evergreen/large=0.2",
+        "tree/evergreen/medium=0.4",
+        "mushroom/ice=0.05"
    ]
 }
--- a/biomes/ice_mountains.json
+++ b/biomes/ice_mountains.json
@@ -24,11 +24,9 @@
        "PACKED_ICE"
    ],
    "objects": [
-        "tree/spruce/medium=0.57",
-        "tree/spruce/small=1.7",
-        "tree/spruce/dead/medium=0.01",
-        "tree/evergreen/large=0.07",
-        "tree/evergreen/medium=0.37",
-        "mushroom/ice=0.03"
+        "tree/evergreen/large=0.2",
+        "tree/evergreen/medium=0.4",
+        "mushroom/ice=0.05",
+        "spire/small=0.01"
    ]
 }
--- a/biomes/ice_plains.json
+++ b/biomes/ice_plains.json
@@ -12,5 +12,10 @@
    ],
    "subSurface": [
        "PACKED_ICE"
+    ],
+    "objects": [
+        "spire/small=0.07",
+        "spire/medium=0.07"
+        
    ]
 }
--- a/biomes/ice_plains_mushrooms.json
+++ b/biomes/ice_plains_mushrooms.json
@@ -0,0 +1,23 @@
+{
+    "name": "Ice Plains Mushrooms",
+    "derivative": "ICE_FLATS",
+    "type": "LAND",
+    "region": "snowy",
+    "height": 0,
+    "rarity": 2,
+    "genAmplifier": 0.1,
+    "snow": 0.74,
+    "parent": "Ice Plains",
+    "surface": [
+        "SNOW_BLOCK"
+    ],
+    "subSurface": [
+        "PACKED_ICE"
+    ],
+    "objects": [
+        "mushroom/ice=0.15",
+        "spire/small=0.07",
+        "spire/medium=0.07"
+        
+    ]
+}
--- a/biomes/jungle.json
+++ b/biomes/jungle.json
@@ -10,8 +10,7 @@
        "LONG_GRASS:2=0.13"
    ],
    "objects": [
-        "colossal/jungle/massive=0.0001",
-        "tree/jungle/medium=0.67",
-        "tree/palm/small=1.63"
+        "tree/jungle/medium=0.9",
+        "clutt=0.9"
    ]
 }
--- a/biomes/jungle_hills.json
+++ b/biomes/jungle_hills.json
@@ -12,8 +12,7 @@
        "LONG_GRASS:2=0.02"
    ],
    "objects": [
-        "colossal/jungle/massive=0.0001",
-        "tree/jungle/medium=0.67",
-        "tree/palm/small=1.63"
+        "tree/jungle/medium=0.9",
+        "clutt=0.9"
    ]
 }
--- a/biomes/plains.json
+++ b/biomes/plains.json
@@ -10,9 +10,6 @@
        "LONG_GRASS:2=0.09"
    ],
    "objects": [
-        "colossal/blossom/massive=0.0008",
-        "colossal/blossom/supermassive=0.00011",
-        "colossal/blossom/superlarge=0.00054",
-        "house/rustic/medium=0.001"
+
    ]
 }
--- a/biomes/redwood_forest.json
+++ b/biomes/redwood_forest.json
@@ -15,10 +15,6 @@
        "LONG_GRASS:2=0.07"
    ],
    "objects": [
-        "tree/spruce/medium=0.87",
-        "tree/spruce/small=3.7",
-        "tree/spruce/dead/medium=0.01",
-        "tree/evergreen/large=0.17",
-        "tree/evergreen/medium=0.22"
+
    ]
 }
--- a/biomes/redwood_forest_hills.json
+++ b/biomes/redwood_forest_hills.json
@@ -17,10 +17,6 @@
        "LONG_GRASS:2=0.07"
    ],
    "objects": [
-        "tree/spruce/medium=0.87",
-        "tree/spruce/small=3.7",
-        "tree/spruce/dead/medium=0.01",
-        "tree/evergreen/large=0.27",
-        "tree/evergreen/medium=0.32"
+
    ]
 }
--- a/biomes/sakura.json
+++ b/biomes/sakura.json
@@ -1,5 +1,5 @@
 {
-    "name": "Sakura",
+    "name": "Serrulata",
    "region": "temperate",
    "derivative": "MUTATED_PLAINS",
    "type": "LAND",
@@ -16,6 +16,6 @@
        "tree/serrulata/nobleed/medium=0.09",
        "tree/serrulata/sakura/medium=0.09",
        "tree/serrulata/bleeding/large=0.09",
-		"house/rustic/Jap/medium=0.01"
+		"house/Jap/medium=0.01"
    ]
 }
--- a/biomes/savanna.json
+++ b/biomes/savanna.json
@@ -9,9 +9,6 @@
        "LONG_GRASS:1=0.18"
    ],
    "objects":[
-        "colossal/dead/massive=0.001",
-        "colossal/dead/superlarge=0.0005",
-        "colossal/dead/supermassive=0.0001",
-        "colossal/dead/fallen/massive=0.001"
+
    ]
 }
--- a/biomes/savanna_hills.json
+++ b/biomes/savanna_hills.json
@@ -9,5 +9,8 @@
    "genScale": 1.25,
    "scatter":[
        "LONG_GRASS:1=0.18"
+    ],
+    "objects": [
+
    ]
 }
--- a/biomes/swamp.json
+++ b/biomes/swamp.json
@@ -9,5 +9,8 @@
    "scatter":[
        "LONG_GRASS:1=0.04",
        "LONG_GRASS:2=0.03"
+    ],
+    "objects": [
+
    ]
 }
--- a/biomes/taiga.json
+++ b/biomes/taiga.json
@@ -8,8 +8,6 @@
        "LONG_GRASS:2=0.07"
    ],
    "objects": [
-        "tree/spruce/medium=0.27",
-        "tree/spruce/small=1.7",
-        "tree/spruce/dead/medium=0.39"
+
    ]
 }
--- a/biomes/taiga_cold.json
+++ b/biomes/taiga_cold.json
@@ -9,8 +9,8 @@
        "LONG_GRASS:2=0.04"
    ],
    "objects": [
-        "tree/spruce/medium=0.27",
-        "tree/spruce/small=1.7",
-        "tree/spruce/dead/medium=0.39"
+
    ]
-}
+}
+
+
--- a/biomes/taiga_cold_hills.json
+++ b/biomes/taiga_cold_hills.json
@@ -11,8 +11,6 @@
        "LONG_GRASS:2=0.04"
    ],
    "objects": [
-        "tree/spruce/medium=0.27",
-        "tree/spruce/small=1.7",
-        "tree/spruce/dead/medium=0.39"
+
    ]
 }
--- a/dimensions/overworld.json
+++ b/dimensions/overworld.json
@@ -39,6 +39,8 @@
        "ice_mountains",
        "redwood_forest",
        "redwood_forest_hills",
+        "ice_plains_mushrooms",
+        "frozen_beach",
        "beach",
        "sakura",
        "tourmaline"
--- a/objects/clutt/JClutter1.ish
+++ b/objects/clutt/JClutter1.ish
--- a/objects/clutt/JClutter10.ish
+++ b/objects/clutt/JClutter10.ish
--- a/objects/clutt/JClutter11.ish
+++ b/objects/clutt/JClutter11.ish
--- a/objects/clutt/JClutter12.ish
+++ b/objects/clutt/JClutter12.ish
--- a/objects/clutt/JClutter13.ish
+++ b/objects/clutt/JClutter13.ish
--- a/objects/clutt/JClutter2.ish
+++ b/objects/clutt/JClutter2.ish
--- a/objects/clutt/JClutter3.ish
+++ b/objects/clutt/JClutter3.ish
--- a/objects/clutt/JClutter4.ish
+++ b/objects/clutt/JClutter4.ish
--- a/objects/clutt/JClutter5.ish
+++ b/objects/clutt/JClutter5.ish
--- a/objects/clutt/JClutter6.ish
+++ b/objects/clutt/JClutter6.ish
--- a/objects/clutt/JClutter7.ish
+++ b/objects/clutt/JClutter7.ish
--- a/objects/clutt/JClutter8.ish
+++ b/objects/clutt/JClutter8.ish
--- a/objects/clutt/JClutter9.ish
+++ b/objects/clutt/JClutter9.ish
--- a/objects/clutt/Jstone1.ish
+++ b/objects/clutt/Jstone1.ish
--- a/objects/clutt/Jstone2.ish
+++ b/objects/clutt/Jstone2.ish
--- a/objects/colossal/blossom/fallen/blossom1.ish
+++ b/objects/colossal/blossom/fallen/blossom1.ish
--- a/objects/colossal/blossom/massive/blossom1.ish
+++ b/objects/colossal/blossom/massive/blossom1.ish
--- a/objects/colossal/blossom/massive/blossom2.ish
+++ b/objects/colossal/blossom/massive/blossom2.ish
--- a/objects/colossal/blossom/massive/blossom3.ish
+++ b/objects/colossal/blossom/massive/blossom3.ish
--- a/objects/colossal/blossom/superlarge/blossom1.ish
+++ b/objects/colossal/blossom/superlarge/blossom1.ish
--- a/objects/colossal/blossom/supermassive/blossom1.ish
+++ b/objects/colossal/blossom/supermassive/blossom1.ish
--- a/objects/colossal/blossom/tainted/blossom1.ish
+++ b/objects/colossal/blossom/tainted/blossom1.ish
--- a/objects/colossal/blossom/wilted/supermassive/blossom1.ish
+++ b/objects/colossal/blossom/wilted/supermassive/blossom1.ish
--- a/objects/colossal/bonsai/massive/bonsai1.ish
+++ b/objects/colossal/bonsai/massive/bonsai1.ish
--- a/objects/colossal/bonsai/massive/bonsai2.ish
+++ b/objects/colossal/bonsai/massive/bonsai2.ish
--- a/objects/colossal/bonsai/massive/bonsai3.ish
+++ b/objects/colossal/bonsai/massive/bonsai3.ish
--- a/objects/colossal/dead/fallen/massive/dead1.ish
+++ b/objects/colossal/dead/fallen/massive/dead1.ish
--- a/objects/colossal/dead/massive/flags.ifl
+++ b/objects/colossal/dead/massive/flags.ifl
@@ -1 +0,0 @@
-sink 6
--- a/objects/colossal/dead/superlarge/flags.ifl
+++ b/objects/colossal/dead/superlarge/flags.ifl
@@ -1 +0,0 @@
-sink 11
--- a/objects/colossal/dead/supermassive/dead1.ish
+++ b/objects/colossal/dead/supermassive/dead1.ish
--- a/objects/colossal/dead/supermassive/flags.ifl
+++ b/objects/colossal/dead/supermassive/flags.ifl
@@ -1 +0,0 @@
-sink 13
--- a/objects/colossal/dead/tainted/massive/dead1.ish
+++ b/objects/colossal/dead/tainted/massive/dead1.ish
--- a/objects/colossal/dead/tainted/massive/flags.ifl
+++ b/objects/colossal/dead/tainted/massive/flags.ifl
@@ -1 +0,0 @@
-sink 6
--- a/objects/colossal/dead/wilted/supermassive/dead1.ish
+++ b/objects/colossal/dead/wilted/supermassive/dead1.ish
--- a/objects/colossal/dead/wilted/supermassive/flags.ifl
+++ b/objects/colossal/dead/wilted/supermassive/flags.ifl
@@ -1 +0,0 @@
-sink 9
--- a/objects/colossal/jungle/massive/flags.ifl
+++ b/objects/colossal/jungle/massive/flags.ifl
@@ -1 +0,0 @@
-sink 8
--- a/objects/colossal/jungle/massive/jungle1.ish
+++ b/objects/colossal/jungle/massive/jungle1.ish
--- a/objects/colossal/oak/fallen/massive/oak1.ish
+++ b/objects/colossal/oak/fallen/massive/oak1.ish
--- a/objects/colossal/oak/massive/flags.ifl
+++ b/objects/colossal/oak/massive/flags.ifl
@@ -1 +0,0 @@
-sink 6
--- a/objects/colossal/oak/massive/oak1.ish
+++ b/objects/colossal/oak/massive/oak1.ish
--- a/objects/colossal/oak/massive/oak2.ish
+++ b/objects/colossal/oak/massive/oak2.ish
--- a/objects/colossal/oak/massive/oak3.ish
+++ b/objects/colossal/oak/massive/oak3.ish
--- a/objects/colossal/oak/superlarge/flags.ifl
+++ b/objects/colossal/oak/superlarge/flags.ifl
@@ -1 +0,0 @@
-sink=8
--- a/objects/colossal/oak/superlarge/oak1.ish
+++ b/objects/colossal/oak/superlarge/oak1.ish
--- a/objects/colossal/oak/supermassive/flags.ifl
+++ b/objects/colossal/oak/supermassive/flags.ifl
@@ -1 +0,0 @@
-sink 10
--- a/objects/colossal/oak/supermassive/oak1.ish
+++ b/objects/colossal/oak/supermassive/oak1.ish
--- a/objects/colossal/oak/tainted/massive/oak1.ish
+++ b/objects/colossal/oak/tainted/massive/oak1.ish
--- a/objects/colossal/oak/wilted/supermassive/oak1.ish
+++ b/objects/colossal/oak/wilted/supermassive/oak1.ish
--- a/objects/colossal/sakura/fallen/supermassive/sakura1.ish
+++ b/objects/colossal/sakura/fallen/supermassive/sakura1.ish
--- a/objects/colossal/sakura/massive/sakura1.ish
+++ b/objects/colossal/sakura/massive/sakura1.ish
--- a/objects/colossal/sakura/massive/sakura2.ish
+++ b/objects/colossal/sakura/massive/sakura2.ish
--- a/objects/colossal/sakura/massive/sakura3.ish
+++ b/objects/colossal/sakura/massive/sakura3.ish
--- a/objects/colossal/sakura/superlarge/sakura1.ish
+++ b/objects/colossal/sakura/superlarge/sakura1.ish
--- a/objects/colossal/sakura/supermassive/sakura1.ish
+++ b/objects/colossal/sakura/supermassive/sakura1.ish
--- a/objects/colossal/sakura/tainted/supermassive/sakura1.ish
+++ b/objects/colossal/sakura/tainted/supermassive/sakura1.ish
--- a/objects/colossal/sakura/wilted/supermassive/sakura1.ish
+++ b/objects/colossal/sakura/wilted/supermassive/sakura1.ish
--- a/objects/colossal/willow/dead/supermassive/dead1.ish
+++ b/objects/colossal/willow/dead/supermassive/dead1.ish
--- a/objects/colossal/willow/dead/supermassive/dead2.ish
+++ b/objects/colossal/willow/dead/supermassive/dead2.ish
--- a/objects/colossal/willow/supermassive/willow1.ish
+++ b/objects/colossal/willow/supermassive/willow1.ish
--- a/objects/colossal/willow/supermassive/willow2.ish
+++ b/objects/colossal/willow/supermassive/willow2.ish
--- a/objects/colossal/willow/supermassive/willow3.ish
+++ b/objects/colossal/willow/supermassive/willow3.ish
--- a/objects/colossal/willow/supermassive/willow4.ish
+++ b/objects/colossal/willow/supermassive/willow4.ish
--- a/objects/house/rustic/Jap/medium/MedJap1.ish
+++ b/objects/house/rustic/Jap/medium/MedJap1.ish
--- a/objects/house/rustic/Jap/medium/MedJap10.ish
+++ b/objects/house/rustic/Jap/medium/MedJap10.ish
--- a/objects/house/rustic/Jap/medium/MedJap2.ish
+++ b/objects/house/rustic/Jap/medium/MedJap2.ish
--- a/objects/house/rustic/Jap/medium/MedJap3.ish
+++ b/objects/house/rustic/Jap/medium/MedJap3.ish
--- a/objects/house/rustic/Jap/medium/MedJap4.ish
+++ b/objects/house/rustic/Jap/medium/MedJap4.ish
--- a/objects/house/rustic/Jap/medium/MedJap5.ish
+++ b/objects/house/rustic/Jap/medium/MedJap5.ish
--- a/objects/house/rustic/Jap/medium/MedJap6.ish
+++ b/objects/house/rustic/Jap/medium/MedJap6.ish
--- a/objects/house/rustic/Jap/medium/MedJap7.ish
+++ b/objects/house/rustic/Jap/medium/MedJap7.ish
--- a/objects/house/rustic/Jap/medium/MedJap8.ish
+++ b/objects/house/rustic/Jap/medium/MedJap8.ish
--- a/Show More
+++ b/Show More