diff --git a/core.trees/objects/evergreen-large/fantasy_evergreen_large1.iob b/core.trees/objects/evergreen/fantasy_evergreen_large1.iob similarity index 100% rename from core.trees/objects/evergreen-large/fantasy_evergreen_large1.iob rename to core.trees/objects/evergreen/fantasy_evergreen_large1.iob diff --git a/core.trees/objects/evergreen-large/fantasy_evergreen_large2.iob b/core.trees/objects/evergreen/fantasy_evergreen_large2.iob similarity index 100% rename from core.trees/objects/evergreen-large/fantasy_evergreen_large2.iob rename to core.trees/objects/evergreen/fantasy_evergreen_large2.iob diff --git a/core.trees/objects/evergreen-medium/fantasy_evergreen_medium1.iob b/core.trees/objects/evergreen/fantasy_evergreen_medium1.iob similarity index 100% rename from core.trees/objects/evergreen-medium/fantasy_evergreen_medium1.iob rename to core.trees/objects/evergreen/fantasy_evergreen_medium1.iob diff --git a/core.trees/objects/evergreen-medium/fantasy_evergreen_medium2.iob b/core.trees/objects/evergreen/fantasy_evergreen_medium2.iob similarity index 100% rename from core.trees/objects/evergreen-medium/fantasy_evergreen_medium2.iob rename to core.trees/objects/evergreen/fantasy_evergreen_medium2.iob diff --git a/core.trees/objects/evergreen-medium/fantasy_evergreen_medium3.iob b/core.trees/objects/evergreen/fantasy_evergreen_medium3.iob similarity index 100% rename from core.trees/objects/evergreen-medium/fantasy_evergreen_medium3.iob rename to core.trees/objects/evergreen/fantasy_evergreen_medium3.iob diff --git a/iris.overworld.infested/biomes/infested-rainforest.json b/iris.overworld.infested/biomes/infested-rainforest.json index 8905c563..139724b2 100644 --- a/iris.overworld.infested/biomes/infested-rainforest.json +++ b/iris.overworld.infested/biomes/infested-rainforest.json @@ -180,7 +180,7 @@ ], "generators":[ { - "generator": "plain", + "generator": "sharp", "min": 4, "max": 7 }, diff --git a/iris.overworld.infested/regions/infested.json b/iris.overworld.infested/regions/infested.json deleted file mode 100644 index 63085876..00000000 --- a/iris.overworld.infested/regions/infested.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "name": "Infested", - "biomeImplosionRatio": 0.25, - "shoreHeightMin": 3.2, - "shoreHeightMax": 9.2, - "shoreHeightZoom": 2.14, - "landBiomes": [ - "infested-rainforest" - ], - "seaBiomes": [ - "infested-ocean" - ], - "shoreBiomes": [ - "infested-beach" - ] -} \ No newline at end of file diff --git a/iris.overworld.swamp/regions/swamp.json b/iris.overworld.swamp/regions/swamp.json index bbaa85ab..3b661445 100644 --- a/iris.overworld.swamp/regions/swamp.json +++ b/iris.overworld.swamp/regions/swamp.json @@ -15,4 +15,5 @@ "swamp-beach" ] + } \ No newline at end of file diff --git a/iris.overworld.tundra/biomes/tundra-mountains.json b/iris.overworld.tundra/biomes/tundra-mountains.json index 763e0504..fbe9a1e0 100644 --- a/iris.overworld.tundra/biomes/tundra-mountains.json +++ b/iris.overworld.tundra/biomes/tundra-mountains.json @@ -33,6 +33,135 @@ "min": 1, "max": 3 } + ], + "objects": [ + { + "chance": 0.25, + "density": 1, + "rotation": { + "yAxis": { + "min": 0, + "max": 0, + "interval": 90, + "enabled": true + }, + "enabled": true + }, + "place": [ + "evergreen/fantasy_evergreen_large1", + "evergreen/fantasy_evergreen_large1", + "evergreen/fantasy_evergreen_medium1", + "evergreen/fantasy_evergreen_medium2", + "evergreen/fantasy_evergreen_medium3" + + ], + "translate": { + "x": 0, + "y": 0, + "z": 0 + } + }, + + { + "chance": 0.035, + "density": 1, + "rotation": { + "yAxis": { + "min": 0, + "max": 0, + "interval": 90, + "enabled": true + }, + "enabled": true + }, + "place": [ + "boulder/boulder1", + "boulder/boulder2", + "boulder/boulder3", + "boulder/boulder4", + "boulder/boulder5", + "boulder/boulder6", + "boulder/boulder7", + "boulder/boulder8", + "boulder/boulder9", + "boulder/boulder10", + "boulder/boulder11", + "boulder/boulder12", + "boulder/boulder13", + "boulder/boulder14", + "boulder/boulder15" + ], + "translate": { + "x": 0, + "y": -2, + "z": 0 + } + }, + { + "chance": 0.075, + "density": 1, + "rotation": { + "enabled": false + }, + "place": [ + "stump/stump1", + "stump/stump2", + "stump/stump3", + "stump/stump4", + "stump/stump5", + "stump/stump6" + ], + "translate": { + "x": 0, + "y": 0, + "z": 0 + } + }, + { + "chance": 0.625, + "density": 1, + "rotation": { + "yAxis": { + "min": 0, + "max": 0, + "interval": 90, + "enabled": true + }, + "xAxis": { + "min": -12, + "max": 12, + "interval": 1, + "enabled": true + }, + "zAxis": { + "min": -12, + "max": 12, + "interval": 90, + "enabled": true + }, + "enabled": true + }, + "place": [ + "pine/pine1", + "pine/pine2", + "pine/pine3", + "pine/pine4", + "pine/pine5", + "pine/pine6", + "pine/pine7", + "pine/pine8", + "pine/pine9", + "pine/pine10", + "pine/pine11", + "pine/pine12" + + ], + "translate": { + "x": 0, + "y": 0, + "z": 0 + } + } ], "decorators": [ { diff --git a/iris.overworld.tundra/biomes/tundra-redwoods.json b/iris.overworld.tundra/biomes/tundra-redwoods.json index 7855fd86..865ba258 100644 --- a/iris.overworld.tundra/biomes/tundra-redwoods.json +++ b/iris.overworld.tundra/biomes/tundra-redwoods.json @@ -34,7 +34,7 @@ ], "objects": [ { - "chance": 0.225, + "chance": 0.9, "density": 1, "rotation": { "yAxis": { @@ -65,31 +65,6 @@ "z": 0 } }, - { - "chance": 0.725, - "density": 3, - "rotation": { - "yAxis": { - "min": 0, - "max": 0, - "interval": 90, - "enabled": true - }, - "enabled": true - }, - "place": [ - "arid-pine/arid-pine1", - "arid-pine/arid-pine2", - "arid-pine/arid-pine3", - "arid-pine/arid-pine4", - "arid-pine/arid-pine5" - ], - "translate": { - "x": 0, - "y": 0, - "z": 0 - } - }, { "chance": 0.035, "density": 1, @@ -170,13 +145,19 @@ "enabled": true }, "place": [ - "boss-pine/boss-pine1", - "boss-pine/boss-pine2", - "boss-pine/boss-pine3", - "boss-pine/boss-pine4", - "boss-pine/boss-pine5", - "boss-pine/boss-pine6", - "boss-pine/boss-pine7" + "pine/pine1", + "pine/pine2", + "pine/pine3", + "pine/pine4", + "pine/pine5", + "pine/pine6", + "pine/pine7", + "pine/pine8", + "pine/pine9", + "pine/pine10", + "pine/pine11", + "pine/pine12" + ], "translate": { "x": 0, diff --git a/iris.overworld/dimensions/overworld.json b/iris.overworld/dimensions/overworld.json index 55147989..26167712 100644 --- a/iris.overworld/dimensions/overworld.json +++ b/iris.overworld/dimensions/overworld.json @@ -28,7 +28,6 @@ "tropical", "hot", "swamp", - "frozen", - "infested" + "frozen" ] } \ No newline at end of file