diff --git a/kubejs/assets/tfg/blockstates/spice.json b/kubejs/assets/tfg/blockstates/spice.json new file mode 100644 index 000000000..c78fc36c7 --- /dev/null +++ b/kubejs/assets/tfg/blockstates/spice.json @@ -0,0 +1,21 @@ +{ + "variants": { + "": [ + { + "model": "species:block/red_suspicious_sand_0" + }, + { + "model": "species:block/red_suspicious_sand_1" + }, + { + "model": "species:block/red_suspicious_sand_2" + }, + { + "model": "species:block/red_suspicious_sand_3" + }, + { + "model": "tfg:block/sand_spice" + } + ] + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/sand_spice.json b/kubejs/assets/tfg/models/block/sand_spice.json new file mode 100644 index 000000000..6adc983e4 --- /dev/null +++ b/kubejs/assets/tfg/models/block/sand_spice.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "tfg:block/sand_spice" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/textures/block/sand_spice.png b/kubejs/assets/tfg/textures/block/sand_spice.png index 2989871e6..34865a852 100644 Binary files a/kubejs/assets/tfg/textures/block/sand_spice.png and b/kubejs/assets/tfg/textures/block/sand_spice.png differ diff --git a/kubejs/data/tfg/loot_tables/blocks/spice.json b/kubejs/data/tfg/loot_tables/blocks/spice.json new file mode 100644 index 000000000..33509ae1a --- /dev/null +++ b/kubejs/data/tfg/loot_tables/blocks/spice.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "minecraft:red_sand" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} diff --git a/kubejs/data/tfg/worldgen/biome/mars/martian_deep_desert.json b/kubejs/data/tfg/worldgen/biome/mars/martian_deep_desert.json index 5f8417922..f6c29813d 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/martian_deep_desert.json +++ b/kubejs/data/tfg/worldgen/biome/mars/martian_deep_desert.json @@ -35,7 +35,9 @@ [], [], "#tfg:mars_veins", - [], + [ + "tfg:mars/terrain/spice_disc" + ], [], [ diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/terrain/spice_disc.json b/kubejs/data/tfg/worldgen/configured_feature/mars/terrain/spice_disc.json new file mode 100644 index 000000000..7a5093e00 --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/mars/terrain/spice_disc.json @@ -0,0 +1,74 @@ +{ + "type": "tfc:if_then", + "config": { + "if": { + "feature": { + "type": "tfc:soil_disc", + "config": { + "min_radius": 2, + "max_radius": 3, + "height": 4, + "states": [ + { + "replace": "minecraft:red_sand", + "with": "tfg:spice" + }, + { + "replace": "ad_astra:mars_sand", + "with": "tfg:spice" + } + ] + } + }, + "placement": [] + }, + "then": { + "feature": { + "type": "minecraft:random_patch", + "config": { + "feature": { + "feature": { + "type": "minecraft:simple_block", + "config": { + "to_place": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "tfg:spice" + } + } + } + }, + "placement": [ + { + "type": "minecraft:block_predicate_filter", + "predicate": { + "type": "minecraft:any_of", + "predicates": [ + { + "type": "minecraft:matching_blocks", + "blocks": "minecraft:red_sand" + }, + { + "type": "minecraft:matching_blocks", + "blocks": "ad_astra:mars_sand" + } + ] + } + } + ] + }, + "tries": 32, + "xz_spread": 16, + "y_spread": 2 + } + }, + "placement": [ + { + "type": "minecraft:random_offset", + "xz_spread": 0, + "y_spread": -1 + } + ] + } + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/mars/terrain/spice_disc.json b/kubejs/data/tfg/worldgen/placed_feature/mars/terrain/spice_disc.json new file mode 100644 index 000000000..cc42dba73 --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/mars/terrain/spice_disc.json @@ -0,0 +1,19 @@ +{ + "feature": "tfg:mars/terrain/spice_disc", + "placement": [ + { + "type": "minecraft:rarity_filter", + "chance": 50 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:heightmap", + "heightmap": "WORLD_SURFACE_WG" + }, + { + "type": "minecraft:biome" + } + ] +} \ No newline at end of file diff --git a/kubejs/server_scripts/ad_astra/tags.js b/kubejs/server_scripts/ad_astra/tags.js index 17629ee50..d50a381ca 100644 --- a/kubejs/server_scripts/ad_astra/tags.js +++ b/kubejs/server_scripts/ad_astra/tags.js @@ -226,7 +226,10 @@ const registerAdAstraBlockTags = (event) => { event.add('ad_astra:mars_stone_replaceables', 'tfc:rock/hardened/shale') event.add('ad_astra:mars_stone_replaceables', 'ad_astra:mars_stone') event.add('ad_astra:mars_stone_replaceables', 'tfg:rock/hardened_mars_stone') + event.add('ad_astra:mars_stone_replaceables', 'minecraft:red_sandstone') event.add('ad_astra:mars_stone_replaceables', 'ad_astra:venus_stone') + event.add('ad_astra:mars_stone_replaceables', 'ad_astra:venus_sandstone') + event.add('ad_astra:mars_stone_replaceables', 'create:ochrum') event.add('ad_astra:mars_stone_replaceables', 'tfg:rock/hardened_venus_stone') event.add('ad_astra:mars_stone_replaceables', 'gtceu:red_granite') event.add('ad_astra:mars_stone_replaceables', 'tfg:rock/hardened_red_granite') diff --git a/kubejs/startup_scripts/gtceu/machines.js b/kubejs/startup_scripts/gtceu/machines.js index d10fd0205..f4fec0da5 100644 --- a/kubejs/startup_scripts/gtceu/machines.js +++ b/kubejs/startup_scripts/gtceu/machines.js @@ -576,11 +576,11 @@ const registerGTCEuMachines = (event) => { .appearanceBlock(() => Block.getBlock('gtceu:nonconducting_casing')) .pattern(definition => FactoryBlockPattern.start() .aisle(' ' ,'A A', 'AAAAA', 'ACCCA', 'AAEAA', ' AAA ') - .aisle(' ' ,' ', 'BBBBB', 'B B', 'BB BB', ' BFB ') - .aisle(' G ' ,' ', 'ADDDA', 'D D', 'A A', ' BFB ') + .aisle(' G ' ,' ', 'BBBBB', 'B B', 'BB BB', ' BFB ') .aisle(' GGG ' ,' ', 'ADDDA', 'D D', 'A A', ' BFB ') - .aisle(' G ' ,' ', 'ADDDA', 'D D', 'A A', ' BFB ') - .aisle(' ' ,' ', 'BBBBB', 'B B', 'BB BB', ' BFB ') + .aisle('GGGGG' ,' ', 'ADDDA', 'D D', 'A A', ' BFB ') + .aisle(' GGG ' ,' ', 'ADDDA', 'D D', 'A A', ' BFB ') + .aisle(' G ' ,' ', 'BBBBB', 'B B', 'BB BB', ' BFB ') .aisle(' ' ,'A A', 'AAAAA', 'ACXCA', 'AACAA', ' AAA ') .where('X', Predicates.controller(Predicates.blocks(definition.get()))) .where('A', Predicates.blocks('gtceu:secure_maceration_casing')) diff --git a/kubejs/startup_scripts/tfg/blocks.space.js b/kubejs/startup_scripts/tfg/blocks.space.js index 129cf3b55..782177196 100644 --- a/kubejs/startup_scripts/tfg/blocks.space.js +++ b/kubejs/startup_scripts/tfg/blocks.space.js @@ -336,16 +336,16 @@ function registerTFGSpaceBlocks(event) { event.create('tfg:spice', 'tfg:particle_emitter') .textureAll('tfg:block/sand_spice') .soundType('sand') - .hardness(1) - .resistance(1) - .unbreakable() - .lightLevel(0.1) + .hardness(2) + .resistance(6) .mapColor('color_white') - .particleOffset(0, 2, 0) - .particleVelocity(0.05, 0, 0.05) + .particleOffset(0.3, 1.5, 0.3) + .particleVelocity(0, 0.05, 0) .particle('electric_spark') - .particleCount(3) + .particleCount(2) .particleForced(false) + .fullBlock(true) + .opaque(true) event.create('tfg:grass/amber_clay_mycelium') .property(BlockProperties.SNOWY)