9
0
mirror of https://github.com/IrisDimensions/overworld.git synced 2025-12-30 04:09:18 +00:00

Revert "Auto stash before merge of "master" and "origin/master""

This reverts commit 29ed23a26f.
This commit is contained in:
Dan Macbook
2020-08-12 12:29:49 -04:00
parent ca6eeca203
commit 84e12212c8
82 changed files with 878 additions and 1413 deletions

View File

@@ -419,32 +419,6 @@
"type": "number",
"minimum": 1.0E-4
},
"rockStyle": {
"description": "The noise style for rock types",
"type": "string",
"enum": [
"STATIC",
"STATIC_FINE",
"STATIC_ULTRA_FINE",
"IRIS",
"SIMPLEX",
"BIOCTAVE_SIMPLEX",
"TRIOCTAVE_SIMPLEX",
"QUADOCTAVE_SIMPLEX",
"QUINTOCTAVE_SIMPLEX",
"SEXOCTAVE_SIMPLEX",
"SEPTOCTAVE_SIMPLEX",
"OCTOCTAVE_SIMPLEX",
"NONOCTAVE_SIMPLEX",
"VIGOCTAVE_SIMPLEX",
"CELLULAR",
"CELLULAR_IRIS",
"PERTERB",
"PERTERB_IRIS",
"VASCULAR",
"VASCULAR_IRIS"
]
},
"rockZoom": {
"maximum": 512,
"description": "The rock zoom mostly for zooming in on a wispy palette",
@@ -513,32 +487,6 @@
"description": "The ceiling dimension. Leave blank for normal sky.",
"type": "string"
},
"fluidStyle": {
"description": "The noise style for fluid types",
"type": "string",
"enum": [
"STATIC",
"STATIC_FINE",
"STATIC_ULTRA_FINE",
"IRIS",
"SIMPLEX",
"BIOCTAVE_SIMPLEX",
"TRIOCTAVE_SIMPLEX",
"QUADOCTAVE_SIMPLEX",
"QUINTOCTAVE_SIMPLEX",
"SEXOCTAVE_SIMPLEX",
"SEPTOCTAVE_SIMPLEX",
"OCTOCTAVE_SIMPLEX",
"NONOCTAVE_SIMPLEX",
"VIGOCTAVE_SIMPLEX",
"CELLULAR",
"CELLULAR_IRIS",
"PERTERB",
"PERTERB_IRIS",
"VASCULAR",
"VASCULAR_IRIS"
]
},
"postProcessors": {
"minItems": 1,
"description": "Post Processors",
@@ -592,6 +540,14 @@
"type": "array",
"items": {"$ref": "#/definitions/irisdepositgenerator"}
},
"rockDispersion": {
"description": "The dispersion of materials for the rock palette",
"type": "string",
"enum": [
"SCATTER",
"WISPY"
]
},
"vanillaStructures": {
"description": "Generate vanilla structures",
"type": "boolean"
@@ -2105,26 +2061,16 @@
"description": "The varience dispersion is used when multiple blocks are put in the palette. Scatter scrambles them, Wispy shows streak-looking varience",
"type": "string",
"enum": [
"STATIC",
"STATIC_FINE",
"STATIC_ULTRA_FINE",
"IRIS",
"SIMPLEX",
"BIOCTAVE_SIMPLEX",
"TRIOCTAVE_SIMPLEX",
"QUADOCTAVE_SIMPLEX",
"QUINTOCTAVE_SIMPLEX",
"SEXOCTAVE_SIMPLEX",
"SEPTOCTAVE_SIMPLEX",
"OCTOCTAVE_SIMPLEX",
"NONOCTAVE_SIMPLEX",
"VIGOCTAVE_SIMPLEX",
"CELLULAR",
"CELLULAR_IRIS",
"PERTERB",
"PERTERB_IRIS",
"VASCULAR",
"VASCULAR_IRIS"
"SCATTER",
"WISPY"
]
},
"verticalVariance": {
"description": "If this decorator has a height more than 1 this changes how it picks the height between your maxes. Scatter = random, Wispy = wavy heights",
"type": "string",
"enum": [
"SCATTER",
"WISPY"
]
},
"stackMax": {
@@ -2134,7 +2080,7 @@
"minimum": 1
},
"zoom": {
"description": "The zoom is for zooming in or out wispy dispersions. Makes patches bigger the higher this zoom value is",
"description": "The zoom is for zooming in or out wispy dispersions. Makes patches bigger the higher this zoom value is/",
"type": "number",
"minimum": 1.0E-4
},
@@ -2144,63 +2090,14 @@
"type": "array",
"items": {"type": "string"}
},
"heightVariance": {
"description": "If this decorator has a height more than 1 this changes how it picks the height between your maxes. Scatter = random, Wispy = wavy heights",
"type": "string",
"enum": [
"STATIC",
"STATIC_FINE",
"STATIC_ULTRA_FINE",
"IRIS",
"SIMPLEX",
"BIOCTAVE_SIMPLEX",
"TRIOCTAVE_SIMPLEX",
"QUADOCTAVE_SIMPLEX",
"QUINTOCTAVE_SIMPLEX",
"SEXOCTAVE_SIMPLEX",
"SEPTOCTAVE_SIMPLEX",
"OCTOCTAVE_SIMPLEX",
"NONOCTAVE_SIMPLEX",
"VIGOCTAVE_SIMPLEX",
"CELLULAR",
"CELLULAR_IRIS",
"PERTERB",
"PERTERB_IRIS",
"VASCULAR",
"VASCULAR_IRIS"
]
},
"dispersion": {
"description": "Dispersion is used to pick places to spawn. Scatter randomly places them (vanilla) or Wispy for a streak like patch system.",
"type": "string",
"enum": [
"STATIC",
"STATIC_FINE",
"STATIC_ULTRA_FINE",
"IRIS",
"SIMPLEX",
"BIOCTAVE_SIMPLEX",
"TRIOCTAVE_SIMPLEX",
"QUADOCTAVE_SIMPLEX",
"QUINTOCTAVE_SIMPLEX",
"SEXOCTAVE_SIMPLEX",
"SEPTOCTAVE_SIMPLEX",
"OCTOCTAVE_SIMPLEX",
"NONOCTAVE_SIMPLEX",
"VIGOCTAVE_SIMPLEX",
"CELLULAR",
"CELLULAR_IRIS",
"PERTERB",
"PERTERB_IRIS",
"VASCULAR",
"VASCULAR_IRIS"
"SCATTER",
"WISPY"
]
},
"varianceZoom": {
"description": "The zoom is for zooming in or out variance. Makes patches have more or less of one type.",
"type": "number",
"minimum": 1.0E-4
},
"stackMin": {
"maximum": 256,
"description": "The minimum repeat stack height (setting to 3 would stack 3 of <block> on top of each other",
@@ -2223,48 +2120,30 @@
"type": "integer",
"minimum": 0
},
"terrainZoom": {
"description": "The terrain zoom mostly for zooming in on a wispy palette",
"type": "number",
"minimum": 1.0E-4
},
"maxHeight": {
"maximum": 256,
"description": "The max thickness of this layer",
"type": "integer",
"minimum": 1
},
"style": {
"description": "The style of noise",
"type": "string",
"enum": [
"STATIC",
"STATIC_FINE",
"STATIC_ULTRA_FINE",
"IRIS",
"SIMPLEX",
"BIOCTAVE_SIMPLEX",
"TRIOCTAVE_SIMPLEX",
"QUADOCTAVE_SIMPLEX",
"QUINTOCTAVE_SIMPLEX",
"SEXOCTAVE_SIMPLEX",
"SEPTOCTAVE_SIMPLEX",
"OCTOCTAVE_SIMPLEX",
"NONOCTAVE_SIMPLEX",
"VIGOCTAVE_SIMPLEX",
"CELLULAR",
"CELLULAR_IRIS",
"PERTERB",
"PERTERB_IRIS",
"VASCULAR",
"VASCULAR_IRIS"
]
},
"zoom": {
"description": "The terrain zoom mostly for zooming in on a wispy palette",
"type": "number",
"minimum": 1.0E-4
},
"palette": {
"minItems": 1,
"description": "The palette of blocks to be used in this layer",
"type": "array",
"items": {"type": "string"}
},
"dispersion": {
"description": "The dispersion of materials from the palette",
"type": "string",
"enum": [
"SCATTER",
"WISPY"
]
}
},
"required": ["palette"]
@@ -2537,6 +2416,14 @@
"type": "array",
"items": {"$ref": "#/definitions/irisstructureplacement"}
},
"biomeDispersion": {
"description": "This changes the dispersion of the biome colors if multiple derivatives are chosen.",
"type": "string",
"enum": [
"SCATTER",
"WISPY"
]
},
"derivative": {
"description": "The raw derivative of this biome. This is required or the terrain will not properly generate. Use any vanilla biome type. Look in examples/biome-list.txt",
"type": "string",
@@ -2622,32 +2509,6 @@
"BASALT_DELTAS"
]
},
"biomeStyle": {
"description": "This changes the dispersion of the biome colors if multiple derivatives are chosen.",
"type": "string",
"enum": [
"STATIC",
"STATIC_FINE",
"STATIC_ULTRA_FINE",
"IRIS",
"SIMPLEX",
"BIOCTAVE_SIMPLEX",
"TRIOCTAVE_SIMPLEX",
"QUADOCTAVE_SIMPLEX",
"QUINTOCTAVE_SIMPLEX",
"SEXOCTAVE_SIMPLEX",
"SEPTOCTAVE_SIMPLEX",
"OCTOCTAVE_SIMPLEX",
"NONOCTAVE_SIMPLEX",
"VIGOCTAVE_SIMPLEX",
"CELLULAR",
"CELLULAR_IRIS",
"PERTERB",
"PERTERB_IRIS",
"VASCULAR",
"VASCULAR_IRIS"
]
},
"deposits": {
"minItems": 1,
"description": "Define biome deposit generators that add onto the existing regional and global deposit generators",
@@ -2664,48 +2525,30 @@
"type": "integer",
"minimum": 0
},
"terrainZoom": {
"description": "The terrain zoom mostly for zooming in on a wispy palette",
"type": "number",
"minimum": 1.0E-4
},
"maxHeight": {
"maximum": 256,
"description": "The max thickness of this layer",
"type": "integer",
"minimum": 1
},
"style": {
"description": "The style of noise",
"type": "string",
"enum": [
"STATIC",
"STATIC_FINE",
"STATIC_ULTRA_FINE",
"IRIS",
"SIMPLEX",
"BIOCTAVE_SIMPLEX",
"TRIOCTAVE_SIMPLEX",
"QUADOCTAVE_SIMPLEX",
"QUINTOCTAVE_SIMPLEX",
"SEXOCTAVE_SIMPLEX",
"SEPTOCTAVE_SIMPLEX",
"OCTOCTAVE_SIMPLEX",
"NONOCTAVE_SIMPLEX",
"VIGOCTAVE_SIMPLEX",
"CELLULAR",
"CELLULAR_IRIS",
"PERTERB",
"PERTERB_IRIS",
"VASCULAR",
"VASCULAR_IRIS"
]
},
"zoom": {
"description": "The terrain zoom mostly for zooming in on a wispy palette",
"type": "number",
"minimum": 1.0E-4
},
"palette": {
"minItems": 1,
"description": "The palette of blocks to be used in this layer",
"type": "array",
"items": {"type": "string"}
},
"dispersion": {
"description": "The dispersion of materials from the palette",
"type": "string",
"enum": [
"SCATTER",
"WISPY"
]
}
}
},
@@ -2768,48 +2611,30 @@
"type": "integer",
"minimum": 0
},
"terrainZoom": {
"description": "The terrain zoom mostly for zooming in on a wispy palette",
"type": "number",
"minimum": 1.0E-4
},
"maxHeight": {
"maximum": 256,
"description": "The max thickness of this layer",
"type": "integer",
"minimum": 1
},
"style": {
"description": "The style of noise",
"type": "string",
"enum": [
"STATIC",
"STATIC_FINE",
"STATIC_ULTRA_FINE",
"IRIS",
"SIMPLEX",
"BIOCTAVE_SIMPLEX",
"TRIOCTAVE_SIMPLEX",
"QUADOCTAVE_SIMPLEX",
"QUINTOCTAVE_SIMPLEX",
"SEXOCTAVE_SIMPLEX",
"SEPTOCTAVE_SIMPLEX",
"OCTOCTAVE_SIMPLEX",
"NONOCTAVE_SIMPLEX",
"VIGOCTAVE_SIMPLEX",
"CELLULAR",
"CELLULAR_IRIS",
"PERTERB",
"PERTERB_IRIS",
"VASCULAR",
"VASCULAR_IRIS"
]
},
"zoom": {
"description": "The terrain zoom mostly for zooming in on a wispy palette",
"type": "number",
"minimum": 1.0E-4
},
"palette": {
"minItems": 1,
"description": "The palette of blocks to be used in this layer",
"type": "array",
"items": {"type": "string"}
},
"dispersion": {
"description": "The dispersion of materials from the palette",
"type": "string",
"enum": [
"SCATTER",
"WISPY"
]
}
}
},
@@ -4167,48 +3992,30 @@
"type": "integer",
"minimum": 0
},
"terrainZoom": {
"description": "The terrain zoom mostly for zooming in on a wispy palette",
"type": "number",
"minimum": 1.0E-4
},
"maxHeight": {
"maximum": 256,
"description": "The max thickness of this layer",
"type": "integer",
"minimum": 1
},
"style": {
"description": "The style of noise",
"type": "string",
"enum": [
"STATIC",
"STATIC_FINE",
"STATIC_ULTRA_FINE",
"IRIS",
"SIMPLEX",
"BIOCTAVE_SIMPLEX",
"TRIOCTAVE_SIMPLEX",
"QUADOCTAVE_SIMPLEX",
"QUINTOCTAVE_SIMPLEX",
"SEXOCTAVE_SIMPLEX",
"SEPTOCTAVE_SIMPLEX",
"OCTOCTAVE_SIMPLEX",
"NONOCTAVE_SIMPLEX",
"VIGOCTAVE_SIMPLEX",
"CELLULAR",
"CELLULAR_IRIS",
"PERTERB",
"PERTERB_IRIS",
"VASCULAR",
"VASCULAR_IRIS"
]
},
"zoom": {
"description": "The terrain zoom mostly for zooming in on a wispy palette",
"type": "number",
"minimum": 1.0E-4
},
"palette": {
"minItems": 1,
"description": "The palette of blocks to be used in this layer",
"type": "array",
"items": {"type": "string"}
},
"dispersion": {
"description": "The dispersion of materials from the palette",
"type": "string",
"enum": [
"SCATTER",
"WISPY"
]
}
}
},
@@ -4286,48 +4093,30 @@
"type": "integer",
"minimum": 0
},
"terrainZoom": {
"description": "The terrain zoom mostly for zooming in on a wispy palette",
"type": "number",
"minimum": 1.0E-4
},
"maxHeight": {
"maximum": 256,
"description": "The max thickness of this layer",
"type": "integer",
"minimum": 1
},
"style": {
"description": "The style of noise",
"type": "string",
"enum": [
"STATIC",
"STATIC_FINE",
"STATIC_ULTRA_FINE",
"IRIS",
"SIMPLEX",
"BIOCTAVE_SIMPLEX",
"TRIOCTAVE_SIMPLEX",
"QUADOCTAVE_SIMPLEX",
"QUINTOCTAVE_SIMPLEX",
"SEXOCTAVE_SIMPLEX",
"SEPTOCTAVE_SIMPLEX",
"OCTOCTAVE_SIMPLEX",
"NONOCTAVE_SIMPLEX",
"VIGOCTAVE_SIMPLEX",
"CELLULAR",
"CELLULAR_IRIS",
"PERTERB",
"PERTERB_IRIS",
"VASCULAR",
"VASCULAR_IRIS"
]
},
"zoom": {
"description": "The terrain zoom mostly for zooming in on a wispy palette",
"type": "number",
"minimum": 1.0E-4
},
"palette": {
"minItems": 1,
"description": "The palette of blocks to be used in this layer",
"type": "array",
"items": {"type": "string"}
},
"dispersion": {
"description": "The dispersion of materials from the palette",
"type": "string",
"enum": [
"SCATTER",
"WISPY"
]
}
}
},
@@ -4634,31 +4423,9 @@
"description": "Height output offset y",
"type": "number"
},
"style": {
"description": "The Noise Style",
"type": "string",
"enum": [
"STATIC",
"STATIC_FINE",
"STATIC_ULTRA_FINE",
"IRIS",
"SIMPLEX",
"BIOCTAVE_SIMPLEX",
"TRIOCTAVE_SIMPLEX",
"QUADOCTAVE_SIMPLEX",
"QUINTOCTAVE_SIMPLEX",
"SEXOCTAVE_SIMPLEX",
"SEPTOCTAVE_SIMPLEX",
"OCTOCTAVE_SIMPLEX",
"NONOCTAVE_SIMPLEX",
"VIGOCTAVE_SIMPLEX",
"CELLULAR",
"CELLULAR_IRIS",
"PERTERB",
"PERTERB_IRIS",
"VASCULAR",
"VASCULAR_IRIS"
]
"irisBased": {
"description": "If this generator uses the default iris swirly/wispy noise generator. Set to false for pure simplex.",
"type": "boolean"
},
"opacity": {
"description": "The output multiplier",
@@ -4760,31 +4527,9 @@
"description": "Height output offset y",
"type": "number"
},
"style": {
"description": "The Noise Style",
"type": "string",
"enum": [
"STATIC",
"STATIC_FINE",
"STATIC_ULTRA_FINE",
"IRIS",
"SIMPLEX",
"BIOCTAVE_SIMPLEX",
"TRIOCTAVE_SIMPLEX",
"QUADOCTAVE_SIMPLEX",
"QUINTOCTAVE_SIMPLEX",
"SEXOCTAVE_SIMPLEX",
"SEPTOCTAVE_SIMPLEX",
"OCTOCTAVE_SIMPLEX",
"NONOCTAVE_SIMPLEX",
"VIGOCTAVE_SIMPLEX",
"CELLULAR",
"CELLULAR_IRIS",
"PERTERB",
"PERTERB_IRIS",
"VASCULAR",
"VASCULAR_IRIS"
]
"irisBased": {
"description": "If this generator uses the default iris swirly/wispy noise generator. Set to false for pure simplex.",
"type": "boolean"
},
"opacity": {
"description": "The output multiplier",