WIP Venus Stuff (#1469)
* - Yeast recipe conflict fix * - Fixed seed oil voiding in barrels. And item weight inconsistency. * - Reduced loading screen logo size by 4MB * - Update Changelog * - Compressed loading screen images to maybe help with ram * - Added default gui scale to make the main menu look better on first launch * - Update Changelog * - Added utility script for adding circuits to existing recipes * fixed changelog conflict Signed-off-by: Redeix <59435925+Redeix@users.noreply.github.com> * - Added harvest baskets * - Fixed baked potato recipe mixing from oven * - Allowed elytras to be repaired regardless of damage * - Fixed sea water barrel recipe * - Gave plants tags to bushes so they can have other uses * - Pushed stubborn models * - updated Changelog * - Changelog typo * - Integrated Ad Astra wood * - Updated changelog * - Treated chipboard composite barrel lang * - Some Tacz fixes * - Jar dupe fix * - tacz data * - updated changelog * - we hate git * - Loading screen and main menu optimizations * - image push * - I think I got the title screen looking good on all resolutions * - Updated Changelog * - Added scale fix to loading screen too * - Fix pixel alignment * - Recipes, tags, assets+ for railgun * - Brick interaction events and new function for interacting with blocks * - Added parameter boolean to decide if blockstate should be copied * - Change for block interaction event constant that may fix linux crash * - Moved global array to the events file and some linter fixes. * - Updated Changelog * - Some more model fixes and remove gtceu metal armor * - always a stubborn file * - Large Solar Panel Change * - WIP venus stuff --------- Signed-off-by: Redeix <59435925+Redeix@users.noreply.github.com> Signed-off-by: Pyritie <pyritie@gmail.com> Co-authored-by: Pyritie <pyritie@gmail.com>
This commit is contained in:
parent
f61a6615dd
commit
695b6c2451
26 changed files with 861 additions and 81 deletions
|
|
@ -0,0 +1,34 @@
|
|||
{
|
||||
"feature": "tfg:venus/terrain/lake_basalt_gravel",
|
||||
"placement": [
|
||||
{
|
||||
"type": "minecraft:count",
|
||||
"count": 256
|
||||
},
|
||||
{
|
||||
"type": "minecraft:in_square"
|
||||
},
|
||||
{
|
||||
"type": "minecraft:height_range",
|
||||
"height": {
|
||||
"type": "minecraft:uniform",
|
||||
"min_inclusive": {
|
||||
"absolute": 67
|
||||
},
|
||||
"max_inclusive": {
|
||||
"absolute": 70
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"type": "minecraft:block_predicate_filter",
|
||||
"predicate": {
|
||||
"type": "minecraft:matching_fluids",
|
||||
"fluids": "tfg:geyser_slurry"
|
||||
}
|
||||
},
|
||||
{
|
||||
"type": "minecraft:biome"
|
||||
}
|
||||
]
|
||||
}
|
||||
|
|
@ -0,0 +1,34 @@
|
|||
{
|
||||
"feature": "tfg:venus/terrain/lake_basalt_stone",
|
||||
"placement": [
|
||||
{
|
||||
"type": "minecraft:count",
|
||||
"count": 228
|
||||
},
|
||||
{
|
||||
"type": "minecraft:in_square"
|
||||
},
|
||||
{
|
||||
"type": "minecraft:height_range",
|
||||
"height": {
|
||||
"type": "minecraft:uniform",
|
||||
"min_inclusive": {
|
||||
"absolute": 67
|
||||
},
|
||||
"max_inclusive": {
|
||||
"absolute": 70
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"type": "minecraft:block_predicate_filter",
|
||||
"predicate": {
|
||||
"type": "minecraft:matching_fluids",
|
||||
"fluids": "tfg:geyser_slurry"
|
||||
}
|
||||
},
|
||||
{
|
||||
"type": "minecraft:biome"
|
||||
}
|
||||
]
|
||||
}
|
||||
|
|
@ -0,0 +1,34 @@
|
|||
{
|
||||
"feature": "tfg:venus/terrain/lake_geyserite",
|
||||
"placement": [
|
||||
{
|
||||
"type": "minecraft:count",
|
||||
"count": 228
|
||||
},
|
||||
{
|
||||
"type": "minecraft:in_square"
|
||||
},
|
||||
{
|
||||
"type": "minecraft:height_range",
|
||||
"height": {
|
||||
"type": "minecraft:uniform",
|
||||
"min_inclusive": {
|
||||
"absolute": 67
|
||||
},
|
||||
"max_inclusive": {
|
||||
"absolute": 70
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"type": "minecraft:block_predicate_filter",
|
||||
"predicate": {
|
||||
"type": "minecraft:matching_fluids",
|
||||
"fluids": "tfg:geyser_slurry"
|
||||
}
|
||||
},
|
||||
{
|
||||
"type": "minecraft:biome"
|
||||
}
|
||||
]
|
||||
}
|
||||
|
|
@ -0,0 +1,38 @@
|
|||
{
|
||||
"feature": "tfg:venus/terrain/lake_orange_sand",
|
||||
"placement": [
|
||||
{
|
||||
"type": "minecraft:count",
|
||||
"count": 4
|
||||
},
|
||||
{
|
||||
"type": "minecraft:count",
|
||||
"count": 82
|
||||
},
|
||||
{
|
||||
"type": "minecraft:in_square"
|
||||
},
|
||||
{
|
||||
"type": "minecraft:height_range",
|
||||
"height": {
|
||||
"type": "minecraft:uniform",
|
||||
"min_inclusive": {
|
||||
"absolute": 67
|
||||
},
|
||||
"max_inclusive": {
|
||||
"absolute": 70
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"type": "minecraft:block_predicate_filter",
|
||||
"predicate": {
|
||||
"type": "minecraft:matching_fluids",
|
||||
"fluids": "tfg:geyser_slurry"
|
||||
}
|
||||
},
|
||||
{
|
||||
"type": "minecraft:biome"
|
||||
}
|
||||
]
|
||||
}
|
||||
|
|
@ -0,0 +1,38 @@
|
|||
{
|
||||
"feature": "tfg:venus/terrain/lake_yellow_sand",
|
||||
"placement": [
|
||||
{
|
||||
"type": "minecraft:count",
|
||||
"count": 188
|
||||
},
|
||||
{
|
||||
"type": "minecraft:count",
|
||||
"count": 6
|
||||
},
|
||||
{
|
||||
"type": "minecraft:in_square"
|
||||
},
|
||||
{
|
||||
"type": "minecraft:height_range",
|
||||
"height": {
|
||||
"type": "minecraft:uniform",
|
||||
"min_inclusive": {
|
||||
"absolute": 68
|
||||
},
|
||||
"max_inclusive": {
|
||||
"absolute": 68
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"type": "minecraft:block_predicate_filter",
|
||||
"predicate": {
|
||||
"type": "minecraft:matching_fluids",
|
||||
"fluids": "tfg:geyser_slurry"
|
||||
}
|
||||
},
|
||||
{
|
||||
"type": "minecraft:biome"
|
||||
}
|
||||
]
|
||||
}
|
||||
400
kubejs/data/tfg/worldgen/placed_feature/venus/terrain/lakes.json
Normal file
400
kubejs/data/tfg/worldgen/placed_feature/venus/terrain/lakes.json
Normal file
|
|
@ -0,0 +1,400 @@
|
|||
{
|
||||
"feature": "tfg:venus/terrain/lakes",
|
||||
"placement": [
|
||||
{
|
||||
"type": "minecraft:count",
|
||||
"count": 20
|
||||
},
|
||||
{
|
||||
"type": "minecraft:count",
|
||||
"count": 30
|
||||
},
|
||||
{
|
||||
"type": "minecraft:in_square"
|
||||
},
|
||||
{
|
||||
"type": "minecraft:heightmap",
|
||||
"heightmap": "WORLD_SURFACE_WG"
|
||||
},
|
||||
{
|
||||
"type": "minecraft:biome"
|
||||
},
|
||||
{
|
||||
"type": "count",
|
||||
"count": {
|
||||
"type": "minecraft:uniform",
|
||||
"value": {
|
||||
"min_inclusive": 5,
|
||||
"max_inclusive": 5
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"type": "minecraft:random_offset",
|
||||
"xz_spread": {
|
||||
"type": "minecraft:uniform",
|
||||
"value": {
|
||||
"min_inclusive": -4,
|
||||
"max_inclusive": 4
|
||||
}
|
||||
},
|
||||
"y_spread": 0
|
||||
},
|
||||
{
|
||||
"type": "environment_scan",
|
||||
"direction_of_search": "down",
|
||||
"max_steps": 6,
|
||||
"target_condition": {
|
||||
"type": "minecraft:all_of",
|
||||
"predicates": [
|
||||
{
|
||||
"type": "minecraft:not",
|
||||
"predicate": {
|
||||
"type": "minecraft:any_of",
|
||||
"predicates": [
|
||||
{
|
||||
"type": "minecraft:matching_blocks",
|
||||
"offset": [
|
||||
-1,
|
||||
0,
|
||||
0
|
||||
],
|
||||
"blocks": [
|
||||
"tfc:rock/hardened/basalt",
|
||||
"tfg:sand/fluorapatite/orange",
|
||||
"tfg:rock/raw/geyserite",
|
||||
"minecraft:air",
|
||||
"minecraft:lava"
|
||||
]
|
||||
},
|
||||
{
|
||||
"type": "minecraft:matching_blocks",
|
||||
"offset": [
|
||||
1,
|
||||
0,
|
||||
0
|
||||
],
|
||||
"blocks": [
|
||||
"tfc:rock/hardened/basalt",
|
||||
"tfg:sand/fluorapatite/orange",
|
||||
"tfg:rock/raw/geyserite",
|
||||
"minecraft:air",
|
||||
"minecraft:lava"
|
||||
]
|
||||
},
|
||||
{
|
||||
"type": "minecraft:matching_blocks",
|
||||
"offset": [
|
||||
0,
|
||||
0,
|
||||
-1
|
||||
],
|
||||
"blocks": [
|
||||
"tfc:rock/hardened/basalt",
|
||||
"tfg:sand/fluorapatite/orange",
|
||||
"tfg:rock/raw/geyserite",
|
||||
"minecraft:air",
|
||||
"minecraft:lava"
|
||||
]
|
||||
},
|
||||
{
|
||||
"type": "minecraft:matching_blocks",
|
||||
"offset": [
|
||||
0,
|
||||
0,
|
||||
1
|
||||
],
|
||||
"blocks": [
|
||||
"tfc:rock/hardened/basalt",
|
||||
"tfg:sand/fluorapatite/orange",
|
||||
"tfg:rock/raw/geyserite",
|
||||
"minecraft:air",
|
||||
"minecraft:lava"
|
||||
]
|
||||
},
|
||||
{
|
||||
"type": "minecraft:matching_blocks",
|
||||
"offset": [
|
||||
-1,
|
||||
0,
|
||||
-1
|
||||
],
|
||||
"blocks": [
|
||||
"tfc:rock/hardened/basalt",
|
||||
"tfg:sand/fluorapatite/orange",
|
||||
"tfg:rock/raw/geyserite",
|
||||
"minecraft:air",
|
||||
"minecraft:lava"
|
||||
]
|
||||
},
|
||||
{
|
||||
"type": "minecraft:matching_blocks",
|
||||
"offset": [
|
||||
1,
|
||||
0,
|
||||
1
|
||||
],
|
||||
"blocks": [
|
||||
"tfc:rock/hardened/basalt",
|
||||
"tfg:sand/fluorapatite/orange",
|
||||
"tfg:rock/raw/geyserite",
|
||||
"minecraft:air",
|
||||
"minecraft:lava"
|
||||
]
|
||||
},
|
||||
{
|
||||
"type": "minecraft:matching_blocks",
|
||||
"offset": [
|
||||
1,
|
||||
0,
|
||||
-1
|
||||
],
|
||||
"blocks": [
|
||||
"tfc:rock/hardened/basalt",
|
||||
"tfg:sand/fluorapatite/orange",
|
||||
"tfg:rock/raw/geyserite",
|
||||
"minecraft:air",
|
||||
"minecraft:lava"
|
||||
]
|
||||
},
|
||||
{
|
||||
"type": "minecraft:matching_blocks",
|
||||
"offset": [
|
||||
-1,
|
||||
0,
|
||||
1
|
||||
],
|
||||
"blocks": [
|
||||
"tfc:rock/hardened/basalt",
|
||||
"tfg:sand/fluorapatite/orange",
|
||||
"tfg:rock/raw/geyserite",
|
||||
"minecraft:air",
|
||||
"minecraft:lava"
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
},
|
||||
{
|
||||
"type": "minecraft:matching_blocks",
|
||||
"offset": [
|
||||
0,
|
||||
0,
|
||||
0
|
||||
],
|
||||
"blocks": [
|
||||
"tfg:sand/fluorapatite/green",
|
||||
"tfg:sandstone/raw/fluorapatite/green",
|
||||
"tfg:sand/fluorapatite/white",
|
||||
"tfg:sandstone/raw/fluorapatite/white",
|
||||
"tfg:sand/fluorapatite/blue",
|
||||
"tfg:sandstone/raw/fluorapatite/blue",
|
||||
"tfc:deposit/native_silver/chert",
|
||||
"tfc:deposit/native_gold/chert"
|
||||
]
|
||||
},
|
||||
{
|
||||
"type": "minecraft:not",
|
||||
"predicate": {
|
||||
"type": "minecraft:any_of",
|
||||
"predicates": [
|
||||
{
|
||||
"type": "minecraft:matching_blocks",
|
||||
"offset": [
|
||||
-1,
|
||||
1,
|
||||
0
|
||||
],
|
||||
"blocks": [
|
||||
"tfc:rock/gravel/basalt",
|
||||
"tfc:rock/hardened/basalt",
|
||||
"tfg:rock/raw/geyserite",
|
||||
"tfg:sand/fluorapatite/orange",
|
||||
|
||||
"tfg:sand/fluorapatite/green",
|
||||
"tfg:sandstone/raw/fluorapatite/green",
|
||||
"tfg:sand/fluorapatite/white",
|
||||
"tfg:sandstone/raw/fluorapatite/white",
|
||||
"tfg:sand/fluorapatite/blue",
|
||||
"tfg:sandstone/raw/fluorapatite/blue",
|
||||
"tfc:deposit/native_silver/chert",
|
||||
"tfc:deposit/native_gold/chert",
|
||||
"minecraft:lava"
|
||||
]
|
||||
},
|
||||
{
|
||||
"type": "minecraft:matching_blocks",
|
||||
"offset": [
|
||||
1,
|
||||
1,
|
||||
0
|
||||
],
|
||||
"blocks": [
|
||||
"tfc:rock/gravel/basalt",
|
||||
"tfc:rock/hardened/basalt",
|
||||
"tfg:rock/raw/geyserite",
|
||||
"tfg:sand/fluorapatite/orange",
|
||||
|
||||
"tfg:sand/fluorapatite/green",
|
||||
"tfg:sandstone/raw/fluorapatite/green",
|
||||
"tfg:sand/fluorapatite/white",
|
||||
"tfg:sandstone/raw/fluorapatite/white",
|
||||
"tfg:sand/fluorapatite/blue",
|
||||
"tfg:sandstone/raw/fluorapatite/blue",
|
||||
"tfc:deposit/native_silver/chert",
|
||||
"tfc:deposit/native_gold/chert",
|
||||
"minecraft:lava"
|
||||
]
|
||||
},
|
||||
{
|
||||
"type": "minecraft:matching_blocks",
|
||||
"offset": [
|
||||
0,
|
||||
1,
|
||||
-1
|
||||
],
|
||||
"blocks": [
|
||||
"tfc:rock/gravel/basalt",
|
||||
"tfc:rock/hardened/basalt",
|
||||
"tfg:rock/raw/geyserite",
|
||||
"tfg:sand/fluorapatite/orange",
|
||||
|
||||
"tfg:sand/fluorapatite/green",
|
||||
"tfg:sandstone/raw/fluorapatite/green",
|
||||
"tfg:sand/fluorapatite/white",
|
||||
"tfg:sandstone/raw/fluorapatite/white",
|
||||
"tfg:sand/fluorapatite/blue",
|
||||
"tfg:sandstone/raw/fluorapatite/blue",
|
||||
"tfc:deposit/native_silver/chert",
|
||||
"tfc:deposit/native_gold/chert",
|
||||
"minecraft:lava"
|
||||
]
|
||||
},
|
||||
{
|
||||
"type": "minecraft:matching_blocks",
|
||||
"offset": [
|
||||
0,
|
||||
1,
|
||||
1
|
||||
],
|
||||
"blocks": [
|
||||
"tfc:rock/gravel/basalt",
|
||||
"tfc:rock/hardened/basalt",
|
||||
"tfg:rock/raw/geyserite",
|
||||
"tfg:sand/fluorapatite/orange",
|
||||
|
||||
"tfg:sand/fluorapatite/green",
|
||||
"tfg:sandstone/raw/fluorapatite/green",
|
||||
"tfg:sand/fluorapatite/white",
|
||||
"tfg:sandstone/raw/fluorapatite/white",
|
||||
"tfg:sand/fluorapatite/blue",
|
||||
"tfg:sandstone/raw/fluorapatite/blue",
|
||||
"tfc:deposit/native_silver/chert",
|
||||
"tfc:deposit/native_gold/chert",
|
||||
"minecraft:lava"
|
||||
]
|
||||
},
|
||||
{
|
||||
"type": "minecraft:matching_blocks",
|
||||
"offset": [
|
||||
-1,
|
||||
1,
|
||||
-1
|
||||
],
|
||||
"blocks": [
|
||||
"tfc:rock/gravel/basalt",
|
||||
"tfc:rock/hardened/basalt",
|
||||
"tfg:rock/raw/geyserite",
|
||||
"tfg:sand/fluorapatite/orange",
|
||||
|
||||
"tfg:sand/fluorapatite/green",
|
||||
"tfg:sandstone/raw/fluorapatite/green",
|
||||
"tfg:sand/fluorapatite/white",
|
||||
"tfg:sandstone/raw/fluorapatite/white",
|
||||
"tfg:sand/fluorapatite/blue",
|
||||
"tfg:sandstone/raw/fluorapatite/blue",
|
||||
"tfc:deposit/native_silver/chert",
|
||||
"tfc:deposit/native_gold/chert",
|
||||
"minecraft:lava"
|
||||
]
|
||||
},
|
||||
{
|
||||
"type": "minecraft:matching_blocks",
|
||||
"offset": [
|
||||
-1,
|
||||
1,
|
||||
1
|
||||
],
|
||||
"blocks": [
|
||||
"tfc:rock/gravel/basalt",
|
||||
"tfc:rock/hardened/basalt",
|
||||
"tfg:rock/raw/geyserite",
|
||||
"tfg:sand/fluorapatite/orange",
|
||||
|
||||
"tfg:sand/fluorapatite/green",
|
||||
"tfg:sandstone/raw/fluorapatite/green",
|
||||
"tfg:sand/fluorapatite/white",
|
||||
"tfg:sandstone/raw/fluorapatite/white",
|
||||
"tfg:sand/fluorapatite/blue",
|
||||
"tfg:sandstone/raw/fluorapatite/blue",
|
||||
"tfc:deposit/native_silver/chert",
|
||||
"tfc:deposit/native_gold/chert",
|
||||
"minecraft:lava"
|
||||
]
|
||||
},
|
||||
{
|
||||
"type": "minecraft:matching_blocks",
|
||||
"offset": [
|
||||
1,
|
||||
1,
|
||||
-1
|
||||
],
|
||||
"blocks": [
|
||||
"tfc:rock/gravel/basalt",
|
||||
"tfc:rock/hardened/basalt",
|
||||
"tfg:rock/raw/geyserite",
|
||||
"tfg:sand/fluorapatite/orange",
|
||||
|
||||
"tfg:sand/fluorapatite/green",
|
||||
"tfg:sandstone/raw/fluorapatite/green",
|
||||
"tfg:sand/fluorapatite/white",
|
||||
"tfg:sandstone/raw/fluorapatite/white",
|
||||
"tfg:sand/fluorapatite/blue",
|
||||
"tfg:sandstone/raw/fluorapatite/blue",
|
||||
"tfc:deposit/native_silver/chert",
|
||||
"tfc:deposit/native_gold/chert",
|
||||
"minecraft:lava"
|
||||
]
|
||||
},
|
||||
{
|
||||
"type": "minecraft:matching_blocks",
|
||||
"offset": [
|
||||
1,
|
||||
1,
|
||||
1
|
||||
],
|
||||
"blocks": [
|
||||
"tfc:rock/gravel/basalt",
|
||||
"tfc:rock/hardened/basalt",
|
||||
"tfg:rock/raw/geyserite",
|
||||
"tfg:sand/fluorapatite/orange",
|
||||
|
||||
"tfg:sand/fluorapatite/green",
|
||||
"tfg:sandstone/raw/fluorapatite/green",
|
||||
"tfg:sand/fluorapatite/white",
|
||||
"tfg:sandstone/raw/fluorapatite/white",
|
||||
"tfg:sand/fluorapatite/blue",
|
||||
"tfg:sandstone/raw/fluorapatite/blue",
|
||||
"tfc:deposit/native_silver/chert",
|
||||
"tfc:deposit/native_gold/chert",
|
||||
"minecraft:lava"
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
|
|
@ -0,0 +1,35 @@
|
|||
{
|
||||
"feature": "tfg:venus/terrain/lava_delta",
|
||||
"placement": [
|
||||
{
|
||||
"type": "minecraft:count",
|
||||
"count": 1
|
||||
},
|
||||
{
|
||||
"type": "minecraft:rarity_filter",
|
||||
"chance": 3
|
||||
},
|
||||
{
|
||||
"type": "minecraft:height_range",
|
||||
"height": {
|
||||
"type": "minecraft:uniform",
|
||||
"max_inclusive": {
|
||||
"absolute": 200
|
||||
},
|
||||
"min_inclusive": {
|
||||
"above_bottom": 54
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"type": "minecraft:heightmap",
|
||||
"heightmap": "WORLD_SURFACE"
|
||||
},
|
||||
{
|
||||
"type": "minecraft:in_square"
|
||||
},
|
||||
{
|
||||
"type": "minecraft:biome"
|
||||
}
|
||||
]
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue