diff --git a/kubejs/assets/tfc/textures/gui/knapping/loose/glacio_stone.png b/kubejs/assets/tfc/textures/gui/knapping/loose/glacio_stone.png new file mode 100644 index 000000000..5eca90aa4 Binary files /dev/null and b/kubejs/assets/tfc/textures/gui/knapping/loose/glacio_stone.png differ diff --git a/kubejs/assets/tfc/textures/gui/knapping/loose/mars_stone.png b/kubejs/assets/tfc/textures/gui/knapping/loose/mars_stone.png new file mode 100644 index 000000000..26eec41bc Binary files /dev/null and b/kubejs/assets/tfc/textures/gui/knapping/loose/mars_stone.png differ diff --git a/kubejs/assets/tfc/textures/gui/knapping/loose/mercury_stone.png b/kubejs/assets/tfc/textures/gui/knapping/loose/mercury_stone.png new file mode 100644 index 000000000..c2f44257d Binary files /dev/null and b/kubejs/assets/tfc/textures/gui/knapping/loose/mercury_stone.png differ diff --git a/kubejs/assets/tfc/textures/gui/knapping/loose/moon_deepslate.png b/kubejs/assets/tfc/textures/gui/knapping/loose/moon_deepslate.png new file mode 100644 index 000000000..97d29f80c Binary files /dev/null and b/kubejs/assets/tfc/textures/gui/knapping/loose/moon_deepslate.png differ diff --git a/kubejs/assets/tfc/textures/gui/knapping/loose/permafrost.png b/kubejs/assets/tfc/textures/gui/knapping/loose/permafrost.png new file mode 100644 index 000000000..03d08089d Binary files /dev/null and b/kubejs/assets/tfc/textures/gui/knapping/loose/permafrost.png differ diff --git a/kubejs/assets/tfc/textures/gui/knapping/loose/venus_stone.png b/kubejs/assets/tfc/textures/gui/knapping/loose/venus_stone.png new file mode 100644 index 000000000..a325c5708 Binary files /dev/null and b/kubejs/assets/tfc/textures/gui/knapping/loose/venus_stone.png differ diff --git a/kubejs/assets/tfg/textures/item/brick/glacio_stone.png b/kubejs/assets/tfg/textures/item/brick/glacio_stone.png new file mode 100644 index 000000000..3d7541410 Binary files /dev/null and b/kubejs/assets/tfg/textures/item/brick/glacio_stone.png differ diff --git a/kubejs/assets/tfg/textures/item/brick/mars_stone.png b/kubejs/assets/tfg/textures/item/brick/mars_stone.png new file mode 100644 index 000000000..4b1cf9a00 Binary files /dev/null and b/kubejs/assets/tfg/textures/item/brick/mars_stone.png differ diff --git a/kubejs/assets/tfg/textures/item/brick/mercury_stone.png b/kubejs/assets/tfg/textures/item/brick/mercury_stone.png new file mode 100644 index 000000000..51f69a080 Binary files /dev/null and b/kubejs/assets/tfg/textures/item/brick/mercury_stone.png differ diff --git a/kubejs/assets/tfg/textures/item/brick/moon_stone.png b/kubejs/assets/tfg/textures/item/brick/moon_stone.png index 6a0d105db..72baa3320 100644 Binary files a/kubejs/assets/tfg/textures/item/brick/moon_stone.png and b/kubejs/assets/tfg/textures/item/brick/moon_stone.png differ diff --git a/kubejs/assets/tfg/textures/item/brick/permafrost.png b/kubejs/assets/tfg/textures/item/brick/permafrost.png new file mode 100644 index 000000000..b931afeef Binary files /dev/null and b/kubejs/assets/tfg/textures/item/brick/permafrost.png differ diff --git a/kubejs/assets/tfg/textures/item/brick/venus_stone.png b/kubejs/assets/tfg/textures/item/brick/venus_stone.png new file mode 100644 index 000000000..f7516e31f Binary files /dev/null and b/kubejs/assets/tfg/textures/item/brick/venus_stone.png differ diff --git a/kubejs/assets/tfg/textures/item/loose/glacio_stone.png b/kubejs/assets/tfg/textures/item/loose/glacio_stone.png new file mode 100644 index 000000000..fdf9de909 Binary files /dev/null and b/kubejs/assets/tfg/textures/item/loose/glacio_stone.png differ diff --git a/kubejs/assets/tfg/textures/item/loose/mars_stone.png b/kubejs/assets/tfg/textures/item/loose/mars_stone.png new file mode 100644 index 000000000..f3ef23b0a Binary files /dev/null and b/kubejs/assets/tfg/textures/item/loose/mars_stone.png differ diff --git a/kubejs/assets/tfg/textures/item/loose/mercury_stone.png b/kubejs/assets/tfg/textures/item/loose/mercury_stone.png new file mode 100644 index 000000000..a39f9e3f2 Binary files /dev/null and b/kubejs/assets/tfg/textures/item/loose/mercury_stone.png differ diff --git a/kubejs/assets/tfg/textures/item/loose/moon_deepslate.png b/kubejs/assets/tfg/textures/item/loose/moon_deepslate.png new file mode 100644 index 000000000..9f74b724d Binary files /dev/null and b/kubejs/assets/tfg/textures/item/loose/moon_deepslate.png differ diff --git a/kubejs/assets/tfg/textures/item/loose/permafrost.png b/kubejs/assets/tfg/textures/item/loose/permafrost.png new file mode 100644 index 000000000..2a32ff666 Binary files /dev/null and b/kubejs/assets/tfg/textures/item/loose/permafrost.png differ diff --git a/kubejs/assets/tfg/textures/item/loose/venus_stone.png b/kubejs/assets/tfg/textures/item/loose/venus_stone.png new file mode 100644 index 000000000..0b9d23b10 Binary files /dev/null and b/kubejs/assets/tfg/textures/item/loose/venus_stone.png differ diff --git a/kubejs/server_scripts/tfg/recipes.rocks.js b/kubejs/server_scripts/tfg/recipes.rocks.js index f696a3a03..712321e67 100644 --- a/kubejs/server_scripts/tfg/recipes.rocks.js +++ b/kubejs/server_scripts/tfg/recipes.rocks.js @@ -12,17 +12,17 @@ function registerTFGRockRecipes(event) { { loose: 'tfg:brick/deepslate', block: '4x minecraft:deepslate_bricks' }, { loose: 'tfg:loose/dripstone', block: 'minecraft:dripstone_block' }, { loose: 'tfg:loose/moon_stone', block: 'ad_astra:moon_cobblestone' }, - { loose: 'tfg:brick/moon_stone', block: 'ad_astra:moon_stone_bricks' }, + { loose: 'tfg:brick/moon_stone', block: '4x ad_astra:moon_stone_bricks' }, { loose: 'tfg:loose/moon_deepslate', block: 'ad_astra:moon_deepslate' }, { loose: 'tfg:loose/mars_stone', block: 'ad_astra:mars_cobblestone' }, - { loose: 'tfg:brick/mars_stone', block: 'ad_astra:mars_stone_bricks' }, + { loose: 'tfg:brick/mars_stone', block: '4x ad_astra:mars_stone_bricks' }, { loose: 'tfg:loose/venus_stone', block: 'ad_astra:venus_cobblestone' }, - { loose: 'tfg:brick/venus_stone', block: 'ad_astra:venus_stone_bricks' }, + { loose: 'tfg:brick/venus_stone', block: '4x ad_astra:venus_stone_bricks' }, { loose: 'tfg:loose/mercury_stone', block: 'ad_astra:mercury_cobblestone' }, - { loose: 'tfg:brick/mercury_stone', block: 'ad_astra:mercury_stone_bricks' }, + { loose: 'tfg:brick/mercury_stone', block: '4x ad_astra:mercury_stone_bricks' }, { loose: 'tfg:loose/glacio_stone', block: 'ad_astra:glacio_cobblestone' }, - { loose: 'tfg:brick/glacio_stone', block: 'ad_astra:glacio_stone_bricks' }, - { loose: 'tfg:loose/permafrost', block: 'ad_astra:permafrost' } + { loose: 'tfg:brick/glacio_stone', block: '4x ad_astra:glacio_stone_bricks' }, + { loose: 'tfg:brick/permafrost', block: '4x ad_astra:permafrost_bricks' } ] GLUEING_TOGETHER.forEach(x => { @@ -169,7 +169,7 @@ function registerTFGRockRecipes(event) { { raw: 'tfg:rock/hardened_glacio_stone', hammered: 'ad_astra:glacio_cobblestone' }, { raw: 'ad_astra:glacio_cobblestone', hammered: 'tfc:sand/white' }, { raw: 'ad_astra:conglomerate', hammered: 'tfc:rock/gravel/conglomerate' }, - { raw: 'ad_astra:permafrost', hammered: 'gtceu:ice_dust' } + { raw: 'ad_astra:permafrost', hammered: 'tfg:loose/permafrost' } ] HAMMERING.forEach(x => { @@ -630,5 +630,11 @@ function registerTFGRockRecipes(event) { .duration(40*20) .EUt(2) + event.recipes.gtceu.compressor('tfg:permafrost') + .itemInputs('4x tfg:loose/permafrost') + .itemOutputs('ad_astra:permafrost') + .duration(40*20) + .EUt(2) + // #endregion } \ No newline at end of file diff --git a/kubejs/startup_scripts/tfg/blocks.space.js b/kubejs/startup_scripts/tfg/blocks.space.js index b9339695d..4a290a518 100644 --- a/kubejs/startup_scripts/tfg/blocks.space.js +++ b/kubejs/startup_scripts/tfg/blocks.space.js @@ -92,30 +92,58 @@ function registerTFGSpaceBlocks(event) { .opaque(true) event.create('tfg:loose/moon_stone', 'tfc:loose_rock') + .stoneSoundType() .itemTexture('tfg:item/loose/moon_stone') - .rockTypeModel('igneous_extrusive') + .tagBlock('tfc:loose_rocks') + .tagItem('tfc:any_knapping') + .tagItem('tfc:rock_knapping') + .tagItem('tfc:igneous_intrusive_rock') event.create('tfg:loose/moon_deepslate', 'tfc:loose_rock') + .stoneSoundType() .itemTexture('tfg:item/loose/moon_deepslate') - .rockTypeModel('igneous_intrusive') + .tagBlock('tfc:loose_rocks') + .tagItem('tfc:any_knapping') + .tagItem('tfc:rock_knapping') + .tagItem('tfc:igneous_intrusive_rock') event.create('tfg:loose/mars_stone', 'tfc:loose_rock') + .stoneSoundType() .itemTexture('tfg:item/loose/mars_stone') - .rockTypeModel('sedimentary') + .tagBlock('tfc:loose_rocks') + .tagItem('tfc:any_knapping') + .tagItem('tfc:rock_knapping') + .tagItem('tfc:sedimentary_rock') event.create('tfg:loose/venus_stone', 'tfc:loose_rock') + .stoneSoundType() .itemTexture('tfg:item/loose/venus_stone') - .rockTypeModel('igneous_extrusive') + .tagBlock('tfc:loose_rocks') + .tagItem('tfc:any_knapping') + .tagItem('tfc:rock_knapping') + .tagItem('tfc:igneous_extrusive_rock') event.create('tfg:loose/mercury_stone', 'tfc:loose_rock') + .stoneSoundType() .itemTexture('tfg:item/loose/mercury_stone') - .rockTypeModel('metamorphic') + .tagBlock('tfc:loose_rocks') + .tagItem('tfc:any_knapping') + .tagItem('tfc:rock_knapping') + .tagItem('tfc:igneous_intrusive_rock') event.create('tfg:loose/glacio_stone', 'tfc:loose_rock') + .stoneSoundType() .itemTexture('tfg:item/loose/glacio_stone') - .rockTypeModel('sedimentary') + .tagBlock('tfc:loose_rocks') + .tagItem('tfc:any_knapping') + .tagItem('tfc:rock_knapping') + .tagItem('tfc:igneous_extrusive_rock') event.create('tfg:loose/permafrost', 'tfc:loose_rock') + .stoneSoundType() .itemTexture('tfg:item/loose/permafrost') - .rockTypeModel('sedimentary') + .tagBlock('tfc:loose_rocks') + .tagItem('tfc:any_knapping') + .tagItem('tfc:rock_knapping') + .tagItem('tfc:metamorphic_rock') } \ No newline at end of file