Repo-Mirror/Iris-Pack-Overworld
9
0
Fork 0
mirror of https://github.com/IrisDimensions/overworld.git synced 2025-12-29 19:59:20 +00:00
Code Issues Releases Activity

Revert "Fix"

Browse Source 
This reverts commit e9d26f186e.
This commit is contained in:
Dan Macbook
2020-08-12 12:33:37 -04:00
parent e9d26f186e
commit ca6eeca203
12 changed files with 202 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
overworld/biomes/hot-ocean.json
View File

@@ -125,8 +125,8 @@
"palette": [
"SEAGRASS"
],
"dispersion": "STATIC",
"variance": "STATIC"
"dispersion": "SCATTER",
"variance": "SCATTER"
},
{
"zoom": 1,
@@ -135,8 +135,8 @@
"SOUL_SAND",
"MAGMA_BLOCK"
],
"dispersion": "STATIC",
"variance": "STATIC"
"dispersion": "SCATTER",
"variance": "SCATTER"
},
{
"zoom": 5,
@@ -144,8 +144,8 @@
"palette": [
"SEAGRASS"
],
"dispersion": "STATIC",
"variance": "STATIC"
"dispersion": "SCATTER",
"variance": "SCATTER"
},
{
"zoom": 1,
@@ -157,8 +157,8 @@
],
"verticalVarience": "WISPY",
"verticalZoom": 88,
"dispersion": "STATIC",
"variance": "STATIC"
"dispersion": "SCATTER",
"variance": "SCATTER"
},
{
"zoom": 1,
@@ -168,10 +168,10 @@
"palette": [
"KELP_PLANT"
],
"verticalVarience": "STATIC",
"verticalVarience": "SCATTER",
"verticalZoom": 20,
"dispersion": "STATIC",
"variance": "STATIC"
"dispersion": "SCATTER",
"variance": "SCATTER"
},
{
"zoom": 1,
@@ -180,8 +180,8 @@
"FIRE_CORAL",
"FIRE_CORAL_FAN"
],
"dispersion": "STATIC",
"variance": "STATIC"
"dispersion": "SCATTER",
"variance": "SCATTER"
},
{
"zoom": 1,
@@ -189,8 +189,8 @@
"palette": [
"minecraft:sea_pickle[pickles=1,waterlogged=true]"
],
"dispersion": "STATIC",
"variance": "STATIC"
"dispersion": "SCATTER",
"variance": "SCATTER"
}
],
"generators":[

50
overworld/biomes/mushroom-ocean.json
View File

@@ -49,8 +49,8 @@
"LILY_PAD"
],
"partOf": "SEA_SURFACE",
"dispersion": "STATIC",
"variance": "STATIC"
"dispersion": "SCATTER",
"variance": "SCATTER"
},
{
"zoom": 20,
@@ -58,8 +58,8 @@
"palette": [
"SEAGRASS"
],
"dispersion": "STATIC",
"variance": "STATIC"
"dispersion": "SCATTER",
"variance": "SCATTER"
},
{
"zoom": 1,
@@ -68,8 +68,8 @@
"SOUL_SAND",
"MAGMA_BLOCK"
],
"dispersion": "STATIC",
"variance": "STATIC"
"dispersion": "SCATTER",
"variance": "SCATTER"
},
{
"zoom": 5,
@@ -77,8 +77,8 @@
"palette": [
"SEAGRASS"
],
"dispersion": "STATIC",
"variance": "STATIC"
"dispersion": "SCATTER",
"variance": "SCATTER"
},
{
"zoom": 1,
@@ -90,8 +90,8 @@
],
"verticalVarience": "WISPY",
"verticalZoom": 88,
"dispersion": "STATIC",
"variance": "STATIC"
"dispersion": "SCATTER",
"variance": "SCATTER"
},
{
"zoom": 1,
@@ -101,10 +101,10 @@
"palette": [
"KELP_PLANT"
],
"verticalVarience": "STATIC",
"verticalVarience": "SCATTER",
"verticalZoom": 20,
"dispersion": "STATIC",
"variance": "STATIC"
"dispersion": "SCATTER",
"variance": "SCATTER"
},
{
"zoom": 1,
@@ -113,8 +113,8 @@
"TUBE_CORAL",
"TUBE_CORAL_FAN"
],
"dispersion": "STATIC",
"variance": "STATIC"
"dispersion": "SCATTER",
"variance": "SCATTER"
},
{
"zoom": 1,
@@ -123,8 +123,8 @@
"BRAIN_CORAL",
"BRAIN_CORAL_FAN"
],
"dispersion": "STATIC",
"variance": "STATIC"
"dispersion": "SCATTER",
"variance": "SCATTER"
},
{
"zoom": 1,
@@ -133,8 +133,8 @@
"BUBBLE_CORAL",
"BUBBLE_CORAL_FAN"
],
"dispersion": "STATIC",
"variance": "STATIC"
"dispersion": "SCATTER",
"variance": "SCATTER"
},
{
"zoom": 1,
@@ -143,8 +143,8 @@
"FIRE_CORAL",
"FIRE_CORAL_FAN"
],
"dispersion": "STATIC",
"variance": "STATIC"
"dispersion": "SCATTER",
"variance": "SCATTER"
},
{
"zoom": 1,
@@ -153,8 +153,8 @@
"HORN_CORAL",
"HORN_CORAL_FAN"
],
"dispersion": "STATIC",
"variance": "STATIC"
"dispersion": "SCATTER",
"variance": "SCATTER"
},
{
"zoom": 1,
@@ -162,8 +162,8 @@
"palette": [
"minecraft:sea_pickle[pickles=1,waterlogged=true]"
],
"dispersion": "STATIC",
"variance": "STATIC"
"dispersion": "SCATTER",
"variance": "SCATTER"
}
],
"wall":

46
overworld/biomes/rocky-ocean.json
View File

@@ -119,8 +119,8 @@
"palette": [
"SEAGRASS"
],
"dispersion": "STATIC",
"variance": "STATIC"
"dispersion": "SCATTER",
"variance": "SCATTER"
},
{
"zoom": 1,
@@ -129,8 +129,8 @@
"SOUL_SAND",
"MAGMA_BLOCK"
],
"dispersion": "STATIC",
"variance": "STATIC"
"dispersion": "SCATTER",
"variance": "SCATTER"
},
{
"zoom": 5,
@@ -138,8 +138,8 @@
"palette": [
"SEAGRASS"
],
"dispersion": "STATIC",
"variance": "STATIC"
"dispersion": "SCATTER",
"variance": "SCATTER"
},
{
"zoom": 1,
@@ -151,8 +151,8 @@
],
"verticalVarience": "WISPY",
"verticalZoom": 88,
"dispersion": "STATIC",
"variance": "STATIC"
"dispersion": "SCATTER",
"variance": "SCATTER"
},
{
"zoom": 1,
@@ -162,10 +162,10 @@
"palette": [
"KELP_PLANT"
],
"verticalVarience": "STATIC",
"verticalVarience": "SCATTER",
"verticalZoom": 20,
"dispersion": "STATIC",
"variance": "STATIC"
"dispersion": "SCATTER",
"variance": "SCATTER"
},
{
"zoom": 1,
@@ -174,8 +174,8 @@
"TUBE_CORAL",
"TUBE_CORAL_FAN"
],
"dispersion": "STATIC",
"variance": "STATIC"
"dispersion": "SCATTER",
"variance": "SCATTER"
},
{
"zoom": 1,
@@ -184,8 +184,8 @@
"BRAIN_CORAL",
"BRAIN_CORAL_FAN"
],
"dispersion": "STATIC",
"variance": "STATIC"
"dispersion": "SCATTER",
"variance": "SCATTER"
},
{
"zoom": 1,
@@ -194,8 +194,8 @@
"BUBBLE_CORAL",
"BUBBLE_CORAL_FAN"
],
"dispersion": "STATIC",
"variance": "STATIC"
"dispersion": "SCATTER",
"variance": "SCATTER"
},
{
"zoom": 1,
@@ -204,8 +204,8 @@
"FIRE_CORAL",
"FIRE_CORAL_FAN"
],
"dispersion": "STATIC",
"variance": "STATIC"
"dispersion": "SCATTER",
"variance": "SCATTER"
},
{
"zoom": 1,
@@ -214,8 +214,8 @@
"HORN_CORAL",
"HORN_CORAL_FAN"
],
"dispersion": "STATIC",
"variance": "STATIC"
"dispersion": "SCATTER",
"variance": "SCATTER"
},
{
"zoom": 1,
@@ -223,8 +223,8 @@
"palette": [
"minecraft:sea_pickle[pickles=1,waterlogged=true]"
],
"dispersion": "STATIC",
"variance": "STATIC"
"dispersion": "SCATTER",
"variance": "SCATTER"
}
],

51
overworld/biomes/swamp-ocean.json
View File

@@ -135,8 +135,9 @@
"LILY_PAD"
],
"partOf": "SEA_SURFACE",
"dispersion": "STATIC",
"variance": "STATIC"
<<<<<<< Updated upstream
"dispersion": "SCATTER",
"variance": "SCATTER"
},
{
"zoom": 20,
@@ -144,8 +145,8 @@
"palette": [
"SEAGRASS"
],
"dispersion": "STATIC",
"variance": "STATIC"
"dispersion": "SCATTER",
"variance": "SCATTER"
},
{
"zoom": 1,
@@ -154,8 +155,8 @@
"SOUL_SAND",
"MAGMA_BLOCK"
],
"dispersion": "STATIC",
"variance": "STATIC"
"dispersion": "SCATTER",
"variance": "SCATTER"
},
{
"zoom": 5,
@@ -163,8 +164,8 @@
"palette": [
"SEAGRASS"
],
"dispersion": "STATIC",
"variance": "STATIC"
"dispersion": "SCATTER",
"variance": "SCATTER"
},
{
"zoom": 1,
@@ -176,8 +177,8 @@
],
"verticalVarience": "WISPY",
"verticalZoom": 88,
"dispersion": "STATIC",
"variance": "STATIC"
"dispersion": "SCATTER",
"variance": "SCATTER"
},
{
"zoom": 1,
@@ -187,10 +188,10 @@
"palette": [
"KELP_PLANT"
],
"verticalVarience": "STATIC",
"verticalVarience": "SCATTER",
"verticalZoom": 20,
"dispersion": "STATIC",
"variance": "STATIC"
"dispersion": "SCATTER",
"variance": "SCATTER"
},
{
"zoom": 1,
@@ -199,8 +200,8 @@
"TUBE_CORAL",
"TUBE_CORAL_FAN"
],
"dispersion": "STATIC",
"variance": "STATIC"
"dispersion": "SCATTER",
"variance": "SCATTER"
},
{
"zoom": 1,
@@ -209,8 +210,8 @@
"BRAIN_CORAL",
"BRAIN_CORAL_FAN"
],
"dispersion": "STATIC",
"variance": "STATIC"
"dispersion": "SCATTER",
"variance": "SCATTER"
},
{
"zoom": 1,
@@ -219,8 +220,8 @@
"BUBBLE_CORAL",
"BUBBLE_CORAL_FAN"
],
"dispersion": "STATIC",
"variance": "STATIC"
"dispersion": "SCATTER",
"variance": "SCATTER"
},
{
"zoom": 1,
@@ -229,8 +230,8 @@
"FIRE_CORAL",
"FIRE_CORAL_FAN"
],
"dispersion": "STATIC",
"variance": "STATIC"
"dispersion": "SCATTER",
"variance": "SCATTER"
},
{
"zoom": 1,
@@ -239,8 +240,8 @@
"HORN_CORAL",
"HORN_CORAL_FAN"
],
"dispersion": "STATIC",
"variance": "STATIC"
"dispersion": "SCATTER",
"variance": "SCATTER"
},
{
"zoom": 1,
@@ -248,8 +249,12 @@
"palette": [
"minecraft:sea_pickle[pickles=1,waterlogged=true]"
],
"dispersion": "SCATTER",
"variance": "SCATTER"
=======
"dispersion": "STATIC",
"variance": "STATIC"
>>>>>>> Stashed changes
}
],
"wall":

46
overworld/biomes/temperate-ocean.json
View File

@@ -134,8 +134,8 @@
"palette": [
"SEAGRASS"
],
"dispersion": "STATIC",
"variance": "STATIC"
"dispersion": "SCATTER",
"variance": "SCATTER"
},
{
"zoom": 1,
@@ -144,8 +144,8 @@
"SOUL_SAND",
"MAGMA_BLOCK"
],
"dispersion": "STATIC",
"variance": "STATIC"
"dispersion": "SCATTER",
"variance": "SCATTER"
},
{
"zoom": 5,
@@ -153,8 +153,8 @@
"palette": [
"SEAGRASS"
],
"dispersion": "STATIC",
"variance": "STATIC"
"dispersion": "SCATTER",
"variance": "SCATTER"
},
{
"zoom": 1,
@@ -166,8 +166,8 @@
],
"verticalVarience": "WISPY",
"verticalZoom": 88,
"dispersion": "STATIC",
"variance": "STATIC"
"dispersion": "SCATTER",
"variance": "SCATTER"
},
{
"zoom": 1,
@@ -177,10 +177,10 @@
"palette": [
"KELP_PLANT"
],
"verticalVarience": "STATIC",
"verticalVarience": "SCATTER",
"verticalZoom": 20,
"dispersion": "STATIC",
"variance": "STATIC"
"dispersion": "SCATTER",
"variance": "SCATTER"
},
{
"zoom": 1,
@@ -189,8 +189,8 @@
"TUBE_CORAL",
"TUBE_CORAL_FAN"
],
"dispersion": "STATIC",
"variance": "STATIC"
"dispersion": "SCATTER",
"variance": "SCATTER"
},
{
"zoom": 1,
@@ -199,8 +199,8 @@
"BRAIN_CORAL",
"BRAIN_CORAL_FAN"
],
"dispersion": "STATIC",
"variance": "STATIC"
"dispersion": "SCATTER",
"variance": "SCATTER"
},
{
"zoom": 1,
@@ -209,8 +209,8 @@
"BUBBLE_CORAL",
"BUBBLE_CORAL_FAN"
],
"dispersion": "STATIC",
"variance": "STATIC"
"dispersion": "SCATTER",
"variance": "SCATTER"
},
{
"zoom": 1,
@@ -219,8 +219,8 @@
"FIRE_CORAL",
"FIRE_CORAL_FAN"
],
"dispersion": "STATIC",
"variance": "STATIC"
"dispersion": "SCATTER",
"variance": "SCATTER"
},
{
"zoom": 1,
@@ -229,8 +229,8 @@
"HORN_CORAL",
"HORN_CORAL_FAN"
],
"dispersion": "STATIC",
"variance": "STATIC"
"dispersion": "SCATTER",
"variance": "SCATTER"
},
{
"zoom": 1,
@@ -238,8 +238,8 @@
"palette": [
"minecraft:sea_pickle[pickles=1,waterlogged=true]"
],
"dispersion": "STATIC",
"variance": "STATIC"
"dispersion": "SCATTER",
"variance": "SCATTER"
}
],
"slab": {

24
overworld/biomes/tropical-coral-ocean-cliffs.json
View File

@@ -190,6 +190,30 @@
],
"childShrinkFactor": 1.1,
"decorators":[
{
"chance": 0.01,
"density": 1,
"underwater": true,
"rotation": {
"yAxis": {
"min": 0,
"max": 0,
"interval": 90,
"enabled": true
},
"enabled": true
},
"place": [
"ships/swreck-1",
"ships/usd-ship-1",
"ships/usd-ship-2"
],
"translate": {
"x": 0,
"y": -2,
"z": 0
}
},
{
"zoom": 1,
"chance": 0.05,

46
overworld/biomes/tundra-ocean.json
View File

@@ -88,8 +88,8 @@
"palette": [
"SEAGRASS"
],
"dispersion": "STATIC",
"variance": "STATIC"
"dispersion": "SCATTER",
"variance": "SCATTER"
},
{
"zoom": 1,
@@ -98,8 +98,8 @@
"SOUL_SAND",
"MAGMA_BLOCK"
],
"dispersion": "STATIC",
"variance": "STATIC"
"dispersion": "SCATTER",
"variance": "SCATTER"
},
{
"zoom": 5,
@@ -107,8 +107,8 @@
"palette": [
"SEAGRASS"
],
"dispersion": "STATIC",
"variance": "STATIC"
"dispersion": "SCATTER",
"variance": "SCATTER"
},
{
"zoom": 1,
@@ -120,8 +120,8 @@
],
"verticalVarience": "WISPY",
"verticalZoom": 88,
"dispersion": "STATIC",
"variance": "STATIC"
"dispersion": "SCATTER",
"variance": "SCATTER"
},
{
"zoom": 1,
@@ -131,10 +131,10 @@
"palette": [
"KELP_PLANT"
],
"verticalVarience": "STATIC",
"verticalVarience": "SCATTER",
"verticalZoom": 20,
"dispersion": "STATIC",
"variance": "STATIC"
"dispersion": "SCATTER",
"variance": "SCATTER"
},
{
"zoom": 1,
@@ -143,8 +143,8 @@
"TUBE_CORAL",
"TUBE_CORAL_FAN"
],
"dispersion": "STATIC",
"variance": "STATIC"
"dispersion": "SCATTER",
"variance": "SCATTER"
},
{
"zoom": 1,
@@ -153,8 +153,8 @@
"BRAIN_CORAL",
"BRAIN_CORAL_FAN"
],
"dispersion": "STATIC",
"variance": "STATIC"
"dispersion": "SCATTER",
"variance": "SCATTER"
},
{
"zoom": 1,
@@ -163,8 +163,8 @@
"BUBBLE_CORAL",
"BUBBLE_CORAL_FAN"
],
"dispersion": "STATIC",
"variance": "STATIC"
"dispersion": "SCATTER",
"variance": "SCATTER"
},
{
"zoom": 1,
@@ -173,8 +173,8 @@
"FIRE_CORAL",
"FIRE_CORAL_FAN"
],
"dispersion": "STATIC",
"variance": "STATIC"
"dispersion": "SCATTER",
"variance": "SCATTER"
},
{
"zoom": 1,
@@ -183,8 +183,8 @@
"HORN_CORAL",
"HORN_CORAL_FAN"
],
"dispersion": "STATIC",
"variance": "STATIC"
"dispersion": "SCATTER",
"variance": "SCATTER"
},
{
"zoom": 1,
@@ -192,8 +192,8 @@
"palette": [
"minecraft:sea_pickle[pickles=1,waterlogged=true]"
],
"dispersion": "STATIC",
"variance": "STATIC"
"dispersion": "SCATTER",
"variance": "SCATTER"
}
],
"generators":[

2
overworld/biomes/tundra-redwood-cliffs.json
View File

@@ -39,7 +39,7 @@
},
"objects": [
{
"chance": 1,
"chance": 2,
"density": 1,
"rotation": {
"yAxis": {

2
overworld/biomes/tundra-redwoods.json
View File

@@ -63,7 +63,7 @@
}
},
{
"chance": 1,
"chance": 2,
"density": 1,
"rotation": {
"yAxis": {

25
overworld/biomes/tundra-taiga.json
View File

@@ -115,6 +115,31 @@
"y": 0,
"z": 0
}
},
{
"chance": 0.0625,
"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
}
}
],
"decorators": [

2
overworld/dimensions/overworld.json
View File

@@ -1,6 +1,4 @@
{
"name": "Overworld",
"version": 1,
"environment": "NORMAL",
"regions": [
"hot",

14
overworld/overworld.code-workspace
View File

@@ -1509,6 +1509,7 @@
"ENTITY_PARROT_IMITATE_MAGMA_CUBE",
"ENTITY_PARROT_IMITATE_PHANTOM",
"ENTITY_PARROT_IMITATE_PIGLIN",
"ENTITY_PARROT_IMITATE_PIGLIN_BRUTE",
"ENTITY_PARROT_IMITATE_PILLAGER",
"ENTITY_PARROT_IMITATE_RAVAGER",
"ENTITY_PARROT_IMITATE_SHULKER",
@@ -1535,6 +1536,12 @@
"ENTITY_PIGLIN_ADMIRING_ITEM",
"ENTITY_PIGLIN_AMBIENT",
"ENTITY_PIGLIN_ANGRY",
"ENTITY_PIGLIN_BRUTE_AMBIENT",
"ENTITY_PIGLIN_BRUTE_ANGRY",
"ENTITY_PIGLIN_BRUTE_CONVERTED_TO_ZOMBIFIED",
"ENTITY_PIGLIN_BRUTE_DEATH",
"ENTITY_PIGLIN_BRUTE_HURT",
"ENTITY_PIGLIN_BRUTE_STEP",
"ENTITY_PIGLIN_CELEBRATE",
"ENTITY_PIGLIN_CONVERTED_TO_ZOMBIFIED",
"ENTITY_PIGLIN_DEATH",
@@ -3506,6 +3513,7 @@
"ENTITY_PARROT_IMITATE_MAGMA_CUBE",
"ENTITY_PARROT_IMITATE_PHANTOM",
"ENTITY_PARROT_IMITATE_PIGLIN",
"ENTITY_PARROT_IMITATE_PIGLIN_BRUTE",
"ENTITY_PARROT_IMITATE_PILLAGER",
"ENTITY_PARROT_IMITATE_RAVAGER",
"ENTITY_PARROT_IMITATE_SHULKER",
@@ -3532,6 +3540,12 @@
"ENTITY_PIGLIN_ADMIRING_ITEM",
"ENTITY_PIGLIN_AMBIENT",
"ENTITY_PIGLIN_ANGRY",
"ENTITY_PIGLIN_BRUTE_AMBIENT",
"ENTITY_PIGLIN_BRUTE_ANGRY",
"ENTITY_PIGLIN_BRUTE_CONVERTED_TO_ZOMBIFIED",
"ENTITY_PIGLIN_BRUTE_DEATH",
"ENTITY_PIGLIN_BRUTE_HURT",
"ENTITY_PIGLIN_BRUTE_STEP",
"ENTITY_PIGLIN_CELEBRATE",
"ENTITY_PIGLIN_CONVERTED_TO_ZOMBIFIED",
"ENTITY_PIGLIN_DEATH",