diff --git a/kubejs/assets/tfg/blockstates/rock/halite.json b/kubejs/assets/tfg/blockstates/rock/halite.json index 16caaacf8..5cda97198 100644 --- a/kubejs/assets/tfg/blockstates/rock/halite.json +++ b/kubejs/assets/tfg/blockstates/rock/halite.json @@ -2,18 +2,37 @@ "variants": { "": [ { - "model": "tfg:block/rock/halite" + "model": "tfg:block/rock/halite", + "weight": 6 }, { "model": "tfg:block/rock/halite", + "weight": 6, "y": 90 }, { "model": "tfg:block/rock/halite", + "weight": 6, "y": 180 }, { "model": "tfg:block/rock/halite", + "weight": 6, + "y": 270 + }, + { + "model": "tfg:block/rock/halite2" + }, + { + "model": "tfg:block/rock/halite2", + "y": 90 + }, + { + "model": "tfg:block/rock/halite2", + "y": 180 + }, + { + "model": "tfg:block/rock/halite2", "y": 270 } ] diff --git a/kubejs/assets/tfg/blockstates/rock/halite2.json b/kubejs/assets/tfg/blockstates/rock/halite2.json deleted file mode 100644 index e488b49d3..000000000 --- a/kubejs/assets/tfg/blockstates/rock/halite2.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "variants": { - "": [ - { - "model": "tfg:block/rock/halite2" - }, - { - "model": "tfg:block/rock/halite2", - "y": 90 - }, - { - "model": "tfg:block/rock/halite2", - "y": 180 - }, - { - "model": "tfg:block/rock/halite2", - "y": 270 - } - ] - } -} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/noise_settings/venus_noise.json b/kubejs/data/tfg/worldgen/noise_settings/venus_noise.json index 6cc67118b..80bcb2e05 100644 --- a/kubejs/data/tfg/worldgen/noise_settings/venus_noise.json +++ b/kubejs/data/tfg/worldgen/noise_settings/venus_noise.json @@ -417,30 +417,10 @@ } }, "then_run": { - "type": "minecraft:sequence", - "sequence": [ - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:noise_threshold", - "noise": "tfg:venus_salt", - "min_threshold": 0.1, - "max_threshold": 0.3 - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "tfg:rock/halite2" - } - } - }, - { - "type": "minecraft:block", - "result_state": { - "Name": "tfg:rock/halite" - } - } - ] + "type": "minecraft:block", + "result_state": { + "Name": "tfg:rock/halite" + } } } ] diff --git a/kubejs/startup_scripts/tfg/venus/blocks.venus_deco.js b/kubejs/startup_scripts/tfg/venus/blocks.venus_deco.js index 225b263e2..48ebb4aa1 100644 --- a/kubejs/startup_scripts/tfg/venus/blocks.venus_deco.js +++ b/kubejs/startup_scripts/tfg/venus/blocks.venus_deco.js @@ -56,15 +56,6 @@ function registerTFGWorldGenVenusDecoBlocks(event) { .tagBlock('minecraft:mineable/pickaxe') .fullBlock(true) .opaque(true) - event.create('tfg:rock/halite2') - .mapColor('snow') - .soundType('deepslate') - .hardness(0.8) - .resistance(0.8) - .requiresTool(true) - .tagBlock('minecraft:mineable/pickaxe') - .fullBlock(true) - .opaque(true) //Stromatolite event.create('tfg:rock/raw/stromatolite', 'tfc:raw_rock')