Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev
This commit is contained in:
Xikaro
commit
d9979bae64
46 changed files with 2084 additions and 2090 deletions
|
|
@ -0,0 +1,7 @@
|
|||
{
|
||||
"variants": {
|
||||
"": {
|
||||
"model": "tfg:block/casings/electromagnetic_accelerator"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,7 @@
|
|||
{
|
||||
"variants": {
|
||||
"": {
|
||||
"model": "tfg:block/casings/superconductor_coil_large"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,7 @@
|
|||
{
|
||||
"variants": {
|
||||
"": {
|
||||
"model": "tfg:block/casings/superconductor_coil_small"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -282,6 +282,9 @@
|
|||
"block.tfg.sandstone.stairs.smooth.fluorapatite.yellow": "Smooth Yellow Fluorapatite Sandstone Stairs",
|
||||
"block.tfg.sandstone.fluorapatite.yellow": "Cut Yellow Fluorapatite Sandstone",
|
||||
"block.tfg.sandstone.smooth.chiseled.fluorapatite.yellow": "Chiseled Yellow Fluorapatite Sandstone",
|
||||
"block.tfg.electromagnetic_accelerator": "Electromagnetic Accelerator",
|
||||
"block.tfg.superconductor_coil_large": "Large Superconductor Coil",
|
||||
"block.tfg.superconductor_coil_small": "Small Superconductor Coil",
|
||||
"tfg:nether_slurry": "Nether Slurry",
|
||||
"tfg:enriched_nether_slurry": "Enriched Nether Slurry",
|
||||
"tfg:ender_slurry": "Ender Slurry",
|
||||
|
|
|
|||
|
|
@ -0,0 +1 @@
|
|||
{"parent":"minecraft:block/cube_all","textures":{"all":"tfg:block/casings/electromagnetic_accelerator"}}
|
||||
|
|
@ -0,0 +1 @@
|
|||
{"parent":"minecraft:block/cube_all","textures":{"all":"tfg:block/casings/superconductor_coil_large"}}
|
||||
|
|
@ -0,0 +1 @@
|
|||
{"parent":"minecraft:block/cube_all","textures":{"all":"tfg:block/casings/superconductor_coil_small"}}
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
{
|
||||
"parent": "tfg:block/casings/electromagnetic_accelerator"
|
||||
}
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
{
|
||||
"parent": "tfg:block/casings/superconductor_coil_large"
|
||||
}
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
{
|
||||
"parent": "tfg:block/casings/superconductor_coil_small"
|
||||
}
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 7 KiB |
|
|
@ -0,0 +1,12 @@
|
|||
{
|
||||
"animation": {
|
||||
"frametime": 1
|
||||
},
|
||||
"ldlib": {
|
||||
"connection": "tfg:block/casings/electromagnetic_accelerator_ctm",
|
||||
"emissive": true
|
||||
},
|
||||
"shimmer": {
|
||||
"bloom": true
|
||||
}
|
||||
}
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 16 KiB |
|
|
@ -0,0 +1,8 @@
|
|||
{
|
||||
"animation": {
|
||||
"frametime": 1
|
||||
},
|
||||
"shimmer": {
|
||||
"bloom": true
|
||||
}
|
||||
}
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 566 B |
|
|
@ -0,0 +1,5 @@
|
|||
{
|
||||
"ldlib": {
|
||||
"connection": "tfg:block/casings/superconductor_coil_large_ctm"
|
||||
}
|
||||
}
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 816 B |
Binary file not shown.
|
After Width: | Height: | Size: 524 B |
|
|
@ -0,0 +1,5 @@
|
|||
{
|
||||
"ldlib": {
|
||||
"connection": "tfg:block/casings/superconductor_coil_small_ctm"
|
||||
}
|
||||
}
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 631 B |
|
|
@ -33,10 +33,7 @@
|
|||
"tfg:earth/geode/pyrite",
|
||||
"tfg:earth/geode/quartzite"
|
||||
],
|
||||
[
|
||||
"tfc:vein/gabbro_dike",
|
||||
"tfc:vein/diorite_dike"
|
||||
],
|
||||
[],
|
||||
[],
|
||||
[],
|
||||
"#tfg:mars_veins",
|
||||
|
|
|
|||
|
|
@ -33,10 +33,7 @@
|
|||
"tfg:earth/geode/pyrite",
|
||||
"tfg:earth/geode/quartzite"
|
||||
],
|
||||
[
|
||||
"tfc:vein/gabbro_dike",
|
||||
"tfc:vein/diorite_dike"
|
||||
],
|
||||
[],
|
||||
[],
|
||||
[],
|
||||
"#tfg:mars_veins",
|
||||
|
|
|
|||
|
|
@ -33,10 +33,7 @@
|
|||
"tfg:earth/geode/pyrite",
|
||||
"tfg:earth/geode/quartzite"
|
||||
],
|
||||
[
|
||||
"tfc:vein/gabbro_dike",
|
||||
"tfc:vein/diorite_dike"
|
||||
],
|
||||
[],
|
||||
[],
|
||||
[],
|
||||
"#tfg:mars_veins",
|
||||
|
|
|
|||
|
|
@ -1,70 +0,0 @@
|
|||
{
|
||||
"type": "minecraft:cache_once",
|
||||
"argument": {
|
||||
"type": "minecraft:min",
|
||||
"argument1": {
|
||||
"type": "minecraft:add",
|
||||
"argument1": {
|
||||
"type": "minecraft:add",
|
||||
"argument1": 0.37,
|
||||
"argument2": {
|
||||
"type": "minecraft:noise",
|
||||
"noise": "minecraft:cave_entrance",
|
||||
"xz_scale": 0.5,
|
||||
"y_scale": 0.25
|
||||
}
|
||||
},
|
||||
"argument2": {
|
||||
"type": "minecraft:y_clamped_gradient",
|
||||
"from_value": 0.2,
|
||||
"from_y": -10,
|
||||
"to_value": 0,
|
||||
"to_y": 30
|
||||
}
|
||||
},
|
||||
"argument2": {
|
||||
"type": "minecraft:add",
|
||||
"argument1": "minecraft:overworld/caves/spaghetti_roughness_function",
|
||||
"argument2": {
|
||||
"type": "minecraft:clamp",
|
||||
"input": {
|
||||
"type": "minecraft:add",
|
||||
"argument1": {
|
||||
"type": "minecraft:max",
|
||||
"argument1": {
|
||||
"type": "minecraft:weird_scaled_sampler",
|
||||
"input": {
|
||||
"type": "minecraft:cache_once",
|
||||
"argument": {
|
||||
"type": "minecraft:noise",
|
||||
"noise": "minecraft:spaghetti_3d_rarity",
|
||||
"xz_scale": 2,
|
||||
"y_scale": 1
|
||||
}
|
||||
},
|
||||
"noise": "minecraft:spaghetti_3d_1",
|
||||
"rarity_value_mapper": "type_1"
|
||||
},
|
||||
"argument2": {
|
||||
"type": "minecraft:weird_scaled_sampler",
|
||||
"input": {
|
||||
"type": "minecraft:cache_once",
|
||||
"argument": {
|
||||
"type": "minecraft:noise",
|
||||
"noise": "minecraft:spaghetti_3d_rarity",
|
||||
"xz_scale": 2,
|
||||
"y_scale": 1
|
||||
}
|
||||
},
|
||||
"noise": "minecraft:spaghetti_3d_2",
|
||||
"rarity_value_mapper": "type_1"
|
||||
}
|
||||
},
|
||||
"argument2": 0
|
||||
},
|
||||
"max": 1,
|
||||
"min": -1
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,94 +0,0 @@
|
|||
{
|
||||
"type": "minecraft:range_choice",
|
||||
"input": {
|
||||
"type": "minecraft:interpolated",
|
||||
"argument": {
|
||||
"type": "minecraft:range_choice",
|
||||
"input": "minecraft:y",
|
||||
"max_exclusive": 321.0,
|
||||
"min_inclusive": -30.0,
|
||||
"when_in_range": {
|
||||
"type": "minecraft:noise",
|
||||
"noise": "minecraft:noodle",
|
||||
"xz_scale": 1.0,
|
||||
"y_scale": 1.0
|
||||
},
|
||||
"when_out_of_range": -1.0
|
||||
}
|
||||
},
|
||||
"max_exclusive": 0.0,
|
||||
"min_inclusive": -1000000.0,
|
||||
"when_in_range": 64.0,
|
||||
"when_out_of_range": {
|
||||
"type": "minecraft:add",
|
||||
"argument1": {
|
||||
"type": "minecraft:interpolated",
|
||||
"argument": {
|
||||
"type": "minecraft:range_choice",
|
||||
"input": "minecraft:y",
|
||||
"max_exclusive": 321.0,
|
||||
"min_inclusive": -60.0,
|
||||
"when_in_range": {
|
||||
"type": "minecraft:add",
|
||||
"argument1": -0.07500000000000001,
|
||||
"argument2": {
|
||||
"type": "minecraft:mul",
|
||||
"argument1": -0.025,
|
||||
"argument2": {
|
||||
"type": "minecraft:noise",
|
||||
"noise": "minecraft:noodle_thickness",
|
||||
"xz_scale": 1.0,
|
||||
"y_scale": 1.0
|
||||
}
|
||||
}
|
||||
},
|
||||
"when_out_of_range": 0.0
|
||||
}
|
||||
},
|
||||
"argument2": {
|
||||
"type": "minecraft:mul",
|
||||
"argument1": 1.5,
|
||||
"argument2": {
|
||||
"type": "minecraft:max",
|
||||
"argument1": {
|
||||
"type": "minecraft:abs",
|
||||
"argument": {
|
||||
"type": "minecraft:interpolated",
|
||||
"argument": {
|
||||
"type": "minecraft:range_choice",
|
||||
"input": "minecraft:y",
|
||||
"max_exclusive": 321.0,
|
||||
"min_inclusive": -60.0,
|
||||
"when_in_range": {
|
||||
"type": "minecraft:noise",
|
||||
"noise": "minecraft:noodle_ridge_a",
|
||||
"xz_scale": 2.6666666666666665,
|
||||
"y_scale": 2.6666666666666665
|
||||
},
|
||||
"when_out_of_range": 0.0
|
||||
}
|
||||
}
|
||||
},
|
||||
"argument2": {
|
||||
"type": "minecraft:abs",
|
||||
"argument": {
|
||||
"type": "minecraft:interpolated",
|
||||
"argument": {
|
||||
"type": "minecraft:range_choice",
|
||||
"input": "minecraft:y",
|
||||
"max_exclusive": 321.0,
|
||||
"min_inclusive": -60.0,
|
||||
"when_in_range": {
|
||||
"type": "minecraft:noise",
|
||||
"noise": "minecraft:noodle_ridge_b",
|
||||
"xz_scale": 2.6666666666666665,
|
||||
"y_scale": 2.6666666666666665
|
||||
},
|
||||
"when_out_of_range": 0.0
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,50 +0,0 @@
|
|||
{
|
||||
"type": "minecraft:cache_once",
|
||||
"argument": {
|
||||
"type": "minecraft:mul",
|
||||
"argument1": {
|
||||
"type": "minecraft:add",
|
||||
"argument1": {
|
||||
"type": "minecraft:mul",
|
||||
"argument1": 2.0,
|
||||
"argument2": {
|
||||
"type": "minecraft:noise",
|
||||
"noise": "minecraft:pillar",
|
||||
"xz_scale": 25.0,
|
||||
"y_scale": 0.3
|
||||
}
|
||||
},
|
||||
"argument2": {
|
||||
"type": "minecraft:add",
|
||||
"argument1": -1.0,
|
||||
"argument2": {
|
||||
"type": "minecraft:mul",
|
||||
"argument1": -1.0,
|
||||
"argument2": {
|
||||
"type": "minecraft:noise",
|
||||
"noise": "minecraft:pillar_rareness",
|
||||
"xz_scale": 1.0,
|
||||
"y_scale": 1.0
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"argument2": {
|
||||
"type": "minecraft:cube",
|
||||
"argument": {
|
||||
"type": "minecraft:add",
|
||||
"argument1": 0.55,
|
||||
"argument2": {
|
||||
"type": "minecraft:mul",
|
||||
"argument1": 0.55,
|
||||
"argument2": {
|
||||
"type": "minecraft:noise",
|
||||
"noise": "minecraft:pillar_thickness",
|
||||
"xz_scale": 1.0,
|
||||
"y_scale": 1.0
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,61 +0,0 @@
|
|||
{
|
||||
"type": "minecraft:clamp",
|
||||
"input": {
|
||||
"type": "minecraft:max",
|
||||
"argument1": {
|
||||
"type": "minecraft:add",
|
||||
"argument1": {
|
||||
"type": "minecraft:weird_scaled_sampler",
|
||||
"input": {
|
||||
"type": "minecraft:noise",
|
||||
"noise": "minecraft:spaghetti_2d_modulator",
|
||||
"xz_scale": 2.0,
|
||||
"y_scale": 1.0
|
||||
},
|
||||
"noise": "minecraft:spaghetti_2d",
|
||||
"rarity_value_mapper": "type_2"
|
||||
},
|
||||
"argument2": {
|
||||
"type": "minecraft:mul",
|
||||
"argument1": 0.083,
|
||||
"argument2": "tfg:mars/caves/spaghetti_2d_thickness_modulator"
|
||||
}
|
||||
},
|
||||
"argument2": {
|
||||
"type": "minecraft:cube",
|
||||
"argument": {
|
||||
"type": "minecraft:add",
|
||||
"argument1": {
|
||||
"type": "minecraft:abs",
|
||||
"argument": {
|
||||
"type": "minecraft:add",
|
||||
"argument1": {
|
||||
"type": "minecraft:add",
|
||||
"argument1": 0.0,
|
||||
"argument2": {
|
||||
"type": "minecraft:mul",
|
||||
"argument1": 8.0,
|
||||
"argument2": {
|
||||
"type": "minecraft:noise",
|
||||
"noise": "minecraft:spaghetti_2d_elevation",
|
||||
"xz_scale": 1.0,
|
||||
"y_scale": 0.0
|
||||
}
|
||||
}
|
||||
},
|
||||
"argument2": {
|
||||
"type": "minecraft:y_clamped_gradient",
|
||||
"from_value": 8.0,
|
||||
"from_y": -32,
|
||||
"to_value": -20.0,
|
||||
"to_y": 320
|
||||
}
|
||||
}
|
||||
},
|
||||
"argument2": "tfg:mars/caves/spaghetti_2d_thickness_modulator"
|
||||
}
|
||||
}
|
||||
},
|
||||
"max": 1.0,
|
||||
"min": -1.0
|
||||
}
|
||||
|
|
@ -1,17 +0,0 @@
|
|||
{
|
||||
"type": "minecraft:cache_once",
|
||||
"argument": {
|
||||
"type": "minecraft:add",
|
||||
"argument1": -0.95,
|
||||
"argument2": {
|
||||
"type": "minecraft:mul",
|
||||
"argument1": -0.35000000000000003,
|
||||
"argument2": {
|
||||
"type": "minecraft:noise",
|
||||
"noise": "minecraft:spaghetti_2d_thickness",
|
||||
"xz_scale": 2.0,
|
||||
"y_scale": 1.0
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,33 +0,0 @@
|
|||
{
|
||||
"type": "minecraft:cache_once",
|
||||
"argument": {
|
||||
"type": "minecraft:mul",
|
||||
"argument1": {
|
||||
"type": "minecraft:add",
|
||||
"argument1": -0.05,
|
||||
"argument2": {
|
||||
"type": "minecraft:mul",
|
||||
"argument1": -0.02,
|
||||
"argument2": {
|
||||
"type": "minecraft:noise",
|
||||
"noise": "minecraft:spaghetti_roughness_modulator",
|
||||
"xz_scale": 1,
|
||||
"y_scale": 1
|
||||
}
|
||||
}
|
||||
},
|
||||
"argument2": {
|
||||
"type": "minecraft:add",
|
||||
"argument1": -0.6,
|
||||
"argument2": {
|
||||
"type": "minecraft:abs",
|
||||
"argument": {
|
||||
"type": "minecraft:noise",
|
||||
"noise": "minecraft:spaghetti_roughness",
|
||||
"xz_scale": 0.4,
|
||||
"y_scale": 0.4
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
16
kubejs/data/tfg/worldgen/density_function/mars/dune.json
Normal file
16
kubejs/data/tfg/worldgen/density_function/mars/dune.json
Normal file
|
|
@ -0,0 +1,16 @@
|
|||
{
|
||||
"type": "minecraft:cache_2d",
|
||||
"argument": {
|
||||
"type": "minecraft:mul",
|
||||
"argument1": -1,
|
||||
"argument2": {
|
||||
"type": "minecraft:abs",
|
||||
"argument": {
|
||||
"type": "minecraft:noise",
|
||||
"noise": "tfg:mars_dunes_size",
|
||||
"xz_scale": 1,
|
||||
"y_scale": 0
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,26 @@
|
|||
{
|
||||
"type": "minecraft:cache_2d",
|
||||
"argument": {
|
||||
"type": "minecraft:spline",
|
||||
"spline": {
|
||||
"coordinate": {
|
||||
"type": "minecraft:noise",
|
||||
"noise": "tfg:mars_dunes_offset",
|
||||
"xz_scale": 1,
|
||||
"y_scale": 0
|
||||
},
|
||||
"points": [
|
||||
{
|
||||
"location": -1,
|
||||
"derivative": 5.196152422706632,
|
||||
"value": 0
|
||||
},
|
||||
{
|
||||
"location": 1,
|
||||
"derivative": 5.196152422706632,
|
||||
"value": 0
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,31 @@
|
|||
{
|
||||
"type": "minecraft:cache_2d",
|
||||
"argument": {
|
||||
"type": "minecraft:spline",
|
||||
"spline": {
|
||||
"coordinate": {
|
||||
"type": "minecraft:noise",
|
||||
"noise": "tfg:mars_dunes_offset",
|
||||
"xz_scale": 1,
|
||||
"y_scale": 0
|
||||
},
|
||||
"points": [
|
||||
{
|
||||
"location": -1,
|
||||
"derivative": 0,
|
||||
"value": -1
|
||||
},
|
||||
{
|
||||
"location": 0,
|
||||
"derivative": 0,
|
||||
"value": 1
|
||||
},
|
||||
{
|
||||
"location": 1,
|
||||
"derivative": 0,
|
||||
"value": -1
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -21,7 +21,7 @@
|
|||
{
|
||||
"derivative": 0.0,
|
||||
"location": -0.19,
|
||||
"value": 3.95
|
||||
"value": 6
|
||||
},
|
||||
{
|
||||
"derivative": 0.0,
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -0,0 +1,16 @@
|
|||
{
|
||||
"type": "minecraft:cache_2d",
|
||||
"argument": {
|
||||
"type": "minecraft:mul",
|
||||
"argument1": -1,
|
||||
"argument2": {
|
||||
"type": "minecraft:abs",
|
||||
"argument": {
|
||||
"type": "minecraft:noise",
|
||||
"noise": "tfg:mars_dunes_size",
|
||||
"xz_scale": 1,
|
||||
"y_scale": 0
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
14
kubejs/data/tfg/worldgen/noise/mars_dunes_color.json
Normal file
14
kubejs/data/tfg/worldgen/noise/mars_dunes_color.json
Normal file
|
|
@ -0,0 +1,14 @@
|
|||
{
|
||||
"amplitudes": [
|
||||
1,
|
||||
1,
|
||||
2,
|
||||
2,
|
||||
2,
|
||||
1,
|
||||
1,
|
||||
1,
|
||||
1
|
||||
],
|
||||
"firstOctave": -8
|
||||
}
|
||||
6
kubejs/data/tfg/worldgen/noise/mars_dunes_offset.json
Normal file
6
kubejs/data/tfg/worldgen/noise/mars_dunes_offset.json
Normal file
|
|
@ -0,0 +1,6 @@
|
|||
{
|
||||
"firstOctave": -11,
|
||||
"amplitudes": [
|
||||
1
|
||||
]
|
||||
}
|
||||
6
kubejs/data/tfg/worldgen/noise/mars_dunes_size.json
Normal file
6
kubejs/data/tfg/worldgen/noise/mars_dunes_size.json
Normal file
|
|
@ -0,0 +1,6 @@
|
|||
{
|
||||
"firstOctave": -7,
|
||||
"amplitudes": [
|
||||
0.5
|
||||
]
|
||||
}
|
||||
|
|
@ -14,7 +14,7 @@
|
|||
"min_y": -32,
|
||||
"height": 384,
|
||||
"size_horizontal": 1,
|
||||
"size_vertical": 2
|
||||
"size_vertical": 1
|
||||
},
|
||||
"noise_router": {
|
||||
"barrier": {
|
||||
|
|
@ -44,10 +44,10 @@
|
|||
"type": "minecraft:mul",
|
||||
"argument1": {
|
||||
"type": "minecraft:y_clamped_gradient",
|
||||
"from_value": 0.0,
|
||||
"from_y": -32,
|
||||
"to_value": 1.0,
|
||||
"to_y": -20
|
||||
"to_y": -20,
|
||||
"from_value": 0,
|
||||
"to_value": 1
|
||||
},
|
||||
"argument2": {
|
||||
"type": "minecraft:add",
|
||||
|
|
@ -59,100 +59,15 @@
|
|||
"type": "minecraft:mul",
|
||||
"argument1": {
|
||||
"type": "minecraft:y_clamped_gradient",
|
||||
"from_value": 1.0,
|
||||
"from_y": 240,
|
||||
"to_value": 0.0,
|
||||
"to_y": 256
|
||||
"to_y": 256,
|
||||
"from_value": 1,
|
||||
"to_value": 0
|
||||
},
|
||||
"argument2": {
|
||||
"type": "minecraft:add",
|
||||
"argument1": 0.078125,
|
||||
"argument2": {
|
||||
"type": "minecraft:range_choice",
|
||||
"input": "tfg:mars/sloped_cheese",
|
||||
"max_exclusive": 1.5625,
|
||||
"min_inclusive": -1000000.0,
|
||||
"when_in_range": {
|
||||
"type": "minecraft:min",
|
||||
"argument1": "tfg:mars/sloped_cheese",
|
||||
"argument2": {
|
||||
"type": "minecraft:mul",
|
||||
"argument1": 5.0,
|
||||
"argument2": "tfg:mars/caves/entrances"
|
||||
}
|
||||
},
|
||||
"when_out_of_range": {
|
||||
"type": "minecraft:max",
|
||||
"argument1": {
|
||||
"type": "minecraft:min",
|
||||
"argument1": {
|
||||
"type": "minecraft:min",
|
||||
"argument1": {
|
||||
"type": "minecraft:add",
|
||||
"argument1": {
|
||||
"type": "minecraft:mul",
|
||||
"argument1": 4.0,
|
||||
"argument2": {
|
||||
"type": "minecraft:square",
|
||||
"argument": {
|
||||
"type": "minecraft:noise",
|
||||
"noise": "minecraft:cave_layer",
|
||||
"xz_scale": 1.0,
|
||||
"y_scale": 8.0
|
||||
}
|
||||
}
|
||||
},
|
||||
"argument2": {
|
||||
"type": "minecraft:add",
|
||||
"argument1": {
|
||||
"type": "minecraft:clamp",
|
||||
"input": {
|
||||
"type": "minecraft:add",
|
||||
"argument1": 0.27,
|
||||
"argument2": {
|
||||
"type": "minecraft:noise",
|
||||
"noise": "minecraft:cave_cheese",
|
||||
"xz_scale": 1.0,
|
||||
"y_scale": 0.6666666666666666
|
||||
}
|
||||
},
|
||||
"max": 1.0,
|
||||
"min": -1.0
|
||||
},
|
||||
"argument2": {
|
||||
"type": "minecraft:clamp",
|
||||
"input": {
|
||||
"type": "minecraft:add",
|
||||
"argument1": 1.5,
|
||||
"argument2": {
|
||||
"type": "minecraft:mul",
|
||||
"argument1": -0.64,
|
||||
"argument2": "tfg:mars/sloped_cheese"
|
||||
}
|
||||
},
|
||||
"max": 0.5,
|
||||
"min": 0.0
|
||||
}
|
||||
}
|
||||
},
|
||||
"argument2": "tfg:mars/caves/entrances"
|
||||
},
|
||||
"argument2": {
|
||||
"type": "minecraft:add",
|
||||
"argument1": "tfg:mars/caves/spaghetti_2d",
|
||||
"argument2": "tfg:mars/caves/spaghetti_roughness_function"
|
||||
}
|
||||
},
|
||||
"argument2": {
|
||||
"type": "minecraft:range_choice",
|
||||
"input": "tfg:mars/caves/pillars",
|
||||
"max_exclusive": 0.03,
|
||||
"min_inclusive": -1000000.0,
|
||||
"when_in_range": -1000000.0,
|
||||
"when_out_of_range": "tfg:mars/caves/pillars"
|
||||
}
|
||||
}
|
||||
}
|
||||
"argument2": "tfg:mars/sloped_cheese"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -163,7 +78,8 @@
|
|||
}
|
||||
}
|
||||
},
|
||||
"argument2": "tfg:mars/caves/noodle"
|
||||
"argument2": "minecraft:overworld/caves/noodle"
|
||||
|
||||
},
|
||||
"fluid_level_floodedness": {
|
||||
"type": "minecraft:noise",
|
||||
|
|
@ -437,56 +353,6 @@
|
|||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"type": "minecraft:condition",
|
||||
"if_true": {
|
||||
"type": "minecraft:biome",
|
||||
"biome_is": [
|
||||
"tfg:mars/martian_dunes"
|
||||
]
|
||||
},
|
||||
"then_run": {
|
||||
"type": "minecraft:condition",
|
||||
"if_true": {
|
||||
"type": "minecraft:stone_depth",
|
||||
"offset": 0,
|
||||
"surface_type": "floor",
|
||||
"add_surface_depth": false,
|
||||
"secondary_depth_range": 0
|
||||
},
|
||||
"then_run": {
|
||||
"type": "minecraft:block",
|
||||
"result_state": {
|
||||
"Name": "minecraft:blue_concrete"
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"type": "minecraft:condition",
|
||||
"if_true": {
|
||||
"type": "minecraft:biome",
|
||||
"biome_is": [
|
||||
"tfg:mars/martian_deep_desert"
|
||||
]
|
||||
},
|
||||
"then_run": {
|
||||
"type": "minecraft:condition",
|
||||
"if_true": {
|
||||
"type": "minecraft:stone_depth",
|
||||
"offset": 0,
|
||||
"surface_type": "floor",
|
||||
"add_surface_depth": false,
|
||||
"secondary_depth_range": 0
|
||||
},
|
||||
"then_run": {
|
||||
"type": "minecraft:block",
|
||||
"result_state": {
|
||||
"Name": "minecraft:purple_concrete"
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"type": "minecraft:condition",
|
||||
"if_true": {
|
||||
|
|
@ -514,6 +380,152 @@
|
|||
},
|
||||
|
||||
|
||||
{
|
||||
"type": "minecraft:condition",
|
||||
"if_true": {
|
||||
"type": "minecraft:biome",
|
||||
"biome_is": [
|
||||
"tfg:mars/martian_dunes",
|
||||
"tfg:mars/martian_deep_desert"
|
||||
]
|
||||
},
|
||||
"then_run": {
|
||||
"type": "minecraft:sequence",
|
||||
"sequence": [
|
||||
{
|
||||
"type": "minecraft:condition",
|
||||
"if_true": {
|
||||
"type": "minecraft:stone_depth",
|
||||
"offset": 2,
|
||||
"surface_type": "floor",
|
||||
"add_surface_depth": false,
|
||||
"secondary_depth_range": 0
|
||||
},
|
||||
"then_run": {
|
||||
"type": "minecraft:sequence",
|
||||
"sequence": [
|
||||
{
|
||||
"type": "minecraft:sequence",
|
||||
"sequence": [
|
||||
{
|
||||
"type": "minecraft:condition",
|
||||
"if_true": {
|
||||
"type": "minecraft:noise_threshold",
|
||||
"noise": "tfg:mars_dunes_color",
|
||||
"min_threshold": -2.0,
|
||||
"max_threshold": -0.4
|
||||
},
|
||||
"then_run": {
|
||||
"type": "minecraft:block",
|
||||
"result_state": {
|
||||
"Name": "ad_astra:venus_sand"
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"type": "minecraft:condition",
|
||||
"if_true": {
|
||||
"type": "minecraft:noise_threshold",
|
||||
"noise": "tfg:mars_dunes_color",
|
||||
"min_threshold": -0.4,
|
||||
"max_threshold": 0.05
|
||||
},
|
||||
"then_run": {
|
||||
"type": "minecraft:block",
|
||||
"result_state": {
|
||||
"Name": "ad_astra:mars_sand"
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"type": "minecraft:condition",
|
||||
"if_true": {
|
||||
"type": "minecraft:noise_threshold",
|
||||
"noise": "tfg:mars_dunes_color",
|
||||
"min_threshold": 0.05,
|
||||
"max_threshold": 2.0
|
||||
},
|
||||
"then_run": {
|
||||
"type": "minecraft:block",
|
||||
"result_state": {
|
||||
"Name": "minecraft:red_sand"
|
||||
}
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
},
|
||||
{
|
||||
"type": "minecraft:condition",
|
||||
"if_true": {
|
||||
"type": "minecraft:stone_depth",
|
||||
"offset": 6,
|
||||
"surface_type": "floor",
|
||||
"add_surface_depth": false,
|
||||
"secondary_depth_range": 0
|
||||
},
|
||||
"then_run": {
|
||||
"type": "minecraft:sequence",
|
||||
"sequence": [
|
||||
{
|
||||
"type": "minecraft:sequence",
|
||||
"sequence": [
|
||||
{
|
||||
"type": "minecraft:condition",
|
||||
"if_true": {
|
||||
"type": "minecraft:noise_threshold",
|
||||
"noise": "tfg:mars_dunes_color",
|
||||
"min_threshold": -2.0,
|
||||
"max_threshold": -0.4
|
||||
},
|
||||
"then_run": {
|
||||
"type": "minecraft:block",
|
||||
"result_state": {
|
||||
"Name": "ad_astra:venus_sandstone"
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"type": "minecraft:condition",
|
||||
"if_true": {
|
||||
"type": "minecraft:noise_threshold",
|
||||
"noise": "tfg:mars_dunes_color",
|
||||
"min_threshold": -0.4,
|
||||
"max_threshold": 0.05
|
||||
},
|
||||
"then_run": {
|
||||
"type": "minecraft:block",
|
||||
"result_state": {
|
||||
"Name": "ad_astra:mars_stone"
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"type": "minecraft:condition",
|
||||
"if_true": {
|
||||
"type": "minecraft:noise_threshold",
|
||||
"noise": "tfg:mars_dunes_color",
|
||||
"min_threshold": 0.05,
|
||||
"max_threshold": 2.0
|
||||
},
|
||||
"then_run": {
|
||||
"type": "minecraft:block",
|
||||
"result_state": {
|
||||
"Name": "minecraft:red_sandstone"
|
||||
}
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
},
|
||||
|
||||
|
||||
{
|
||||
"type": "minecraft:condition",
|
||||
|
|
@ -536,7 +548,7 @@
|
|||
"type": "minecraft:noise_threshold",
|
||||
"noise": "tfg:stone_layer_mars_1",
|
||||
"min_threshold": -1.0,
|
||||
"max_threshold": -0.25
|
||||
"max_threshold": -0.15
|
||||
},
|
||||
"then_run": {
|
||||
"type": "minecraft:sequence",
|
||||
|
|
@ -547,7 +559,7 @@
|
|||
"type": "minecraft:noise_threshold",
|
||||
"noise": "tfg:stone_layer_mars_2",
|
||||
"min_threshold": -1.0,
|
||||
"max_threshold": -0.25
|
||||
"max_threshold": -0.15
|
||||
},
|
||||
"then_run": {
|
||||
"type": "minecraft:sequence",
|
||||
|
|
@ -618,7 +630,7 @@
|
|||
"if_true": {
|
||||
"type": "minecraft:noise_threshold",
|
||||
"noise": "tfg:stone_layer_mars_2",
|
||||
"min_threshold": 0.25,
|
||||
"min_threshold": 0.15,
|
||||
"max_threshold": 1.0
|
||||
},
|
||||
"then_run": {
|
||||
|
|
@ -669,7 +681,7 @@
|
|||
"type": "minecraft:noise_threshold",
|
||||
"noise": "tfg:stone_layer_mars_2",
|
||||
"min_threshold": -1.0,
|
||||
"max_threshold": -0.25
|
||||
"max_threshold": -0.15
|
||||
},
|
||||
"then_run": {
|
||||
"type": "minecraft:sequence",
|
||||
|
|
@ -740,7 +752,7 @@
|
|||
"if_true": {
|
||||
"type": "minecraft:noise_threshold",
|
||||
"noise": "tfg:stone_layer_mars_2",
|
||||
"min_threshold": 0.25,
|
||||
"min_threshold": 0.15,
|
||||
"max_threshold": 1.0
|
||||
},
|
||||
"then_run": {
|
||||
|
|
@ -779,7 +791,7 @@
|
|||
"if_true": {
|
||||
"type": "minecraft:noise_threshold",
|
||||
"noise": "tfg:stone_layer_mars_1",
|
||||
"min_threshold": 0.25,
|
||||
"min_threshold": 0.15,
|
||||
"max_threshold": 1.0
|
||||
},
|
||||
"then_run": {
|
||||
|
|
@ -791,7 +803,7 @@
|
|||
"type": "minecraft:noise_threshold",
|
||||
"noise": "tfg:stone_layer_mars_2",
|
||||
"min_threshold": -1.0,
|
||||
"max_threshold": -0.25
|
||||
"max_threshold": -0.15
|
||||
},
|
||||
"then_run": {
|
||||
"type": "minecraft:sequence",
|
||||
|
|
@ -862,7 +874,7 @@
|
|||
"if_true": {
|
||||
"type": "minecraft:noise_threshold",
|
||||
"noise": "tfg:stone_layer_mars_2",
|
||||
"min_threshold": 0.25,
|
||||
"min_threshold": 0.15,
|
||||
"max_threshold": 1.0
|
||||
},
|
||||
"then_run": {
|
||||
|
|
@ -920,7 +932,7 @@
|
|||
"type": "minecraft:noise_threshold",
|
||||
"noise": "tfg:stone_layer_mars_1",
|
||||
"min_threshold": -1.0,
|
||||
"max_threshold": -0.25
|
||||
"max_threshold": -0.15
|
||||
},
|
||||
"then_run": {
|
||||
"type": "minecraft:sequence",
|
||||
|
|
@ -931,7 +943,7 @@
|
|||
"type": "minecraft:noise_threshold",
|
||||
"noise": "tfg:stone_layer_mars_2",
|
||||
"min_threshold": -1.0,
|
||||
"max_threshold": -0.25
|
||||
"max_threshold": -0.15
|
||||
},
|
||||
"then_run": {
|
||||
"type": "minecraft:sequence",
|
||||
|
|
@ -1002,7 +1014,7 @@
|
|||
"if_true": {
|
||||
"type": "minecraft:noise_threshold",
|
||||
"noise": "tfg:stone_layer_mars_2",
|
||||
"min_threshold": 0.25,
|
||||
"min_threshold": 0.15,
|
||||
"max_threshold": 1.0
|
||||
},
|
||||
"then_run": {
|
||||
|
|
@ -1053,7 +1065,7 @@
|
|||
"type": "minecraft:noise_threshold",
|
||||
"noise": "tfg:stone_layer_mars_2",
|
||||
"min_threshold": -1.0,
|
||||
"max_threshold": -0.25
|
||||
"max_threshold": -0.15
|
||||
},
|
||||
"then_run": {
|
||||
"type": "minecraft:sequence",
|
||||
|
|
@ -1124,7 +1136,7 @@
|
|||
"if_true": {
|
||||
"type": "minecraft:noise_threshold",
|
||||
"noise": "tfg:stone_layer_mars_2",
|
||||
"min_threshold": 0.25,
|
||||
"min_threshold": 0.15,
|
||||
"max_threshold": 1.0
|
||||
},
|
||||
"then_run": {
|
||||
|
|
@ -1163,7 +1175,7 @@
|
|||
"if_true": {
|
||||
"type": "minecraft:noise_threshold",
|
||||
"noise": "tfg:stone_layer_mars_1",
|
||||
"min_threshold": 0.25,
|
||||
"min_threshold": 0.15,
|
||||
"max_threshold": 1.0
|
||||
},
|
||||
"then_run": {
|
||||
|
|
@ -1175,7 +1187,7 @@
|
|||
"type": "minecraft:noise_threshold",
|
||||
"noise": "tfg:stone_layer_mars_2",
|
||||
"min_threshold": -1.0,
|
||||
"max_threshold": -0.25
|
||||
"max_threshold": -0.15
|
||||
},
|
||||
"then_run": {
|
||||
"type": "minecraft:sequence",
|
||||
|
|
@ -1246,7 +1258,7 @@
|
|||
"if_true": {
|
||||
"type": "minecraft:noise_threshold",
|
||||
"noise": "tfg:stone_layer_mars_2",
|
||||
"min_threshold": 0.25,
|
||||
"min_threshold": 0.15,
|
||||
"max_threshold": 1.0
|
||||
},
|
||||
"then_run": {
|
||||
|
|
@ -1479,7 +1491,7 @@
|
|||
"type": "minecraft:noise_threshold",
|
||||
"noise": "tfg:stone_layer_mars_1",
|
||||
"min_threshold": -1.0,
|
||||
"max_threshold": -0.25
|
||||
"max_threshold": -0.15
|
||||
},
|
||||
"then_run": {
|
||||
"type": "minecraft:sequence",
|
||||
|
|
@ -1490,7 +1502,7 @@
|
|||
"type": "minecraft:noise_threshold",
|
||||
"noise": "tfg:stone_layer_mars_2",
|
||||
"min_threshold": -1.0,
|
||||
"max_threshold": -0.25
|
||||
"max_threshold": -0.15
|
||||
},
|
||||
"then_run": {
|
||||
"type": "minecraft:sequence",
|
||||
|
|
@ -1561,7 +1573,7 @@
|
|||
"if_true": {
|
||||
"type": "minecraft:noise_threshold",
|
||||
"noise": "tfg:stone_layer_mars_2",
|
||||
"min_threshold": 0.25,
|
||||
"min_threshold": 0.15,
|
||||
"max_threshold": 1.0
|
||||
},
|
||||
"then_run": {
|
||||
|
|
@ -1612,7 +1624,7 @@
|
|||
"type": "minecraft:noise_threshold",
|
||||
"noise": "tfg:stone_layer_mars_2",
|
||||
"min_threshold": -1.0,
|
||||
"max_threshold": -0.25
|
||||
"max_threshold": -0.15
|
||||
},
|
||||
"then_run": {
|
||||
"type": "minecraft:sequence",
|
||||
|
|
@ -1683,7 +1695,7 @@
|
|||
"if_true": {
|
||||
"type": "minecraft:noise_threshold",
|
||||
"noise": "tfg:stone_layer_mars_2",
|
||||
"min_threshold": 0.25,
|
||||
"min_threshold": 0.15,
|
||||
"max_threshold": 1.0
|
||||
},
|
||||
"then_run": {
|
||||
|
|
@ -1722,7 +1734,7 @@
|
|||
"if_true": {
|
||||
"type": "minecraft:noise_threshold",
|
||||
"noise": "tfg:stone_layer_mars_1",
|
||||
"min_threshold": 0.25,
|
||||
"min_threshold": 0.15,
|
||||
"max_threshold": 1.0
|
||||
},
|
||||
"then_run": {
|
||||
|
|
@ -1734,7 +1746,7 @@
|
|||
"type": "minecraft:noise_threshold",
|
||||
"noise": "tfg:stone_layer_mars_2",
|
||||
"min_threshold": -1.0,
|
||||
"max_threshold": -0.25
|
||||
"max_threshold": -0.15
|
||||
},
|
||||
"then_run": {
|
||||
"type": "minecraft:sequence",
|
||||
|
|
@ -1805,7 +1817,7 @@
|
|||
"if_true": {
|
||||
"type": "minecraft:noise_threshold",
|
||||
"noise": "tfg:stone_layer_mars_2",
|
||||
"min_threshold": 0.25,
|
||||
"min_threshold": 0.15,
|
||||
"max_threshold": 1.0
|
||||
},
|
||||
"then_run": {
|
||||
|
|
|
|||
|
|
@ -268,73 +268,9 @@
|
|||
"xz_scale": 0.25,
|
||||
"y_scale": 0.0
|
||||
},
|
||||
"vein_gap": {
|
||||
"type": "minecraft:noise",
|
||||
"noise": "minecraft:ore_gap",
|
||||
"xz_scale": 1.0,
|
||||
"y_scale": 1.0
|
||||
},
|
||||
"vein_ridged": {
|
||||
"type": "minecraft:add",
|
||||
"argument1": -0.07999999821186066,
|
||||
"argument2": {
|
||||
"type": "minecraft:max",
|
||||
"argument1": {
|
||||
"type": "minecraft:abs",
|
||||
"argument": {
|
||||
"type": "minecraft:interpolated",
|
||||
"argument": {
|
||||
"type": "minecraft:range_choice",
|
||||
"input": "minecraft:y",
|
||||
"max_exclusive": 51.0,
|
||||
"min_inclusive": -60.0,
|
||||
"when_in_range": {
|
||||
"type": "minecraft:noise",
|
||||
"noise": "minecraft:ore_vein_a",
|
||||
"xz_scale": 4.0,
|
||||
"y_scale": 4.0
|
||||
},
|
||||
"when_out_of_range": 0.0
|
||||
}
|
||||
}
|
||||
},
|
||||
"argument2": {
|
||||
"type": "minecraft:abs",
|
||||
"argument": {
|
||||
"type": "minecraft:interpolated",
|
||||
"argument": {
|
||||
"type": "minecraft:range_choice",
|
||||
"input": "minecraft:y",
|
||||
"max_exclusive": 51.0,
|
||||
"min_inclusive": -60.0,
|
||||
"when_in_range": {
|
||||
"type": "minecraft:noise",
|
||||
"noise": "minecraft:ore_vein_b",
|
||||
"xz_scale": 4.0,
|
||||
"y_scale": 4.0
|
||||
},
|
||||
"when_out_of_range": 0.0
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"vein_toggle": {
|
||||
"type": "minecraft:interpolated",
|
||||
"argument": {
|
||||
"type": "minecraft:range_choice",
|
||||
"input": "minecraft:y",
|
||||
"max_exclusive": 51.0,
|
||||
"min_inclusive": -60.0,
|
||||
"when_in_range": {
|
||||
"type": "minecraft:noise",
|
||||
"noise": "minecraft:ore_veininess",
|
||||
"xz_scale": 1.5,
|
||||
"y_scale": 1.5
|
||||
},
|
||||
"when_out_of_range": 0.0
|
||||
}
|
||||
}
|
||||
"vein_gap": 0,
|
||||
"vein_ridged": 0,
|
||||
"vein_toggle": 0
|
||||
},
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ TFCEvents.createChunkDataProvider('mars', event => {
|
|||
var aquifer = [];
|
||||
i = 0;
|
||||
while (i < 16) {
|
||||
aquifer.push(0);
|
||||
aquifer.push(32);
|
||||
i++;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -885,4 +885,47 @@ function registerTFGMiscellaneousRecipes(event) {
|
|||
event.shapeless('9x tfg:aes_insulation_sheet', [
|
||||
'tfg:aes_insulation_roll'
|
||||
]).id('tfg:shapeless/aes_insulation_sheet')
|
||||
|
||||
global.GTCEU_SUPERCONDUCTORS.forEach((type, index) => {
|
||||
const multiplier = index + 1
|
||||
|
||||
event.recipes.gtceu.assembler(`tfg:assembler/superconductor_coil_small_from_${type.name}`)
|
||||
.itemInputs(
|
||||
ChemicalHelper.get(TagPrefix.plate, GTMaterials.HSLASteel, 4),
|
||||
ChemicalHelper.get(TagPrefix.rod, GTMaterials.Steel, 2),
|
||||
ChemicalHelper.get(TagPrefix.rod, GTMaterials.SteelMagnetic, 1),
|
||||
ChemicalHelper.get(TagPrefix.wireFine, GTMaterials[type.materialId], 4),
|
||||
)
|
||||
.inputFluids(Fluid.of('gtceu:silicone_rubber', 144))
|
||||
.itemOutputs(Item.of('tfg:superconductor_coil_small', 4 * multiplier))
|
||||
.circuit(4)
|
||||
.duration(400)
|
||||
.EUt(GTValues.VA[GTValues.MV])
|
||||
|
||||
event.recipes.gtceu.assembler(`tfg:assembler/superconductor_coil_large_from_${type.name}`)
|
||||
.itemInputs(
|
||||
ChemicalHelper.get(TagPrefix.plate, GTMaterials.HSLASteel, 4),
|
||||
ChemicalHelper.get(TagPrefix.rod, GTMaterials.Steel, 2),
|
||||
ChemicalHelper.get(TagPrefix.rod, GTMaterials.SteelMagnetic, 1),
|
||||
ChemicalHelper.get(TagPrefix.wireGtSingle, GTMaterials[type.materialId], 4),
|
||||
)
|
||||
.inputFluids(Fluid.of('gtceu:silicone_rubber', 144))
|
||||
.itemOutputs(Item.of('tfg:superconductor_coil_large', 4 * multiplier))
|
||||
.circuit(7)
|
||||
.duration(600)
|
||||
.EUt(GTValues.VA[GTValues.MV])
|
||||
})
|
||||
|
||||
event.recipes.gtceu.assembler('tfg:assembler/electromagnetic_accelerator')
|
||||
.itemInputs(
|
||||
'2x #forge:plates/desh',
|
||||
'gtceu:mv_voltage_coil',
|
||||
'5x tfg:dry_ice',
|
||||
'gtceu:nonconducting_casing'
|
||||
)
|
||||
.inputFluids(Fluid.of('gtceu:blue_alloy', 288))
|
||||
.itemOutputs('6x tfg:electromagnetic_accelerator')
|
||||
.circuit(4)
|
||||
.duration(800)
|
||||
.EUt(GTValues.VA[GTValues.MV])
|
||||
}
|
||||
|
|
|
|||
|
|
@ -46,8 +46,16 @@ function registerTFGPapermakingRecipes(event) {
|
|||
.duration(160)
|
||||
.EUt(7)
|
||||
|
||||
//Replace macerate logs into macerate softwood logs
|
||||
event.replaceInput({ id: 'gtceu:macerator/macerate_logs' }, '#minecraft:logs', '#tfg:softwood')
|
||||
removeMaceratorRecipe(event, 'macerate_logs')
|
||||
|
||||
// Create macerator recipes for softwood
|
||||
event.recipes.gtceu.macerator('macerate_softwood')
|
||||
.itemInputs('#tfg:softwood')
|
||||
.itemOutputs('6x gtceu:wood_dust')
|
||||
.chancedOutput('gtceu:wood_dust', 8000, 680)
|
||||
.duration(70)
|
||||
.EUt(2)
|
||||
|
||||
//Create identical macerator recipe for hardwood
|
||||
event.recipes.gtceu.macerator('macerate_hardwood')
|
||||
.itemInputs('#tfg:hardwood')
|
||||
|
|
@ -152,4 +160,4 @@ function registerTFGPapermakingRecipes(event) {
|
|||
.itemOutputs('minecraft:paper')
|
||||
.duration(40)
|
||||
.EUt(4)
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -349,6 +349,13 @@ const registerTFGBlockTags = (event) => {
|
|||
event.add('tfg:harvester_harvestable', '#tfc:berry_bushes')
|
||||
event.add('tfg:harvester_harvestable', '#tfc:any_spreading_bush')
|
||||
|
||||
event.add('minecraft:mineable/pickaxe', 'tfg:superconductor_coil_large')
|
||||
event.add('minecraft:mineable/pickaxe', 'tfg:superconductor_coil_small')
|
||||
event.add('minecraft:mineable/pickaxe', 'tfg:electromagnetic_accelerator')
|
||||
event.add('forge:mineable/wrench', 'tfg:superconductor_coil_large')
|
||||
event.add('forge:mineable/wrench', 'tfg:superconductor_coil_small')
|
||||
event.add('forge:mineable/wrench', 'tfg:electromagnetic_accelerator')
|
||||
|
||||
// #endregion
|
||||
}
|
||||
//#endregion
|
||||
|
|
|
|||
|
|
@ -299,3 +299,18 @@ global.ADD_CIRCUIT = [
|
|||
];
|
||||
//#endregion
|
||||
|
||||
//#region Superconductors
|
||||
/** @global */
|
||||
global.GTCEU_SUPERCONDUCTORS = [
|
||||
{name: 'manganese_phosphide', materialId: 'ManganesePhosphide'},
|
||||
{name: 'magnesium_diboride', materialId: 'MagnesiumDiboride'},
|
||||
{name: 'mercury_barium_calcium_cuprate', materialId: 'MercuryBariumCalciumCuprate'},
|
||||
{name: 'uranium_triplatinum', materialId: 'UraniumTriplatinum'},
|
||||
{name: 'samarium_iron_arsenic_oxide', materialId: 'SamariumIronArsenicOxide'},
|
||||
{name: 'indium_tin_barium_titanium_cuprate', materialId: 'IndiumTinBariumTitaniumCuprate'},
|
||||
{name: 'uranium_rhodium_dinaquadide', materialId: 'UraniumRhodiumDinaquadide'},
|
||||
{name: 'enriched_naquadah_trinium_europium_duranide', materialId: 'EnrichedNaquadahTriniumEuropiumDuranide'},
|
||||
{name: 'ruthenium_trinium_americium_neutronate', materialId: 'RutheniumTriniumAmericiumNeutronate'}
|
||||
]
|
||||
//#endregion
|
||||
|
||||
|
|
|
|||
|
|
@ -40,7 +40,8 @@ const registerGTCEuMaterialModification = (event) => {
|
|||
GENERATE_PLATE,
|
||||
GENERATE_DENSE,
|
||||
GENERATE_RING,
|
||||
GENERATE_FOIL
|
||||
GENERATE_FOIL,
|
||||
GENERATE_FINE_WIRE,
|
||||
} = $MATERIAL_FLAGS
|
||||
|
||||
var metalTooling = [
|
||||
|
|
@ -183,7 +184,18 @@ const registerGTCEuMaterialModification = (event) => {
|
|||
GTMaterials.TinAlloy.addFlags(GENERATE_DOUBLE_INGOTS);
|
||||
GTMaterials.Lead.addFlags(GENERATE_DOUBLE_INGOTS);
|
||||
//
|
||||
// /* Другое */
|
||||
// /* Superconductors */
|
||||
GTMaterials.ManganesePhosphide.addFlags(GENERATE_FINE_WIRE);
|
||||
GTMaterials.MagnesiumDiboride.addFlags(GENERATE_FINE_WIRE);
|
||||
GTMaterials.MercuryBariumCalciumCuprate.addFlags(GENERATE_FINE_WIRE);
|
||||
GTMaterials.UraniumTriplatinum.addFlags(GENERATE_FINE_WIRE);
|
||||
GTMaterials.SamariumIronArsenicOxide.addFlags(GENERATE_FINE_WIRE);
|
||||
//GTMaterials.IndiumTinBariumTitaniumCuprate.addFlags();
|
||||
//GTMaterials.UraniumRhodiumDinaquadide.addFlags();
|
||||
//GTMaterials.EnrichedNaquadahTriniumEuropiumDuranide.addFlags();
|
||||
GTMaterials.RutheniumTriniumAmericiumNeutronate.addFlags(GENERATE_FINE_WIRE);
|
||||
//
|
||||
// /* Другое (Other) */
|
||||
|
||||
// TODO: Exception needs to check the wizardry
|
||||
GTMaterials.Bismuth.setProperty(PropertyKey.ORE, new $ORE_PROPERTY());
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue