diff --git a/kubejs/assets/ad_astra/textures/block/polished_mercury_stone.png b/kubejs/assets/ad_astra/textures/block/polished_mercury_stone.png new file mode 100644 index 000000000..30b5f7690 Binary files /dev/null and b/kubejs/assets/ad_astra/textures/block/polished_mercury_stone.png differ diff --git a/kubejs/assets/tfg/blockstates/loose/crackrack.json b/kubejs/assets/tfg/blockstates/loose/crackrack.json new file mode 100644 index 000000000..568f8180c --- /dev/null +++ b/kubejs/assets/tfg/blockstates/loose/crackrack.json @@ -0,0 +1,55 @@ +{ + "variants": { + "count=1": [ + { + "model": "tfg:block/loose/crackrack_1", + "y": 90 + }, + { + "model": "tfg:block/loose/crackrack_1" + }, + { + "model": "tfg:block/loose/crackrack_1", + "y": 180 + }, + { + "model": "tfg:block/loose/crackrack_1", + "y": 270 + } + ], + "count=2": [ + { + "model": "tfg:block/loose/crackrack_2", + "y": 90 + }, + { + "model": "tfg:block/loose/crackrack_2" + }, + { + "model": "tfg:block/loose/crackrack_2", + "y": 180 + }, + { + "model": "tfg:block/loose/crackrack_2", + "y": 270 + } + ], + "count=3": [ + { + "model": "tfg:block/loose/crackrack_3", + "y": 90 + }, + { + "model": "tfg:block/loose/crackrack_3" + }, + { + "model": "tfg:block/loose/crackrack_3", + "y": 180 + }, + { + "model": "tfg:block/loose/crackrack_3", + "y": 270 + } + ] + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/rock/bricks_moon_deepslate.json b/kubejs/assets/tfg/blockstates/rock/bricks_moon_deepslate.json new file mode 100644 index 000000000..989f9a714 --- /dev/null +++ b/kubejs/assets/tfg/blockstates/rock/bricks_moon_deepslate.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "tfg:block/rock/bricks_moon_deepslate" + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/rock/chiseled_bricks_moon_deepslate.json b/kubejs/assets/tfg/blockstates/rock/chiseled_bricks_moon_deepslate.json new file mode 100644 index 000000000..f5883f881 --- /dev/null +++ b/kubejs/assets/tfg/blockstates/rock/chiseled_bricks_moon_deepslate.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "tfg:block/rock/chiseled_bricks_moon_deepslate" + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/rock/cobble_blackstone.json b/kubejs/assets/tfg/blockstates/rock/cobble_blackstone.json new file mode 100644 index 000000000..9322f89aa --- /dev/null +++ b/kubejs/assets/tfg/blockstates/rock/cobble_blackstone.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "tfg:block/rock/cobble_blackstone" + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/rock/cobble_crackrack.json b/kubejs/assets/tfg/blockstates/rock/cobble_crackrack.json new file mode 100644 index 000000000..a8af00981 --- /dev/null +++ b/kubejs/assets/tfg/blockstates/rock/cobble_crackrack.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "tfg:block/rock/cobble_crackrack" + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/rock/cobble_dripstone.json b/kubejs/assets/tfg/blockstates/rock/cobble_dripstone.json new file mode 100644 index 000000000..7e4bb7c74 --- /dev/null +++ b/kubejs/assets/tfg/blockstates/rock/cobble_dripstone.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "tfg:block/rock/cobble_dripstone" + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/rock/cobble_moon_deepslate.json b/kubejs/assets/tfg/blockstates/rock/cobble_moon_deepslate.json new file mode 100644 index 000000000..4f72b9333 --- /dev/null +++ b/kubejs/assets/tfg/blockstates/rock/cobble_moon_deepslate.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "tfg:block/rock/cobble_moon_deepslate" + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/rock/cobble_permafrost.json b/kubejs/assets/tfg/blockstates/rock/cobble_permafrost.json new file mode 100644 index 000000000..56363869d --- /dev/null +++ b/kubejs/assets/tfg/blockstates/rock/cobble_permafrost.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "tfg:block/rock/cobble_permafrost" + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/rock/cracked_bricks_moon_deepslate.json b/kubejs/assets/tfg/blockstates/rock/cracked_bricks_moon_deepslate.json new file mode 100644 index 000000000..c411c524a --- /dev/null +++ b/kubejs/assets/tfg/blockstates/rock/cracked_bricks_moon_deepslate.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "tfg:block/rock/cracked_bricks_moon_deepslate" + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/rock/gravel_blackstone.json b/kubejs/assets/tfg/blockstates/rock/gravel_blackstone.json new file mode 100644 index 000000000..e769228fe --- /dev/null +++ b/kubejs/assets/tfg/blockstates/rock/gravel_blackstone.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "tfg:block/rock/gravel_blackstone" + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/rock/gravel_crackrack.json b/kubejs/assets/tfg/blockstates/rock/gravel_crackrack.json new file mode 100644 index 000000000..c10b6e510 --- /dev/null +++ b/kubejs/assets/tfg/blockstates/rock/gravel_crackrack.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "tfg:block/rock/gravel_crackrack" + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/rock/gravel_deepslate.json b/kubejs/assets/tfg/blockstates/rock/gravel_deepslate.json new file mode 100644 index 000000000..640736aee --- /dev/null +++ b/kubejs/assets/tfg/blockstates/rock/gravel_deepslate.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "tfg:block/rock/gravel_deepslate" + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/rock/gravel_dripstone.json b/kubejs/assets/tfg/blockstates/rock/gravel_dripstone.json new file mode 100644 index 000000000..7a2db502e --- /dev/null +++ b/kubejs/assets/tfg/blockstates/rock/gravel_dripstone.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "tfg:block/rock/gravel_dripstone" + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/rock/gravel_glacio.json b/kubejs/assets/tfg/blockstates/rock/gravel_glacio.json new file mode 100644 index 000000000..e167ee620 --- /dev/null +++ b/kubejs/assets/tfg/blockstates/rock/gravel_glacio.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "tfg:block/rock/gravel_glacio" + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/rock/gravel_mars.json b/kubejs/assets/tfg/blockstates/rock/gravel_mars.json new file mode 100644 index 000000000..1185ce5ae --- /dev/null +++ b/kubejs/assets/tfg/blockstates/rock/gravel_mars.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "tfg:block/rock/gravel_mars" + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/rock/gravel_mercury.json b/kubejs/assets/tfg/blockstates/rock/gravel_mercury.json new file mode 100644 index 000000000..8c62c0b65 --- /dev/null +++ b/kubejs/assets/tfg/blockstates/rock/gravel_mercury.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "tfg:block/rock/gravel_mercury" + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/rock/gravel_moon.json b/kubejs/assets/tfg/blockstates/rock/gravel_moon.json new file mode 100644 index 000000000..9a5fa93f9 --- /dev/null +++ b/kubejs/assets/tfg/blockstates/rock/gravel_moon.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "tfg:block/rock/gravel_moon" + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/rock/gravel_moon_deepslate.json b/kubejs/assets/tfg/blockstates/rock/gravel_moon_deepslate.json new file mode 100644 index 000000000..004ac267c --- /dev/null +++ b/kubejs/assets/tfg/blockstates/rock/gravel_moon_deepslate.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "tfg:block/rock/gravel_moon_deepslate" + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/rock/gravel_permafrost.json b/kubejs/assets/tfg/blockstates/rock/gravel_permafrost.json new file mode 100644 index 000000000..f8718974d --- /dev/null +++ b/kubejs/assets/tfg/blockstates/rock/gravel_permafrost.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "tfg:block/rock/gravel_permafrost" + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/rock/gravel_red_granite.json b/kubejs/assets/tfg/blockstates/rock/gravel_red_granite.json new file mode 100644 index 000000000..4d87c4591 --- /dev/null +++ b/kubejs/assets/tfg/blockstates/rock/gravel_red_granite.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "tfg:block/rock/gravel_red_granite" + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/rock/gravel_venus.json b/kubejs/assets/tfg/blockstates/rock/gravel_venus.json new file mode 100644 index 000000000..6b76d8654 --- /dev/null +++ b/kubejs/assets/tfg/blockstates/rock/gravel_venus.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "tfg:block/rock/gravel_venus" + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/rock/pillar_moon_deepslate.json b/kubejs/assets/tfg/blockstates/rock/pillar_moon_deepslate.json new file mode 100644 index 000000000..ebd02974c --- /dev/null +++ b/kubejs/assets/tfg/blockstates/rock/pillar_moon_deepslate.json @@ -0,0 +1,16 @@ +{ + "variants": { + "axis=x": { + "model": "tfg:block/rock/pillar_moon_deepslate_horizontal", + "x": 90, + "y": 90 + }, + "axis=y": { + "model": "tfg:block/rock/pillar_moon_deepslate" + }, + "axis=z": { + "model": "tfg:block/rock/pillar_moon_deepslate_horizontal", + "x": 90 + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/rock/polished_crackrack.json b/kubejs/assets/tfg/blockstates/rock/polished_crackrack.json new file mode 100644 index 000000000..35bbb9db2 --- /dev/null +++ b/kubejs/assets/tfg/blockstates/rock/polished_crackrack.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "tfg:block/rock/polished_crackrack" + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/rock/polished_moon_deepslate.json b/kubejs/assets/tfg/blockstates/rock/polished_moon_deepslate.json new file mode 100644 index 000000000..ccdcf0f9a --- /dev/null +++ b/kubejs/assets/tfg/blockstates/rock/polished_moon_deepslate.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "tfg:block/rock/polished_moon_deepslate" + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/loose/crackrack_1.json b/kubejs/assets/tfg/models/block/loose/crackrack_1.json new file mode 100644 index 000000000..977e3cf5c --- /dev/null +++ b/kubejs/assets/tfg/models/block/loose/crackrack_1.json @@ -0,0 +1,6 @@ +{ + "parent": "tfc:block/rock/loose_igneous_intrusive_1", + "textures": { + "texture": "beneath:block/crackrack" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/loose/crackrack_2.json b/kubejs/assets/tfg/models/block/loose/crackrack_2.json new file mode 100644 index 000000000..1293c8e27 --- /dev/null +++ b/kubejs/assets/tfg/models/block/loose/crackrack_2.json @@ -0,0 +1,6 @@ +{ + "parent": "tfc:block/rock/loose_igneous_intrusive_2", + "textures": { + "texture": "beneath:block/crackrack" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/loose/crackrack_3.json b/kubejs/assets/tfg/models/block/loose/crackrack_3.json new file mode 100644 index 000000000..a0f2061df --- /dev/null +++ b/kubejs/assets/tfg/models/block/loose/crackrack_3.json @@ -0,0 +1,6 @@ +{ + "parent": "tfc:block/rock/loose_igneous_intrusive_3", + "textures": { + "texture": "beneath:block/crackrack" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/rock/bricks_moon_deepslate.json b/kubejs/assets/tfg/models/block/rock/bricks_moon_deepslate.json new file mode 100644 index 000000000..7732302b1 --- /dev/null +++ b/kubejs/assets/tfg/models/block/rock/bricks_moon_deepslate.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "tfg:block/rock/bricks_moon_deepslate" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/rock/chiseled_bricks_moon_deepslate.json b/kubejs/assets/tfg/models/block/rock/chiseled_bricks_moon_deepslate.json new file mode 100644 index 000000000..55e323eb3 --- /dev/null +++ b/kubejs/assets/tfg/models/block/rock/chiseled_bricks_moon_deepslate.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "tfg:block/rock/chiseled_bricks_moon_deepslate" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/rock/cobble_blackstone.json b/kubejs/assets/tfg/models/block/rock/cobble_blackstone.json new file mode 100644 index 000000000..ad6cfdcc5 --- /dev/null +++ b/kubejs/assets/tfg/models/block/rock/cobble_blackstone.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "minecraft:block/blackstone_top" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/rock/cobble_crackrack.json b/kubejs/assets/tfg/models/block/rock/cobble_crackrack.json new file mode 100644 index 000000000..95432bb09 --- /dev/null +++ b/kubejs/assets/tfg/models/block/rock/cobble_crackrack.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "tfg:block/rock/cobble_crackrack" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/rock/cobble_dripstone.json b/kubejs/assets/tfg/models/block/rock/cobble_dripstone.json new file mode 100644 index 000000000..e6ae2b798 --- /dev/null +++ b/kubejs/assets/tfg/models/block/rock/cobble_dripstone.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "tfg:block/rock/cobble_dripstone" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/rock/cobble_permafrost.json b/kubejs/assets/tfg/models/block/rock/cobble_permafrost.json new file mode 100644 index 000000000..ff942aee9 --- /dev/null +++ b/kubejs/assets/tfg/models/block/rock/cobble_permafrost.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "ad_astra:block/permafrost_top" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/rock/cracked_bricks_moon_deepslate.json b/kubejs/assets/tfg/models/block/rock/cracked_bricks_moon_deepslate.json new file mode 100644 index 000000000..421d73f2b --- /dev/null +++ b/kubejs/assets/tfg/models/block/rock/cracked_bricks_moon_deepslate.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "tfg:block/rock/cracked_bricks_moon_deepslate" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/rock/gravel_blackstone.json b/kubejs/assets/tfg/models/block/rock/gravel_blackstone.json new file mode 100644 index 000000000..d9ee63774 --- /dev/null +++ b/kubejs/assets/tfg/models/block/rock/gravel_blackstone.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "tfg:block/rock/gravel_blackstone" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/rock/gravel_crackrack.json b/kubejs/assets/tfg/models/block/rock/gravel_crackrack.json new file mode 100644 index 000000000..681590d51 --- /dev/null +++ b/kubejs/assets/tfg/models/block/rock/gravel_crackrack.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "tfg:block/rock/gravel_crackrack" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/rock/gravel_deepslate.json b/kubejs/assets/tfg/models/block/rock/gravel_deepslate.json new file mode 100644 index 000000000..8ff04f18c --- /dev/null +++ b/kubejs/assets/tfg/models/block/rock/gravel_deepslate.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "tfg:block/rock/gravel_deepslate" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/rock/gravel_dripstone.json b/kubejs/assets/tfg/models/block/rock/gravel_dripstone.json new file mode 100644 index 000000000..9d72e117f --- /dev/null +++ b/kubejs/assets/tfg/models/block/rock/gravel_dripstone.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "tfg:block/rock/gravel_dripstone" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/rock/gravel_glacio.json b/kubejs/assets/tfg/models/block/rock/gravel_glacio.json new file mode 100644 index 000000000..644584b76 --- /dev/null +++ b/kubejs/assets/tfg/models/block/rock/gravel_glacio.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "tfg:block/rock/gravel_glacio" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/rock/gravel_mars.json b/kubejs/assets/tfg/models/block/rock/gravel_mars.json new file mode 100644 index 000000000..f3d68f422 --- /dev/null +++ b/kubejs/assets/tfg/models/block/rock/gravel_mars.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "tfg:block/rock/gravel_mars" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/rock/gravel_mercury.json b/kubejs/assets/tfg/models/block/rock/gravel_mercury.json new file mode 100644 index 000000000..2b8a2a169 --- /dev/null +++ b/kubejs/assets/tfg/models/block/rock/gravel_mercury.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "tfg:block/rock/gravel_mercury" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/rock/gravel_moon.json b/kubejs/assets/tfg/models/block/rock/gravel_moon.json new file mode 100644 index 000000000..f87fb5702 --- /dev/null +++ b/kubejs/assets/tfg/models/block/rock/gravel_moon.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "tfg:block/rock/gravel_moon" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/rock/gravel_moon_deepslate.json b/kubejs/assets/tfg/models/block/rock/gravel_moon_deepslate.json new file mode 100644 index 000000000..d8ab793b1 --- /dev/null +++ b/kubejs/assets/tfg/models/block/rock/gravel_moon_deepslate.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "tfg:block/rock/gravel_moon_deepslate" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/rock/gravel_permafrost.json b/kubejs/assets/tfg/models/block/rock/gravel_permafrost.json new file mode 100644 index 000000000..af6e7933d --- /dev/null +++ b/kubejs/assets/tfg/models/block/rock/gravel_permafrost.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "tfg:block/rock/gravel_permafrost" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/rock/gravel_red_granite.json b/kubejs/assets/tfg/models/block/rock/gravel_red_granite.json new file mode 100644 index 000000000..288781d1e --- /dev/null +++ b/kubejs/assets/tfg/models/block/rock/gravel_red_granite.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "tfg:block/rock/gravel_red_granite" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/rock/gravel_venus.json b/kubejs/assets/tfg/models/block/rock/gravel_venus.json new file mode 100644 index 000000000..d20e4d522 --- /dev/null +++ b/kubejs/assets/tfg/models/block/rock/gravel_venus.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "tfg:block/rock/gravel_venus" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/rock/pillar_moon_deepslate.json b/kubejs/assets/tfg/models/block/rock/pillar_moon_deepslate.json new file mode 100644 index 000000000..153a1d6bd --- /dev/null +++ b/kubejs/assets/tfg/models/block/rock/pillar_moon_deepslate.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_column", + "textures": { + "end": "tfg:block/rock/pillar_moon_deepslate_top", + "side": "tfg:block/rock/pillar_moon_deepslate" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/rock/pillar_moon_deepslate_horizontal.json b/kubejs/assets/tfg/models/block/rock/pillar_moon_deepslate_horizontal.json new file mode 100644 index 000000000..4e3026807 --- /dev/null +++ b/kubejs/assets/tfg/models/block/rock/pillar_moon_deepslate_horizontal.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_column_horizontal", + "textures": { + "end": "tfg:block/rock/pillar_moon_deepslate_top", + "side": "tfg:block/rock/pillar_moon_deepslate" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/rock/polished_crackrack.json b/kubejs/assets/tfg/models/block/rock/polished_crackrack.json new file mode 100644 index 000000000..4ebed1bc8 --- /dev/null +++ b/kubejs/assets/tfg/models/block/rock/polished_crackrack.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "tfg:block/rock/polished_crackrack" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/rock/polished_moon_deepslate.json b/kubejs/assets/tfg/models/block/rock/polished_moon_deepslate.json new file mode 100644 index 000000000..2f59b3be5 --- /dev/null +++ b/kubejs/assets/tfg/models/block/rock/polished_moon_deepslate.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "tfg:block/rock/polished_moon_deepslate" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/textures/block/rock/bricks_moon_deepslate.png b/kubejs/assets/tfg/textures/block/rock/bricks_moon_deepslate.png new file mode 100644 index 000000000..981465dfa Binary files /dev/null and b/kubejs/assets/tfg/textures/block/rock/bricks_moon_deepslate.png differ diff --git a/kubejs/assets/tfg/textures/block/rock/chiseled_bricks_moon_deepslate.png b/kubejs/assets/tfg/textures/block/rock/chiseled_bricks_moon_deepslate.png new file mode 100644 index 000000000..580db5bfa Binary files /dev/null and b/kubejs/assets/tfg/textures/block/rock/chiseled_bricks_moon_deepslate.png differ diff --git a/kubejs/assets/tfg/textures/block/rock/cobble_crackrack.png b/kubejs/assets/tfg/textures/block/rock/cobble_crackrack.png new file mode 100644 index 000000000..ffb764474 Binary files /dev/null and b/kubejs/assets/tfg/textures/block/rock/cobble_crackrack.png differ diff --git a/kubejs/assets/tfg/textures/block/rock/cobble_dripstone.png b/kubejs/assets/tfg/textures/block/rock/cobble_dripstone.png new file mode 100644 index 000000000..8b03e73a0 Binary files /dev/null and b/kubejs/assets/tfg/textures/block/rock/cobble_dripstone.png differ diff --git a/kubejs/assets/tfg/textures/block/rock/cobble_moon_deepslate.png b/kubejs/assets/tfg/textures/block/rock/cobble_moon_deepslate.png new file mode 100644 index 000000000..df7e42b7c Binary files /dev/null and b/kubejs/assets/tfg/textures/block/rock/cobble_moon_deepslate.png differ diff --git a/kubejs/assets/tfg/textures/block/rock/cracked_bricks_moon_deepslate.png b/kubejs/assets/tfg/textures/block/rock/cracked_bricks_moon_deepslate.png new file mode 100644 index 000000000..ae6ca3201 Binary files /dev/null and b/kubejs/assets/tfg/textures/block/rock/cracked_bricks_moon_deepslate.png differ diff --git a/kubejs/assets/tfg/textures/block/rock/gravel_blackstone.png b/kubejs/assets/tfg/textures/block/rock/gravel_blackstone.png new file mode 100644 index 000000000..d395af481 Binary files /dev/null and b/kubejs/assets/tfg/textures/block/rock/gravel_blackstone.png differ diff --git a/kubejs/assets/tfg/textures/block/rock/gravel_crackrack.png b/kubejs/assets/tfg/textures/block/rock/gravel_crackrack.png new file mode 100644 index 000000000..1b55664b2 Binary files /dev/null and b/kubejs/assets/tfg/textures/block/rock/gravel_crackrack.png differ diff --git a/kubejs/assets/tfg/textures/block/rock/gravel_deepslate.png b/kubejs/assets/tfg/textures/block/rock/gravel_deepslate.png new file mode 100644 index 000000000..c8a1bde40 Binary files /dev/null and b/kubejs/assets/tfg/textures/block/rock/gravel_deepslate.png differ diff --git a/kubejs/assets/tfg/textures/block/rock/gravel_dripstone.png b/kubejs/assets/tfg/textures/block/rock/gravel_dripstone.png new file mode 100644 index 000000000..f03870d92 Binary files /dev/null and b/kubejs/assets/tfg/textures/block/rock/gravel_dripstone.png differ diff --git a/kubejs/assets/tfg/textures/block/rock/gravel_glacio.png b/kubejs/assets/tfg/textures/block/rock/gravel_glacio.png new file mode 100644 index 000000000..6c9499f25 Binary files /dev/null and b/kubejs/assets/tfg/textures/block/rock/gravel_glacio.png differ diff --git a/kubejs/assets/tfg/textures/block/rock/gravel_mars.png b/kubejs/assets/tfg/textures/block/rock/gravel_mars.png new file mode 100644 index 000000000..0bf7192bd Binary files /dev/null and b/kubejs/assets/tfg/textures/block/rock/gravel_mars.png differ diff --git a/kubejs/assets/tfg/textures/block/rock/gravel_mercury.png b/kubejs/assets/tfg/textures/block/rock/gravel_mercury.png new file mode 100644 index 000000000..d42b6f03b Binary files /dev/null and b/kubejs/assets/tfg/textures/block/rock/gravel_mercury.png differ diff --git a/kubejs/assets/tfg/textures/block/rock/gravel_moon.png b/kubejs/assets/tfg/textures/block/rock/gravel_moon.png new file mode 100644 index 000000000..a06e310ad Binary files /dev/null and b/kubejs/assets/tfg/textures/block/rock/gravel_moon.png differ diff --git a/kubejs/assets/tfg/textures/block/rock/gravel_moon_deepslate.png b/kubejs/assets/tfg/textures/block/rock/gravel_moon_deepslate.png new file mode 100644 index 000000000..ce10141ef Binary files /dev/null and b/kubejs/assets/tfg/textures/block/rock/gravel_moon_deepslate.png differ diff --git a/kubejs/assets/tfg/textures/block/rock/gravel_permafrost.png b/kubejs/assets/tfg/textures/block/rock/gravel_permafrost.png new file mode 100644 index 000000000..f0989b893 Binary files /dev/null and b/kubejs/assets/tfg/textures/block/rock/gravel_permafrost.png differ diff --git a/kubejs/assets/tfg/textures/block/rock/gravel_red_granite.png b/kubejs/assets/tfg/textures/block/rock/gravel_red_granite.png new file mode 100644 index 000000000..01e3a3512 Binary files /dev/null and b/kubejs/assets/tfg/textures/block/rock/gravel_red_granite.png differ diff --git a/kubejs/assets/tfg/textures/block/rock/gravel_venus.png b/kubejs/assets/tfg/textures/block/rock/gravel_venus.png new file mode 100644 index 000000000..cb17e4fa0 Binary files /dev/null and b/kubejs/assets/tfg/textures/block/rock/gravel_venus.png differ diff --git a/kubejs/assets/tfg/textures/block/rock/pillar_moon_deepslate.png b/kubejs/assets/tfg/textures/block/rock/pillar_moon_deepslate.png new file mode 100644 index 000000000..543f2ec35 Binary files /dev/null and b/kubejs/assets/tfg/textures/block/rock/pillar_moon_deepslate.png differ diff --git a/kubejs/assets/tfg/textures/block/rock/pillar_moon_deepslate_top.png b/kubejs/assets/tfg/textures/block/rock/pillar_moon_deepslate_top.png new file mode 100644 index 000000000..f96def315 Binary files /dev/null and b/kubejs/assets/tfg/textures/block/rock/pillar_moon_deepslate_top.png differ diff --git a/kubejs/assets/tfg/textures/block/rock/polished_crackrack.png b/kubejs/assets/tfg/textures/block/rock/polished_crackrack.png new file mode 100644 index 000000000..1aca6b9f6 Binary files /dev/null and b/kubejs/assets/tfg/textures/block/rock/polished_crackrack.png differ diff --git a/kubejs/assets/tfg/textures/block/rock/polished_moon_deepslate.png b/kubejs/assets/tfg/textures/block/rock/polished_moon_deepslate.png new file mode 100644 index 000000000..4b5661bbd Binary files /dev/null and b/kubejs/assets/tfg/textures/block/rock/polished_moon_deepslate.png differ diff --git a/kubejs/assets/tfg/textures/item/brick/moon_deepslate.png b/kubejs/assets/tfg/textures/item/brick/moon_deepslate.png new file mode 100644 index 000000000..480f3150e Binary files /dev/null and b/kubejs/assets/tfg/textures/item/brick/moon_deepslate.png differ diff --git a/kubejs/assets/tfg/textures/item/brick/red_granite.png b/kubejs/assets/tfg/textures/item/brick/red_granite.png new file mode 100644 index 000000000..dd7760715 Binary files /dev/null and b/kubejs/assets/tfg/textures/item/brick/red_granite.png differ diff --git a/kubejs/assets/tfg/textures/item/loose/crackrack.png b/kubejs/assets/tfg/textures/item/loose/crackrack.png new file mode 100644 index 000000000..725717a0f Binary files /dev/null and b/kubejs/assets/tfg/textures/item/loose/crackrack.png differ diff --git a/kubejs/assets/tfg/textures/item/loose/red_granite.png b/kubejs/assets/tfg/textures/item/loose/red_granite.png new file mode 100644 index 000000000..2a68bc48b Binary files /dev/null and b/kubejs/assets/tfg/textures/item/loose/red_granite.png differ diff --git a/kubejs/data/beneath/loot_tables/blocks/crackrack.json b/kubejs/data/beneath/loot_tables/blocks/crackrack.json index f61cb825e..716ad1ed9 100644 --- a/kubejs/data/beneath/loot_tables/blocks/crackrack.json +++ b/kubejs/data/beneath/loot_tables/blocks/crackrack.json @@ -19,7 +19,7 @@ }, { "type": "minecraft:item", - "name": "beneath:crackrack_rock", + "name": "tfg:loose/crackrack", "functions": [ { "function": "minecraft:set_count", diff --git a/kubejs/data/tfg/loot_tables/blocks/rock/bricks_moon_deepslate.json b/kubejs/data/tfg/loot_tables/blocks/rock/bricks_moon_deepslate.json new file mode 100644 index 000000000..e07b396c5 --- /dev/null +++ b/kubejs/data/tfg/loot_tables/blocks/rock/bricks_moon_deepslate.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "tfg:rock/bricks_moon_deepslate" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfg/loot_tables/blocks/rock/chiseled_bricks_moon_deepslate.json b/kubejs/data/tfg/loot_tables/blocks/rock/chiseled_bricks_moon_deepslate.json new file mode 100644 index 000000000..3d05a1e33 --- /dev/null +++ b/kubejs/data/tfg/loot_tables/blocks/rock/chiseled_bricks_moon_deepslate.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "tfg:rock/chiseled_bricks_moon_deepslate" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfg/loot_tables/blocks/rock/cobble_blackstone.json b/kubejs/data/tfg/loot_tables/blocks/rock/cobble_blackstone.json new file mode 100644 index 000000000..c3ede98e4 --- /dev/null +++ b/kubejs/data/tfg/loot_tables/blocks/rock/cobble_blackstone.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "tfg:rock/cobble_blackstone" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfg/loot_tables/blocks/rock/cobble_crackrack.json b/kubejs/data/tfg/loot_tables/blocks/rock/cobble_crackrack.json new file mode 100644 index 000000000..2dafa861e --- /dev/null +++ b/kubejs/data/tfg/loot_tables/blocks/rock/cobble_crackrack.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "tfg:rock/cobble_crackrack" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfg/loot_tables/blocks/rock/cobble_dripstone.json b/kubejs/data/tfg/loot_tables/blocks/rock/cobble_dripstone.json new file mode 100644 index 000000000..20dda7fce --- /dev/null +++ b/kubejs/data/tfg/loot_tables/blocks/rock/cobble_dripstone.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "tfg:rock/cobble_dripstone" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfg/loot_tables/blocks/rock/cobble_moon_deepslate.json b/kubejs/data/tfg/loot_tables/blocks/rock/cobble_moon_deepslate.json new file mode 100644 index 000000000..6043da7a8 --- /dev/null +++ b/kubejs/data/tfg/loot_tables/blocks/rock/cobble_moon_deepslate.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "tfg:rock/cobble_moon_deepslate" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfg/loot_tables/blocks/rock/cobble_permafrost.json b/kubejs/data/tfg/loot_tables/blocks/rock/cobble_permafrost.json new file mode 100644 index 000000000..da12291a9 --- /dev/null +++ b/kubejs/data/tfg/loot_tables/blocks/rock/cobble_permafrost.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "tfg:rock/cobble_permafrost" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfg/loot_tables/blocks/rock/cracked_bricks_moon_deepslate.json b/kubejs/data/tfg/loot_tables/blocks/rock/cracked_bricks_moon_deepslate.json new file mode 100644 index 000000000..892601ebf --- /dev/null +++ b/kubejs/data/tfg/loot_tables/blocks/rock/cracked_bricks_moon_deepslate.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "tfg:rock/cracked_bricks_moon_deepslate" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfg/loot_tables/blocks/rock/gravel_blackstone.json b/kubejs/data/tfg/loot_tables/blocks/rock/gravel_blackstone.json new file mode 100644 index 000000000..0d20b2d29 --- /dev/null +++ b/kubejs/data/tfg/loot_tables/blocks/rock/gravel_blackstone.json @@ -0,0 +1,70 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:alternatives", + "children": [ + { + "type": "minecraft:item", + "name": "tfg:rock/gravel_blackstone", + "conditions": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + ] + }, + { + "type": "minecraft:alternatives", + "children": [ + { + "type": "minecraft:item", + "name": "minecraft:flint", + "conditions": [ + { + "condition": "minecraft:table_bonus", + "enchantment": "minecraft:fortune", + "chances": [ + 0.1, + 0.14285715, + 0.25, + 1.0 + ] + } + ] + }, + { + "type": "minecraft:item", + "name": "tfg:rock/gravel_blackstone" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfg/loot_tables/blocks/rock/gravel_crackrack.json b/kubejs/data/tfg/loot_tables/blocks/rock/gravel_crackrack.json new file mode 100644 index 000000000..eddae43a9 --- /dev/null +++ b/kubejs/data/tfg/loot_tables/blocks/rock/gravel_crackrack.json @@ -0,0 +1,70 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:alternatives", + "children": [ + { + "type": "minecraft:item", + "name": "tfg:rock/gravel_crackrack", + "conditions": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + ] + }, + { + "type": "minecraft:alternatives", + "children": [ + { + "type": "minecraft:item", + "name": "minecraft:flint", + "conditions": [ + { + "condition": "minecraft:table_bonus", + "enchantment": "minecraft:fortune", + "chances": [ + 0.1, + 0.14285715, + 0.25, + 1.0 + ] + } + ] + }, + { + "type": "minecraft:item", + "name": "tfg:rock/gravel_crackrack" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfg/loot_tables/blocks/rock/gravel_deepslate.json b/kubejs/data/tfg/loot_tables/blocks/rock/gravel_deepslate.json new file mode 100644 index 000000000..9e5ef2260 --- /dev/null +++ b/kubejs/data/tfg/loot_tables/blocks/rock/gravel_deepslate.json @@ -0,0 +1,70 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:alternatives", + "children": [ + { + "type": "minecraft:item", + "name": "tfg:rock/gravel_deepslate", + "conditions": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + ] + }, + { + "type": "minecraft:alternatives", + "children": [ + { + "type": "minecraft:item", + "name": "minecraft:flint", + "conditions": [ + { + "condition": "minecraft:table_bonus", + "enchantment": "minecraft:fortune", + "chances": [ + 0.1, + 0.14285715, + 0.25, + 1.0 + ] + } + ] + }, + { + "type": "minecraft:item", + "name": "tfg:rock/gravel_deepslate" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfg/loot_tables/blocks/rock/gravel_dripstone.json b/kubejs/data/tfg/loot_tables/blocks/rock/gravel_dripstone.json new file mode 100644 index 000000000..819a92dfd --- /dev/null +++ b/kubejs/data/tfg/loot_tables/blocks/rock/gravel_dripstone.json @@ -0,0 +1,70 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:alternatives", + "children": [ + { + "type": "minecraft:item", + "name": "tfg:rock/gravel_dripstone", + "conditions": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + ] + }, + { + "type": "minecraft:alternatives", + "children": [ + { + "type": "minecraft:item", + "name": "minecraft:flint", + "conditions": [ + { + "condition": "minecraft:table_bonus", + "enchantment": "minecraft:fortune", + "chances": [ + 0.1, + 0.14285715, + 0.25, + 1.0 + ] + } + ] + }, + { + "type": "minecraft:item", + "name": "tfg:rock/gravel_dripstone" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfg/loot_tables/blocks/rock/gravel_glacio.json b/kubejs/data/tfg/loot_tables/blocks/rock/gravel_glacio.json new file mode 100644 index 000000000..8e7508ef2 --- /dev/null +++ b/kubejs/data/tfg/loot_tables/blocks/rock/gravel_glacio.json @@ -0,0 +1,70 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:alternatives", + "children": [ + { + "type": "minecraft:item", + "name": "tfg:rock/gravel_glacio", + "conditions": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + ] + }, + { + "type": "minecraft:alternatives", + "children": [ + { + "type": "minecraft:item", + "name": "minecraft:flint", + "conditions": [ + { + "condition": "minecraft:table_bonus", + "enchantment": "minecraft:fortune", + "chances": [ + 0.1, + 0.14285715, + 0.25, + 1.0 + ] + } + ] + }, + { + "type": "minecraft:item", + "name": "tfg:rock/gravel_glacio" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfg/loot_tables/blocks/rock/gravel_mars.json b/kubejs/data/tfg/loot_tables/blocks/rock/gravel_mars.json new file mode 100644 index 000000000..0c9a1f370 --- /dev/null +++ b/kubejs/data/tfg/loot_tables/blocks/rock/gravel_mars.json @@ -0,0 +1,70 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:alternatives", + "children": [ + { + "type": "minecraft:item", + "name": "tfg:rock/gravel_mars", + "conditions": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + ] + }, + { + "type": "minecraft:alternatives", + "children": [ + { + "type": "minecraft:item", + "name": "minecraft:flint", + "conditions": [ + { + "condition": "minecraft:table_bonus", + "enchantment": "minecraft:fortune", + "chances": [ + 0.1, + 0.14285715, + 0.25, + 1.0 + ] + } + ] + }, + { + "type": "minecraft:item", + "name": "tfg:rock/gravel_mars" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfg/loot_tables/blocks/rock/gravel_mercury.json b/kubejs/data/tfg/loot_tables/blocks/rock/gravel_mercury.json new file mode 100644 index 000000000..626a1e252 --- /dev/null +++ b/kubejs/data/tfg/loot_tables/blocks/rock/gravel_mercury.json @@ -0,0 +1,70 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:alternatives", + "children": [ + { + "type": "minecraft:item", + "name": "tfg:rock/gravel_mercury", + "conditions": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + ] + }, + { + "type": "minecraft:alternatives", + "children": [ + { + "type": "minecraft:item", + "name": "minecraft:flint", + "conditions": [ + { + "condition": "minecraft:table_bonus", + "enchantment": "minecraft:fortune", + "chances": [ + 0.1, + 0.14285715, + 0.25, + 1.0 + ] + } + ] + }, + { + "type": "minecraft:item", + "name": "tfg:rock/gravel_mercury" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfg/loot_tables/blocks/rock/gravel_moon.json b/kubejs/data/tfg/loot_tables/blocks/rock/gravel_moon.json new file mode 100644 index 000000000..09d2e998b --- /dev/null +++ b/kubejs/data/tfg/loot_tables/blocks/rock/gravel_moon.json @@ -0,0 +1,70 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:alternatives", + "children": [ + { + "type": "minecraft:item", + "name": "tfg:rock/gravel_moon", + "conditions": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + ] + }, + { + "type": "minecraft:alternatives", + "children": [ + { + "type": "minecraft:item", + "name": "minecraft:flint", + "conditions": [ + { + "condition": "minecraft:table_bonus", + "enchantment": "minecraft:fortune", + "chances": [ + 0.1, + 0.14285715, + 0.25, + 1.0 + ] + } + ] + }, + { + "type": "minecraft:item", + "name": "tfg:rock/gravel_moon" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfg/loot_tables/blocks/rock/gravel_moon_deepslate.json b/kubejs/data/tfg/loot_tables/blocks/rock/gravel_moon_deepslate.json new file mode 100644 index 000000000..7e1bf9b63 --- /dev/null +++ b/kubejs/data/tfg/loot_tables/blocks/rock/gravel_moon_deepslate.json @@ -0,0 +1,70 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:alternatives", + "children": [ + { + "type": "minecraft:item", + "name": "tfg:rock/gravel_moon_deepslate", + "conditions": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + ] + }, + { + "type": "minecraft:alternatives", + "children": [ + { + "type": "minecraft:item", + "name": "minecraft:flint", + "conditions": [ + { + "condition": "minecraft:table_bonus", + "enchantment": "minecraft:fortune", + "chances": [ + 0.1, + 0.14285715, + 0.25, + 1.0 + ] + } + ] + }, + { + "type": "minecraft:item", + "name": "tfg:rock/gravel_moon_deepslate" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfg/loot_tables/blocks/rock/gravel_permafrost.json b/kubejs/data/tfg/loot_tables/blocks/rock/gravel_permafrost.json new file mode 100644 index 000000000..5267f98d6 --- /dev/null +++ b/kubejs/data/tfg/loot_tables/blocks/rock/gravel_permafrost.json @@ -0,0 +1,70 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:alternatives", + "children": [ + { + "type": "minecraft:item", + "name": "tfg:rock/gravel_permafrost", + "conditions": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + ] + }, + { + "type": "minecraft:alternatives", + "children": [ + { + "type": "minecraft:item", + "name": "minecraft:flint", + "conditions": [ + { + "condition": "minecraft:table_bonus", + "enchantment": "minecraft:fortune", + "chances": [ + 0.1, + 0.14285715, + 0.25, + 1.0 + ] + } + ] + }, + { + "type": "minecraft:item", + "name": "tfg:rock/gravel_permafrost" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfg/loot_tables/blocks/rock/gravel_red_granite.json b/kubejs/data/tfg/loot_tables/blocks/rock/gravel_red_granite.json new file mode 100644 index 000000000..c4a8d619a --- /dev/null +++ b/kubejs/data/tfg/loot_tables/blocks/rock/gravel_red_granite.json @@ -0,0 +1,70 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:alternatives", + "children": [ + { + "type": "minecraft:item", + "name": "tfg:rock/gravel_red_granite", + "conditions": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + ] + }, + { + "type": "minecraft:alternatives", + "children": [ + { + "type": "minecraft:item", + "name": "minecraft:flint", + "conditions": [ + { + "condition": "minecraft:table_bonus", + "enchantment": "minecraft:fortune", + "chances": [ + 0.1, + 0.14285715, + 0.25, + 1.0 + ] + } + ] + }, + { + "type": "minecraft:item", + "name": "tfg:rock/gravel_red_granite" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfg/loot_tables/blocks/rock/gravel_venus.json b/kubejs/data/tfg/loot_tables/blocks/rock/gravel_venus.json new file mode 100644 index 000000000..a4800b69a --- /dev/null +++ b/kubejs/data/tfg/loot_tables/blocks/rock/gravel_venus.json @@ -0,0 +1,70 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:alternatives", + "children": [ + { + "type": "minecraft:item", + "name": "tfg:rock/gravel_venus", + "conditions": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + ] + }, + { + "type": "minecraft:alternatives", + "children": [ + { + "type": "minecraft:item", + "name": "minecraft:flint", + "conditions": [ + { + "condition": "minecraft:table_bonus", + "enchantment": "minecraft:fortune", + "chances": [ + 0.1, + 0.14285715, + 0.25, + 1.0 + ] + } + ] + }, + { + "type": "minecraft:item", + "name": "tfg:rock/gravel_venus" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfg/loot_tables/blocks/rock/pillar_moon_deepslate.json b/kubejs/data/tfg/loot_tables/blocks/rock/pillar_moon_deepslate.json new file mode 100644 index 000000000..836bf83b3 --- /dev/null +++ b/kubejs/data/tfg/loot_tables/blocks/rock/pillar_moon_deepslate.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "tfg:rock/pillar_moon_deepslate" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfg/loot_tables/blocks/rock/polished_crackrack.json b/kubejs/data/tfg/loot_tables/blocks/rock/polished_crackrack.json new file mode 100644 index 000000000..f0e37b50f --- /dev/null +++ b/kubejs/data/tfg/loot_tables/blocks/rock/polished_crackrack.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "tfg:rock/polished_crackrack" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfg/loot_tables/blocks/rock/polished_moon_deepslate.json b/kubejs/data/tfg/loot_tables/blocks/rock/polished_moon_deepslate.json new file mode 100644 index 000000000..7489475e3 --- /dev/null +++ b/kubejs/data/tfg/loot_tables/blocks/rock/polished_moon_deepslate.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "tfg:rock/polished_moon_deepslate" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/kubejs/server_scripts/gregtech/loot.js b/kubejs/server_scripts/gregtech/loot.js index 4769360d6..70f787b9c 100644 --- a/kubejs/server_scripts/gregtech/loot.js +++ b/kubejs/server_scripts/gregtech/loot.js @@ -22,8 +22,9 @@ const STONE_TYPES_TO_COBBLE = { andesite: 'tfc:rock/cobble/andesite', granite: 'tfc:rock/cobble/granite', deepslate: 'minecraft:cobbled_deepslate', - pyroxenite: 'minecraft:blackstone', - dripstone: 'minecraft:dripstone_block', + pyroxenite: 'tfg:rock/cobble_blackstone', + dripstone: 'tfg:block/rock/cobble_dripstone', + keratophyre: 'tfg:block/rock/cobble_crackrack', moon_stone: 'ad_astra:moon_cobblestone', moon_deepslate: 'ad_astra:moon_sand', mars_stone: 'ad_astra:mars_cobblestone', @@ -36,103 +37,6 @@ const STONE_TYPES_TO_COBBLE = { const registerGTCEULoots = (event) => { // Have to define these here because normal loot table jsons don't support checking for hammers - event.addBlockLootModifier('minecraft:deepslate') - .matchMainHand('#forge:tools/hammers') - .removeLoot(ItemFilter.ALWAYS_TRUE) - .addLoot('minecraft:cobbled_deepslate') - - event.addBlockLootModifier('minecraft:blackstone') - .matchMainHand('#forge:tools/hammers') - .removeLoot(ItemFilter.ALWAYS_TRUE) - .addLoot('tfc:sand/black') - - event.addBlockLootModifier('minecraft:dripstone_block') - .matchMainHand('#forge:tools/hammers') - .removeLoot(ItemFilter.ALWAYS_TRUE) - .addLoot('tfc:sand/brown') - - event.addBlockLootModifier('tfg:rock/hardened_blackstone') - .matchMainHand('#forge:tools/hammers') - .removeLoot(ItemFilter.ALWAYS_TRUE) - .addLoot('tfc:sand/black') - - event.addBlockLootModifier('tfg:rock/hardened_deepslate') - .matchMainHand('#forge:tools/hammers') - .removeLoot(ItemFilter.ALWAYS_TRUE) - .addLoot('minecraft:cobbled_deepslate') - - event.addBlockLootModifier('tfg:rock/hardened_dripstone') - .matchMainHand('#forge:tools/hammers') - .removeLoot(ItemFilter.ALWAYS_TRUE) - .addLoot('tfc:sand/brown') - - event.addBlockLootModifier('minecraft:gilded_blackstone') - .matchMainHand('#forge:tools/hammers') - .removeLoot(ItemFilter.ALWAYS_TRUE) - .addSequenceLoot( - LootEntry.of('tfc:sand/black'), - LootEntry.of('tfc:powder/native_gold') - ) - - event.addBlockLootModifier('beneath:crackrack') - .matchMainHand('#forge:tools/hammers') - .removeLoot(ItemFilter.ALWAYS_TRUE) - .addLoot('tfc:sand/pink') - - event.addBlockLootModifier('ad_astra:moon_stone') - .matchMainHand('#forge:tools/hammers') - .removeLoot(ItemFilter.ALWAYS_TRUE) - .addLoot('ad_astra:moon_cobblestone') - - event.addBlockLootModifier('ad_astra:moon_cobblestone') - .matchMainHand('#forge:tools/hammers') - .removeLoot(ItemFilter.ALWAYS_TRUE) - .addLoot('ad_astra:moon_sand') - - event.addBlockLootModifier('ad_astra:moon_deepslate') - .matchMainHand('#forge:tools/hammers') - .removeLoot(ItemFilter.ALWAYS_TRUE) - .addLoot('ad_astra:moon_sand') - - event.addBlockLootModifier('ad_astra:mars_stone') - .matchMainHand('#forge:tools/hammers') - .removeLoot(ItemFilter.ALWAYS_TRUE) - .addLoot('ad_astra:mars_cobblestone') - - event.addBlockLootModifier('ad_astra:mars_cobblestone') - .matchMainHand('#forge:tools/hammers') - .removeLoot(ItemFilter.ALWAYS_TRUE) - .addLoot('ad_astra:mars_sand') - - event.addBlockLootModifier('ad_astra:venus_stone') - .matchMainHand('#forge:tools/hammers') - .removeLoot(ItemFilter.ALWAYS_TRUE) - .addLoot('ad_astra:venus_cobblestone') - - event.addBlockLootModifier('ad_astra:venus_cobblestone') - .matchMainHand('#forge:tools/hammers') - .removeLoot(ItemFilter.ALWAYS_TRUE) - .addLoot('ad_astra:venus_sand') - - event.addBlockLootModifier('ad_astra:mercury_stone') - .matchMainHand('#forge:tools/hammers') - .removeLoot(ItemFilter.ALWAYS_TRUE) - .addLoot('ad_astra:mercury_cobblestone') - - event.addBlockLootModifier('ad_astra:mercury_cobblestone') - .matchMainHand('#forge:tools/hammers') - .removeLoot(ItemFilter.ALWAYS_TRUE) - .addLoot('tfc:sand/red') - - event.addBlockLootModifier('ad_astra:glacio_stone') - .matchMainHand('#forge:tools/hammers') - .removeLoot(ItemFilter.ALWAYS_TRUE) - .addLoot('ad_astra:glacio_cobblestone') - - event.addBlockLootModifier('ad_astra:glacio_cobblestone') - .matchMainHand('#forge:tools/hammers') - .removeLoot(ItemFilter.ALWAYS_TRUE) - .addLoot('tfc:sand/white') // Crush raw rock into cobble global.TFC_STONE_TYPES.forEach(stoneType => { @@ -142,6 +46,22 @@ const registerGTCEULoots = (event) => { .addLoot(STONE_TYPES_TO_COBBLE[stoneType]); }) + // Defined in kubejs/startup_scripts/tfg/constants.js + global.HAMMERING.forEach(x => { + event.addBlockLootModifier(x.raw) + .matchMainHand('#forge:tools/hammers') + .removeLoot(ItemFilter.ALWAYS_TRUE) + .addLoot(x.hammered) + }) + + event.addBlockLootModifier('minecraft:gilded_blackstone') + .matchMainHand('#forge:tools/hammers') + .removeLoot(ItemFilter.ALWAYS_TRUE) + .addSequenceLoot( + LootEntry.of('tfg:rock/cobble_blackstone'), + LootEntry.of('tfc:powder/native_gold') + ) + // Go through all materials forEachMaterial(material => { if (material.hasProperty(PropertyKey.ORE)) { diff --git a/kubejs/server_scripts/gregtech/recipes.removes.js b/kubejs/server_scripts/gregtech/recipes.removes.js index b668b69c1..4be69d99c 100644 --- a/kubejs/server_scripts/gregtech/recipes.removes.js +++ b/kubejs/server_scripts/gregtech/recipes.removes.js @@ -666,6 +666,16 @@ function removeGTCEURecipes(event) { event.remove({ id: 'gtceu:forming_press/form_purpur_slab_into_pillar' }) event.remove({ id: 'gtceu:rock_breaker/red_granite' }) + event.remove({ id: 'gtceu:laser_engraver/engrave_red_granite_bricks' }) + event.remove({ id: 'gtceu:laser_extruder/extrude_red_granite_bricks' }) + event.remove({ id: 'gtceu:laser_engraver/engrave_red_granite_tile' }) + event.remove({ id: 'gtceu:laser_engraver/gtceu_red_granite_tile' }) + event.remove({ id: 'gtceu:laser_engraver/engrave_red_granite_small_tile' }) + event.remove({ id: 'gtceu:laser_engraver/engrave_red_granite_windmill_a' }) + event.remove({ id: 'gtceu:laser_engraver/engrave_red_granite_windmill_b' }) + event.remove({ id: 'gtceu:laser_engraver/engrave_small_red_granite_bricks' }) + event.remove({ id: 'gtceu:laser_engraver/engrave_square_red_granite_bricks' }) + event.remove({ id: 'gtceu:laser_engraver/engrave_chiseled_red_granite' }) event.remove({ id: 'gtceu:lathe/stone_rod_from_cobblestone' }) diff --git a/kubejs/server_scripts/tfg/recipes.collapse.js b/kubejs/server_scripts/tfg/recipes.collapse.js index 4d2de6a9c..62e039d47 100644 --- a/kubejs/server_scripts/tfg/recipes.collapse.js +++ b/kubejs/server_scripts/tfg/recipes.collapse.js @@ -9,18 +9,28 @@ function registerTFGCollapseRecipes(event) { // #region Nether event.recipes.tfc.collapse('minecraft:cobbled_deepslate', 'minecraft:deepslate') event.recipes.tfc.collapse('minecraft:cobbled_deepslate', 'tfg:rock/hardened_deepslate') - event.recipes.tfc.collapse('minecraft:blackstone', 'minecraft:blackstone') - event.recipes.tfc.collapse('minecraft:blackstone', 'tfg:rock/hardened_blackstone') - event.recipes.tfc.collapse('minecraft:dripstone_block', 'minecraft:dripstone_block') - event.recipes.tfc.collapse('minecraft:dripstone_block', 'tfg:rock/hardened_dripstone') - + event.recipes.tfc.collapse('tfg:rock/cobble_blackstone', 'minecraft:blackstone') + event.recipes.tfc.collapse('tfg:rock/cobble_blackstone', 'tfg:rock/hardened_blackstone') + event.recipes.tfc.collapse('tfg:rock/cobble_dripstone', 'minecraft:dripstone_block') + event.recipes.tfc.collapse('tfg:rock/cobble_dripstone', 'tfg:rock/hardened_dripstone') + event.recipes.tfc.collapse('tfg:rock/cobble_crackrack', 'beneath:crackrack') event.recipes.tfc.collapse('tfc:rock/cobble/basalt', 'minecraft:basalt') + event.recipes.tfc.collapse('minecraft:cobbled_deepslate', '#forge:ores_in_ground/deepslate') - event.recipes.tfc.collapse('minecraft:blackstone', '#forge:ores_in_ground/pyroxenite') - event.recipes.tfc.collapse('minecraft:dripstone_block', '#forge:ores_in_ground/dripstone') + event.recipes.tfc.collapse('tfg:rock/cobble_blackstone', '#forge:ores_in_ground/pyroxenite') + event.recipes.tfc.collapse('tfg:rock/cobble_dripstone', '#forge:ores_in_ground/dripstone') event.recipes.tfc.landslide('tfg:ash_pile', 'tfg:ash_pile') event.recipes.tfc.landslide('minecraft:cobbled_deepslate', 'minecraft:cobbled_deepslate') + event.recipes.tfc.landslide('tfg:rock/cobble_blackstone', 'tfg:rock/cobble_blackstone') + event.recipes.tfc.landslide('tfg:rock/cobble_dripstone', 'tfg:rock/cobble_dripstone') + event.recipes.tfc.landslide('tfg:rock/cobble_crackrack', 'tfg:rock/cobble_crackrack') + + event.recipes.tfc.landslide('tfg:rock/gravel_deepslate', 'tfg:rock/gravel_deepslate') + event.recipes.tfc.landslide('tfg:rock/gravel_blackstone', 'tfg:rock/gravel_blackstone') + event.recipes.tfc.landslide('tfg:rock/gravel_dripstone', 'tfg:rock/gravel_dripstone') + event.recipes.tfc.landslide('tfg:rock/gravel_crackrack', 'tfg:rock/gravel_crackrack') + // #endregion Nether // #region Space @@ -28,44 +38,59 @@ function registerTFGCollapseRecipes(event) { event.recipes.tfc.collapse('ad_astra:moon_cobblestone', 'tfg:rock/hardened_moon_stone') event.recipes.tfc.landslide('ad_astra:moon_cobblestone', 'ad_astra:moon_cobblestone') event.recipes.tfc.collapse('ad_astra:moon_cobblestone', '#forge:ores_in_ground/moon_stone') - event.recipes.tfc.landslide('ad_astra:moon_sand', 'ad_astra:moon_sand') + event.recipes.tfc.landslide('tfg:rock/gravel_moon', 'tfg:rock/gravel_moon') event.recipes.tfc.collapse('ad_astra:moon_deepslate', 'ad_astra:moon_deepslate') event.recipes.tfc.collapse('ad_astra:moon_deepslate', 'tfg:rock/hardened_moon_deepslate') event.recipes.tfc.collapse('ad_astra:moon_deepslate', '#forge:ores_in_ground/moon_deepslate') + event.recipes.tfc.landslide('tfg:rock/cobble_moon_deepslate', 'tfg:rock/cobble_moon_deepslate') + event.recipes.tfc.landslide('tfg:rock/gravel_moon_deepslate', 'tfg:rock/gravel_moon_deepslate') + + event.recipes.tfc.landslide('ad_astra:moon_sand', 'ad_astra:moon_sand') + + event.recipes.tfc.collapse('ad_astra:glacio_cobblestone', 'ad_astra:glacio_stone') + event.recipes.tfc.collapse('ad_astra:glacio_cobblestone', 'tfg:rock/hardened_glacio_stone') + event.recipes.tfc.landslide('ad_astra:glacio_cobblestone', 'ad_astra:glacio_cobblestone') + event.recipes.tfc.collapse('ad_astra:glacio_cobblestone', '#forge:ores_in_ground/glacio_stone') + event.recipes.tfc.landslide('tfg:rock/gravel_glacio', 'tfg:rock/gravel_glacio') event.recipes.tfc.collapse('ad_astra:mars_cobblestone', 'ad_astra:mars_stone') event.recipes.tfc.collapse('ad_astra:mars_cobblestone', 'tfg:rock/hardened_mars_stone') event.recipes.tfc.landslide('ad_astra:mars_cobblestone', 'ad_astra:mars_cobblestone') event.recipes.tfc.collapse('ad_astra:mars_cobblestone', '#forge:ores_in_ground/mars_stone') + event.recipes.tfc.landslide('tfg:rock/gravel_mars', 'tfg:rock/gravel_mars') event.recipes.tfc.landslide('ad_astra:mars_sand', 'ad_astra:mars_sand') event.recipes.tfc.collapse('ad_astra:venus_cobblestone', 'ad_astra:venus_stone') event.recipes.tfc.collapse('ad_astra:venus_cobblestone', 'tfg:rock/hardened_venus_stone') event.recipes.tfc.landslide('ad_astra:venus_cobblestone', 'ad_astra:venus_cobblestone') event.recipes.tfc.collapse('ad_astra:venus_cobblestone', '#forge:ores_in_ground/venus_stone') + event.recipes.tfc.landslide('tfg:rock/gravel_venus', 'tfg:rock/gravel_venus') event.recipes.tfc.landslide('ad_astra:venus_sand', 'ad_astra:venus_sand') event.recipes.tfc.collapse('ad_astra:mercury_cobblestone', 'ad_astra:mercury_stone') event.recipes.tfc.collapse('ad_astra:mercury_cobblestone', 'tfg:rock/hardened_mercury_stone') event.recipes.tfc.landslide('ad_astra:mercury_cobblestone', 'ad_astra:mercury_cobblestone') event.recipes.tfc.collapse('ad_astra:mercury_cobblestone', '#forge:ores_in_ground/mercury_stone') + event.recipes.tfc.landslide('tfg:rock/gravel_mercury', 'tfg:rock/gravel_mercury') - event.recipes.tfc.collapse('ad_astra:glacio_cobblestone', 'ad_astra:glacio_stone') - event.recipes.tfc.collapse('ad_astra:glacio_cobblestone', 'tfg:rock/hardened_glacio_stone') - event.recipes.tfc.landslide('ad_astra:glacio_cobblestone', 'ad_astra:glacio_cobblestone') - event.recipes.tfc.collapse('ad_astra:glacio_cobblestone', '#forge:ores_in_ground/glacio_stone') + event.recipes.tfc.collapse('tfg:rock/cobble_permafrost', 'ad_astra:permafrost') + event.recipes.tfc.landslide('tfg:rock/cobble_permafrost', 'tfg:rock/cobble_permafrost') + event.recipes.tfc.collapse('tfg:rock/cobble_permafrost', '#forge:ores_in_ground/permafrost') + event.recipes.tfc.landslide('tfg:rock/gravel_permafrost', 'tfg:rock/gravel_permafrost') event.recipes.tfc.landslide('minecraft:red_sand', 'minecraft:red_sand') event.recipes.tfc.landslide('gtceu:red_granite_cobblestone', 'gtceu:red_granite_cobblestone') event.recipes.tfc.collapse('gtceu:red_granite_cobblestone', 'gtceu:red_granite') event.recipes.tfc.collapse('gtceu:red_granite_cobblestone', 'tfg:rock/hardened_red_granite') event.recipes.tfc.collapse('gtceu:red_granite_cobblestone', '#forge:ores_in_ground/red_granite') + event.recipes.tfc.landslide('tfg:rock/gravel_red_granite', 'tfg:rock/gravel_red_granite') event.recipes.tfc.landslide('tfg:grass/mars_dirt', 'tfg:grass/mars_dirt') event.recipes.tfc.landslide('tfg:grass/mars_dirt', 'tfg:grass/amber_mycelium') event.recipes.tfc.landslide('tfg:grass/mars_dirt', 'tfg:grass/rusticus_mycelium') event.recipes.tfc.landslide('tfg:grass/mars_dirt', 'tfg:grass/sangnum_mycelium') + event.recipes.tfc.landslide('tfg:grass/mars_clay_dirt', 'tfg:grass/mars_clay_dirt') event.recipes.tfc.landslide('tfg:grass/mars_clay_dirt', 'tfg:grass/amber_clay_mycelium') event.recipes.tfc.landslide('tfg:grass/mars_clay_dirt', 'tfg:grass/rusticus_clay_mycelium') diff --git a/kubejs/server_scripts/tfg/recipes.rocks.js b/kubejs/server_scripts/tfg/recipes.rocks.js index b850e8dad..4b81426f5 100644 --- a/kubejs/server_scripts/tfg/recipes.rocks.js +++ b/kubejs/server_scripts/tfg/recipes.rocks.js @@ -14,18 +14,24 @@ function registerTFGRockRecipes(event) { { loose: 'tfg:loose/deepslate', block: 'minecraft:cobbled_deepslate' }, { loose: 'beneath:blackstone_pebble', block: 'minecraft:blackstone' }, { loose: 'tfg:brick/deepslate', block: '4x minecraft:deepslate_bricks' }, - { loose: 'tfg:loose/dripstone', block: 'minecraft:dripstone_block' }, + { loose: 'tfg:loose/dripstone', block: 'tfg:rock/cobble_dripstone' }, + { loose: 'tfg:loose/crackrack', block: 'tfg:rock/cobble_crackrack' }, { loose: 'tfg:loose/moon_stone', block: 'ad_astra:moon_cobblestone' }, { loose: 'tfg:brick/moon_stone', block: '4x ad_astra:moon_stone_bricks' }, + { loose: 'tfg:loose/moon_deepslate', block: 'tfg:rock/cobble_moon_deepslate' }, + { loose: 'tfg:brick/moon_deepslate', block: '4x tfg:rock/bricks_moon_deepslate' }, { 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: '4x ad_astra:mars_stone_bricks' }, { loose: 'tfg:loose/venus_stone', block: 'ad_astra:venus_cobblestone' }, { loose: 'tfg:brick/venus_stone', block: '4x ad_astra:venus_stone_bricks' }, + { loose: 'tfg:loose/red_granite', block: 'gtceu:red_granite_cobblestone' }, + { loose: 'tfg:brick/red_granite', block: '4x gtceu:red_granite_bricks' }, { loose: 'tfg:loose/mercury_stone', block: 'ad_astra:mercury_cobblestone' }, { 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: '4x ad_astra:glacio_stone_bricks' }, + { loose: 'tfg:loose/permafrost', block: 'tfg:rock/cobble_permafrost' }, { loose: 'tfg:brick/permafrost', block: '4x ad_astra:permafrost_bricks' }, { loose: 'minecraft:popped_chorus_fruit', block: '4x minecraft:purpur_block' } ] @@ -49,11 +55,49 @@ function registerTFGRockRecipes(event) { .EUt(2) }) + // Cobble to loose + + const COBBLE_TO_LOOSE = [ + { cobble: 'minecraft:blackstone', loose: 'beneath:blackstone_pebble' }, + { cobble: 'tfg:rock/cobble_dripstone', loose: 'tfg:loose/dripstone' }, + { cobble: 'tfg:rock/cobble_crackrack', loose: 'tfg:loose/crackrack' }, + { cobble: 'tfg:rock/cobble_moon_deepslate', loose: 'tfg:loose/moon_deepslate' }, + { cobble: 'gtceu:red_granite_cobblestone', loose: 'tfg:brick/red_granite' }, + { cobble: 'tfg:rock/cobble_permafrost', loose: 'tfg:loose/permafrost' }, + ] + + COBBLE_TO_LOOSE.forEach(x => { + event.shapeless(`4x ${x.loose}`, [x.cobble]) + }) + + // loose to gravel + + const LOOSE_TO_GRAVEL = [ + { loose: 'tfg:loose/deepslate', gravel: 'tfg:rock/gravel_deepslate' }, + { loose: 'beneath:blackstone_pebble', gravel: 'tfg:rock/gravel_blackstone' }, + { loose: 'tfg:loose/dripstone', gravel: 'tfg:rock/gravel_dripstone' }, + { loose: 'tfg:loose/crackrack', gravel: 'tfg:rock/gravel_crackrack' }, + { loose: 'tfg:loose/moon_stone', gravel: 'tfg:rock/gravel_moon' }, + { loose: 'tfg:loose/moon_deepslate', gravel: 'tfg:rock/gravel_moon_deepslate' }, + { loose: 'tfg:loose/glacio_stone', gravel: 'tfg:rock/gravel_glacio' }, + { loose: 'tfg:loose/mars_stone', gravel: 'tfg:rock/gravel_mars' }, + { loose: 'tfg:loose/venus_stone', gravel: 'tfg:rock/gravel_venus' }, + { loose: 'tfg:loose/mercury_stone', gravel: 'tfg:rock/gravel_mercury' }, + { loose: 'tfg:loose/permafrost', gravel: 'tfg:rock/gravel_permafrost' } + ] + + LOOSE_TO_GRAVEL.forEach(x => { + event.shapeless(x.gravel, [`4x ${x.loose}`]) + event.shapeless(`16x ${x.loose}`, [`4x ${x.gravel}`]) + }) + // loose to bricks const LOOSE_TO_BRICKS = [ { loose: 'tfg:loose/deepslate', brick: 'tfg:brick/deepslate' }, + { loose: 'tfg:loose/crackrack', brick: 'minecraft:nether_brick' }, { loose: 'tfg:loose/moon_stone', brick: 'tfg:brick/moon_stone' }, + { loose: 'tfg:loose/moon_deepslate', brick: 'tfg:brick/moon_deepslate' }, { loose: 'tfg:loose/mars_stone', brick: 'tfg:brick/mars_stone' }, { loose: 'tfg:loose/venus_stone', brick: 'tfg:brick/venus_stone' }, { loose: 'tfg:loose/mercury_stone', brick: 'tfg:brick/mercury_stone' }, @@ -76,35 +120,90 @@ function registerTFGRockRecipes(event) { // raw to polished const RAW_TO_POLISHED = [ + // Beneath { raw: 'minecraft:deepslate', polished: 'minecraft:polished_deepslate' }, - { raw: 'minecraft:blackstone', polished: 'minecraft:polished_blackstone' }, + { raw: 'tfg:rock/hardened_deepslate', polished: 'minecraft:polished_deepslate' }, { raw: 'minecraft:deepslate_bricks', polished: 'minecraft:deepslate_tiles' }, { raw: 'minecraft:deepslate_tiles', polished: 'minecraft:chiseled_deepslate' }, + { raw: 'minecraft:chiseled_deepslate', polished: 'minecraft:deepslate_bricks' }, + + { raw: 'minecraft:blackstone', polished: 'minecraft:polished_blackstone' }, + { raw: 'tfg:rock/hardened_blackstone', polished: 'minecraft:polished_blackstone' }, { raw: 'minecraft:polished_blackstone_bricks', polished: 'minecraft:chiseled_polished_blackstone' }, + { raw: 'minecraft:chiseled_polished_blackstone', polished: 'minecraft:polished_blackstone_bricks' }, + + { raw: 'minecraft:dripstone_block', polished: 'create:polished_cut_dripstone' }, + { raw: 'tfg:rock/hardened_dripstone', polished: 'create:polished_cut_dripstone' }, + { raw: 'create:cut_dripstone_bricks', polished: 'create:small_dripstone_bricks' }, + { raw: 'create:small_dripstone_bricks', polished: 'create:cut_dripstone_bricks' }, + + { raw: 'beneath:crackrack', polished: 'tfg:rock/polished_crackrack' }, + { raw: 'minecraft:basalt', polished: 'minecraft:smooth_basalt' }, { raw: 'minecraft:smooth_basalt', polished: 'minecraft:polished_basalt' }, + + // Moon { raw: 'ad_astra:moon_stone', polished: 'ad_astra:polished_moon_stone' }, + { raw: 'tfg:rock/hardened_moon_stone', polished: 'ad_astra:polished_moon_stone' }, { raw: 'ad_astra:moon_stone_bricks', polished: 'ad_astra:chiseled_moon_stone_bricks' }, + { raw: 'ad_astra:chiseled_moon_stone_bricks', polished: 'ad_astra:moon_stone_bricks' }, + + { raw: 'ad_astra:moon_deepslate', polished: 'tfg:rock/polished_moon_deepslate' }, + { raw: 'tfg:rock/hardened_moon_deepslate', polished: 'tfg:rock/polished_moon_deepslate' }, + { raw: 'tfg:rock/bricks_moon_deepslate', polished: 'tfg:rock/chiseled_bricks_moon_deepslate' }, + { raw: 'tfg:rock/chiseled_bricks_moon_deepslate', polished: 'tfg:rock/bricks_moon_deepslate' }, + + { raw: 'ad_astra:glacio_stone', polished: 'ad_astra:polished_glacio_stone' }, + { raw: 'tfg:rock/hardened_glacio_stone', polished: 'ad_astra:polished_glacio_stone' }, + { raw: 'ad_astra:glacio_stone_bricks', polished: 'ad_astra:chiseled_glacio_stone_bricks' }, + { raw: 'ad_astra:chiseled_glacio_stone_bricks', polished: 'ad_astra:glacio_stone_bricks' }, + + // Mars { raw: 'ad_astra:mars_stone', polished: 'ad_astra:polished_mars_stone' }, + { raw: 'tfg:rock/hardened_mars_stone', polished: 'ad_astra:polished_mars_stone' }, { raw: 'ad_astra:mars_stone_bricks', polished: 'ad_astra:chiseled_mars_stone_bricks' }, + { raw: 'ad_astra:chiseled_mars_stone_bricks', polished: 'ad_astra:mars_stone_bricks' }, + { raw: 'ad_astra:venus_stone', polished: 'ad_astra:polished_venus_stone' }, + { raw: 'tfg:rock/hardened_venus_stone', polished: 'ad_astra:polished_venus_stone' }, { raw: 'ad_astra:venus_stone_bricks', polished: 'ad_astra:chiseled_venus_stone_bricks' }, { raw: 'ad_astra:venus_sandstone', polished: 'ad_astra:venus_sandstone_bricks' }, + { raw: 'ad_astra:venus_sandstone_bricks', polished: 'ad_astra:venus_sandstone' }, + + { raw: 'gtceu:red_granite', polished: 'gtceu:polished_red_granite' }, + { raw: 'tfg:rock/hardened_red_granite', polished: 'gtceu:polished_red_granite' }, + { raw: 'gtceu:red_granite_bricks', polished: 'gtceu:red_granite_tile' }, + { raw: 'gtceu:red_granite_tile', polished: 'gtceu:square_red_granite_bricks' }, + { raw: 'gtceu:square_red_granite_bricks', polished: 'gtceu:red_granite_windmill_a' }, + { raw: 'gtceu:red_granite_windmill_a', polished: 'gtceu:red_granite_windmill_b' }, + { raw: 'gtceu:red_granite_windmill_b', polished: 'gtceu:small_red_granite_bricks' }, + { raw: 'gtceu:small_red_granite_bricks', polished: 'gtceu:red_granite_small_tile' }, + { raw: 'gtceu:red_granite_small_tile', polished: 'gtceu:chiseled_red_granite' }, + { raw: 'gtceu:chiseled_red_granite', polished: 'gtceu:red_granite_bricks' }, + + // Mercury { raw: 'ad_astra:mercury_stone', polished: 'ad_astra:polished_mercury_stone' }, + { raw: 'tfg:rock/hardened_mercury_stone', polished: 'ad_astra:polished_mercury_stone' }, { raw: 'ad_astra:mercury_stone_bricks', polished: 'ad_astra:chiseled_mercury_stone_bricks' }, - { raw: 'ad_astra:glacio_stone', polished: 'ad_astra:polished_glacio_stone' }, - { raw: 'ad_astra:glacio_stone_bricks', polished: 'ad_astra:chiseled_glacio_stone_bricks' }, - { raw: 'ad_astra:conglomerate', polished: 'ad_astra:polished_conglomerate' }, + { raw: 'ad_astra:chiseled_mercury_stone_bricks', polished: 'ad_astra:mercury_stone_bricks' }, + + // Europa { raw: 'ad_astra:permafrost', polished: 'ad_astra:polished_permafrost' }, { raw: 'ad_astra:permafrost_bricks', polished: 'ad_astra:chiseled_permafrost_bricks' }, { raw: 'ad_astra:chiseled_permafrost_bricks', polished: 'ad_astra:permafrost_tiles' }, + { raw: 'ad_astra:permafrost_tiles', polished: 'ad_astra:chiseled_permafrost_bricks' }, + + // Misc { raw: 'ae2:sky_stone_block', polished: 'ae2:smooth_sky_stone_block' }, { raw: 'ae2:smooth_sky_stone_block', polished: 'ae2:sky_stone_brick' }, { raw: 'ae2:sky_stone_brick', polished: 'ae2:sky_stone_small_brick' }, - { raw: 'gtceu:certus_quartz_block', polished: 'ae2:cut_quartz_block' }, + { raw: 'ae2:sky_stone_small_brick', polished: 'ae2:smooth_sky_stone_block' }, + { raw: 'gtceu:certus_quartz_block', polished: 'ae2:cut_quartz_block' } ] RAW_TO_POLISHED.forEach(x => { + event.recipes.tfc.chisel(`${x.polished}`, `${x.raw}`, 'smooth') + event.recipes.tfc.damage_inputs_shapeless_crafting(event.recipes.minecraft.crafting_shapeless( x.polished, [x.raw, '#tfc:chisels'] )) @@ -125,6 +224,49 @@ function registerTFGRockRecipes(event) { //}).id(`tfg:vi/laser/tfg/${x.raw.replace(/:/g, '_')}_to_${x.polished.replace(/:/g, '_')}`) }) + // Stone Cutter Sets + const red_granite_cutter_set = Ingredient.of('#tfg:red_granite_cutter_set').itemIds.toArray().map(String); + red_granite_cutter_set.forEach(block => { + event.stonecutting(block, + Ingredient.of('#tfg:red_granite_cutter_set').subtract(block) + ).id(`tfg:stonecutter/${block.replace(/:/g, "/")}`) + + }) + + const moon_deepslate_cutter_set = Ingredient.of('#tfg:moon_deepslate_cutter_set').itemIds.toArray().map(String); + moon_deepslate_cutter_set.forEach(block => { + event.stonecutting(block, + Ingredient.of('#tfg:moon_deepslate_cutter_set').subtract(block) + ).id(`tfg:stonecutter/${block.replace(/:/g, "/")}`) + + }) + + // pillar shaped recipes + event.shaped( + Item.of('create:deepslate_pillar', 2), [ ' A ', ' A ' ], { A: 'minecraft:polished_deepslate' } + ) + event.shaped( + Item.of('create:layered_deepslate', 2), [ 'AA ' ], { A: 'minecraft:polished_deepslate' } + ) + + event.shaped( + Item.of('create:dripstone_pillar', 2), [ ' A ', ' A ' ], { A: 'create:polished_cut_dripstone' } + ) + event.shaped( + Item.of('create:layered_dripstone', 2), [ 'AA ' ], { A: 'create:polished_cut_dripstone' } + ) + + event.shaped( + Item.of('create:dripstone_pillar', 2), [ ' A ', ' A ' ], { A: 'create:polished_cut_dripstone' } + ) + event.shaped( + Item.of('create:layered_dripstone', 2), [ 'AA ' ], { A: 'create:polished_cut_dripstone' } + ) + + event.shaped( + Item.of('tfg:rock/pillar_moon_deepslate', 2), [ ' A ', ' A ' ], { A: 'tfg:rock/bricks_moon_deepslate' } + ) + // cracked bricks const CRACKING = [ @@ -134,9 +276,12 @@ function registerTFGRockRecipes(event) { { raw: 'ad_astra:mars_stone_bricks', cracked: 'ad_astra:cracked_mars_stone_bricks' }, { raw: 'ad_astra:venus_stone_bricks', cracked: 'ad_astra:cracked_venus_stone_bricks' }, { raw: 'ad_astra:venus_sandstone_bricks', cracked: 'ad_astra:cracked_venus_sandstone_bricks' }, + { raw: 'gtceu:red_granite_bricks', cracked: 'gtceu:cracked_red_granite_bricks' }, { raw: 'ad_astra:mercury_stone_bricks', cracked: 'ad_astra:cracked_mercury_stone_bricks' }, { raw: 'ad_astra:glacio_stone_bricks', cracked: 'ad_astra:cracked_glacio_stone_bricks' }, - { raw: 'ad_astra:permafrost_bricks', cracked: 'ad_astra:cracked_permafrost_bricks' } + { raw: 'ad_astra:permafrost_bricks', cracked: 'ad_astra:cracked_permafrost_bricks' }, + { raw: 'tfg:rock/bricks_moon_deepslate', cracked: 'tfg:rock/cracked_bricks_moon_deepslate' } + ] CRACKING.forEach(x => { @@ -155,8 +300,7 @@ function registerTFGRockRecipes(event) { .id(`greate:pressing/${x.raw}_to_${x.cracked}`.replace(/:/g, '_')) }) - // forge hammer - + // forge hammer / mechanical press const HAMMERING = [ { raw: 'minecraft:deepslate', hammered: 'minecraft:cobbled_deepslate', duration: 10, eu: 16 }, { raw: 'minecraft:cobbled_deepslate', hammered: 'tfc:sand/black', duration: 20*3.5, eu: 2 }, @@ -185,7 +329,8 @@ function registerTFGRockRecipes(event) { { raw: 'ad_astra:permafrost', hammered: '4x gtceu:ice_dust', duration: 20, eu: 2 } ] - HAMMERING.forEach(x => { + // Defined in kubejs/startup_scripts/tfg/constants.js + global.HAMMERING.forEach(x => { event.recipes.gtceu.forge_hammer(`${x.raw}_to_${x.hammered}`.replace(/[: ]/g, '_')) .itemInputs(x.raw) .itemOutputs(x.hammered) @@ -641,7 +786,11 @@ function registerTFGRockRecipes(event) { 'minecraft:deepslate', 'minecraft:cobbled_deepslate', 'minecraft:blackstone', + 'tfg:rock/cobble_blackstone', 'minecraft:dripstone_block', + 'tfg:rock/cobble_dripstone', + 'beneath:crackrack', + 'tfg:rock/cobble_crackrack', 'minecraft:basalt' ] @@ -673,6 +822,13 @@ function registerTFGRockRecipes(event) { .duration(16) .EUt(7) .dimension('ad_astra:moon') + + event.recipes.gtceu.rock_breaker('tfg:moon_deepslate_cobblestone') + .notConsumable('tfg:rock/cobble_moon_deepslate') + .itemOutputs('tfg:rock/cobble_moon_deepslate') + .duration(16) + .EUt(7) + .dimension('ad_astra:moon') event.recipes.gtceu.rock_breaker('tfg:glacio_stone') .notConsumable('ad_astra:glacio_stone') @@ -743,6 +899,21 @@ function registerTFGRockRecipes(event) { .duration(16) .EUt(7) .dimension('ad_astra:mercury') + + event.recipes.gtceu.compressor('tfg:permafrost') + .itemInputs('4x tfg:loose/permafrost') + .itemOutputs('ad_astra:permafrost') + .duration(40*20) + .EUt(2) + .dimension('ad_astra:glacio') + + event.recipes.gtceu.rock_breaker('tfg:permafrost_cobblestone') + .notConsumable('tfg:rock/cobble_permafrost') + .itemOutputs('tfg:rock/cobble_permafrost') + .duration(16) + .EUt(7) + .dimension('ad_astra:glacio') + // #endregion // #region sandstone @@ -752,12 +923,7 @@ function registerTFGRockRecipes(event) { .itemOutputs('ad_astra:venus_sandstone') .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) + .dimension('ad_astra:mars') // #endregion diff --git a/kubejs/server_scripts/tfg/tags.js b/kubejs/server_scripts/tfg/tags.js index 9fd5f17a4..10c75cd65 100644 --- a/kubejs/server_scripts/tfg/tags.js +++ b/kubejs/server_scripts/tfg/tags.js @@ -319,7 +319,372 @@ const registerTFGItemTags = (event) => { event.add('tfg:cannot_launch_in_railgun', 'create_factory_logistics:copper_jar_package_8x8') //#endregion + // #region Nether blocks + + // Deepslate (Migmatite) + const create_deepslate_blocks = Ingredient.of('#create:stone_types/deepslate').itemIds.toArray().map(String); + create_deepslate_blocks.forEach(block => { + event.add('tfc:metamorphic_items', block) + }) + + event.add('tfc:metamorphic_items', 'minecraft:deepslate') + + event.add('tfc:metamorphic_items', 'minecraft:cobbled_deepslate') + + event.add('forge:smooth_stone', 'minecraft:polished_deepslate') + event.add('tfc:metamorphic_items', 'minecraft:polished_deepslate') + event.add('tfc:rock/smooth', 'minecraft:polished_deepslate') + event.add('create:stone_types/deepslate', 'minecraft:polished_deepslate') + + event.add('forge:stone_bricks', 'minecraft:deepslate_bricks') + event.add('tfc:metamorphic_items', 'minecraft:deepslate_bricks') + event.add('tfc:rock/bricks', 'minecraft:deepslate_bricks') + + event.add('forge:stone_bricks', 'minecraft:deepslate_tiles') + event.add('tfc:metamorphic_items', 'minecraft:deepslate_tiles') + event.add('tfc:rock/bricks', 'minecraft:deepslate_tiles') + event.add('tfc:rock/chiseled_bricks', 'minecraft:deepslate_tiles') + + event.add('forge:stone_bricks', 'minecraft:chiseled_deepslate') + event.add('tfc:metamorphic_items', 'minecraft:chiseled_deepslate') + event.add('tfc:rock/bricks', 'minecraft:chiseled_deepslate') + event.add('tfc:rock/chiseled_bricks', 'minecraft:chiseled_deepslate') + + // Blackstone (Pyroxenite) + event.remove('tfc:metamorphic_rock', 'beneath:blackstone_pebble') + event.add('tfc:igneous_intrusive_rock', 'beneath:blackstone_pebble') + event.add('rnr:loose_rock_items', 'beneath:blackstone_pebble') + + event.add('tfc:igneous_intrusive_items', 'beneath:blackstone_brick') + + event.add('forge:stone', 'minecraft:blackstone') + event.add('tfc:igneous_intrusive_items', 'minecraft:blackstone') + + event.add('tfc:igneous_intrusive_items', 'minecraft:gilded_blackstone') + + event.add('forge:smooth_stone', 'minecraft:polished_blackstone') + event.add('tfc:igneous_intrusive_items', 'minecraft:polished_blackstone') + event.add('tfc:rock/smooth', 'minecraft:polished_blackstone') + + event.add('forge:stone_bricks', 'minecraft:polished_blackstone_bricks') + event.add('tfc:igneous_intrusive_items', 'minecraft:polished_blackstone_bricks') + event.add('tfc:rock/bricks', 'minecraft:polished_blackstone_bricks') + + event.add('forge:stone_bricks', 'minecraft:cracked_blackstone_bricks') + event.add('tfc:igneous_intrusive_items', 'minecraft:cracked_blackstone_bricks') + event.add('tfc:rock/bricks', 'minecraft:cracked_blackstone_bricks') + event.add('tfc:rock/cracked_bricks', 'minecraft:cracked_blackstone_bricks') + + event.add('forge:stone_bricks', 'minecraft:polished_blackstone_bricks') + event.add('tfc:igneous_intrusive_items', 'minecraft:polished_blackstone_bricks') + event.add('tfc:rock/bricks', 'minecraft:polished_blackstone_bricks') + + event.add('forge:stone_bricks', 'minecraft:polished_blackstone_bricks') + event.add('tfc:igneous_intrusive_items', 'minecraft:chiseled_polished_blackstone_bricks') + event.add('tfc:rock/bricks', 'minecraft:chiseled_polished_blackstone_bricks') + event.add('tfc:rock/chiseled_bricks', 'minecraft:chiseled_polished_blackstone_bricks') + + event.add('tfc:igneous_intrusive_items', 'minecraft:polished_blackstone_stairs') + event.add('tfg:rock_stairs', 'minecraft:polished_blackstone_stairs') + + event.add('tfc:igneous_intrusive_items', 'minecraft:polished_blackstone_brick_slab') + event.add('tfg:rock_slabs', 'minecraft:polished_blackstone_slab') + + event.add('tfc:igneous_intrusive_items', 'minecraft:polished_blackstone_wall') + event.add('tfg:rock_walls', 'minecraft:polished_blackstone_wall') + + event.add('tfc:igneous_intrusive_items', 'minecraft:polished_blackstone_brick_stairs') + event.add('tfg:brick_stairs', 'minecraft:polished_blackstone_brick_stairs') + + event.add('tfc:igneous_intrusive_items', 'minecraft:polished_blackstone_brick_slab') + event.add('tfg:brick_slabs', 'minecraft:polished_blackstone_brick_slab') + + event.add('tfc:igneous_intrusive_items', 'minecraft:polished_blackstone_brick_wall') + event.add('tfg:brick_walls', 'minecraft:polished_blackstone_brick_wall') + + event.add('tfc:igneous_intrusive_items', 'beneath:blackstone_aqueduct') + + // Dripstone (Travertine) + const create_dripstone_blocks = Ingredient.of('#create:stone_types/dripstone').itemIds.toArray().map(String); + create_dripstone_blocks.forEach(block => { + event.add('tfc:sedimentary_items', block) + }) + + event.add('forge:stone', 'minecraft:dripstone_block') + event.add('tfc:sedimentary_items', 'minecraft:dripstone_block') + + event.add('forge:smooth_stone', 'create:cut_dripstone') + event.add('tfc:sedimentary_items', 'create:cut_dripstone') + event.add('tfc:rock/smooth', 'create:cut_dripstone') + + event.add('forge:stone_bricks', 'create:cut_dripstone_bricks') + event.add('tfc:igneous_intrusive_items', 'create:cut_dripstone_bricks') + event.add('tfc:rock/bricks', 'create:cut_dripstone_bricks') + + event.add('forge:stone_bricks', 'create:small_dripstone_bricks') + event.add('tfc:igneous_intrusive_items', 'create:small_dripstone_bricks') + event.add('tfc:rock/bricks', 'create:small_dripstone_bricks') + event.add('tfc:rock/chiseled_bricks', 'create:small_dripstone_bricks') + + event.add('forge:smooth_stone', 'ad_astra:polished_mars_stone') + event.add('tfc:rock/smooth', 'create:polished_cut_dripstone') + + // Crackrack (Keratophyre) + event.add('forge:stone', 'beneath:crackrack') + event.add('tfc:igneous_intrusive_items', 'beneath:crackrack') + event.add('tfc:igneous_intrusive_items', 'minecraft:nether_brick') + + event.add('forge:stone_bricks', 'minecraft:nether_bricks') + event.add('tfc:igneous_intrusive_items', 'minecraft:nether_bricks') + event.add('tfc:rock/bricks', 'minecraft:nether_bricks') + + // Basalt + event.add('forge:stone', 'minecraft:basalt') + event.add('tfc:igneous_extrusive_items', 'minecraft:basalt') + + event.add('forge:smooth_stone', 'minecraft:smooth_basalt') + event.add('tfc:igneous_extrusive_items', 'minecraft:smooth_basalt') + event.add('tfc:rock/smooth', 'minecraft:smooth_basalt') + + event.add('forge:smooth_stone', 'minecraft:polished_basalt') + event.add('tfc:igneous_extrusive_items', 'minecraft:polished_basalt') + event.add('tfc:rock/smooth', 'minecraft:polished_basalt') + // #endregion + // #region Space blocks + // Moon Stone (Anorthosite) + event.add('forge:stone', 'ad_astra:moon_stone') + event.add('tfc:igneous_intrusive_items', 'ad_astra:moon_stone') + + event.add('forge:cobblestone', 'ad_astra:moon_stone') + event.add('forge:cobblestone/normal', 'ad_astra:moon_stone') + event.add('tfc:igneous_intrusive_items', 'ad_astra:moon_cobblestone') + + event.add('forge:smooth_stone', 'ad_astra:polished_moon_stone') + event.add('tfc:igneous_intrusive_items', 'ad_astra:polished_moon_stone') + event.add('tfc:rock/smooth', 'ad_astra:polished_moon_stone') + + event.add('forge:stone_bricks', 'ad_astra:moon_stone_bricks') + event.add('tfc:igneous_intrusive_items', 'ad_astra:moon_stone_bricks') + event.add('tfc:rock/bricks', 'ad_astra:moon_stone_bricks') + + event.add('forge:stone_bricks', 'ad_astra:cracked_moon_stone_bricks') + event.add('tfc:igneous_intrusive_items', 'ad_astra:cracked_moon_stone_bricks') + event.add('tfc:rock/bricks', 'ad_astra:cracked_moon_stone_bricks') + event.add('tfc:rock/cracked_bricks', 'ad_astra:cracked_moon_stone_bricks') + + event.add('forge:stone_bricks', 'ad_astra:chiseled_moon_stone_bricks') + event.add('tfc:igneous_intrusive_items', 'ad_astra:chiseled_moon_stone_bricks') + event.add('tfc:rock/bricks', 'ad_astra:chiseled_moon_stone_bricks') + event.add('tfc:rock/chiseled_bricks', 'ad_astra:chiseled_moon_stone_bricks') + + event.add('tfc:igneous_intrusive_items', 'ad_astra:moon_pillar') + + + // Moon Deepslate (Norite) + event.add('forge:stone', 'ad_astra:moon_deepslate') + event.add('tfc:igneous_intrusive_items', 'ad_astra:moon_deepslate') + + // Glacio Stone (Phonolite) + event.add('forge:stone', 'ad_astra:glacio_stone') + event.add('tfc:igneous_intrusive_items', 'ad_astra:glacio_stone') + + event.add('forge:cobblestone', 'ad_astra:glacio_cobblestone') + event.add('forge:cobblestone/normal', 'ad_astra:glacio_cobblestone') + event.add('tfc:igneous_intrusive_items', 'ad_astra:glacio_cobblestone') + + event.add('forge:smooth_stone', 'ad_astra:polished_glacio_stone') + event.add('tfc:igneous_intrusive_items', 'ad_astra:polished_glacio_stone') + event.add('tfc:rock/smooth', 'ad_astra:polished_glacio_stone') + + event.add('forge:stone_bricks', 'ad_astra:glacio_stone_bricks') + event.add('tfc:igneous_intrusive_items', 'ad_astra:glacio_stone_bricks') + event.add('tfc:rock/bricks', 'ad_astra:glacio_stone_bricks') + + event.add('forge:stone_bricks', 'ad_astra:cracked_glacio_stone_bricks') + event.add('tfc:igneous_intrusive_items', 'ad_astra:cracked_glacio_stone_bricks') + event.add('tfc:rock/bricks', 'ad_astra:cracked_glacio_stone_bricks') + event.add('tfc:rock/cracked_bricks', 'ad_astra:cracked_glacio_stone_bricks') + + event.add('forge:stone_bricks', 'ad_astra:chiseled_glacio_stone_bricks') + event.add('tfc:igneous_intrusive_items', 'ad_astra:chiseled_glacio_stone_bricks') + event.add('tfc:rock/bricks', 'ad_astra:chiseled_glacio_stone_bricks') + event.add('tfc:rock/chiseled_bricks', 'ad_astra:chiseled_glacio_stone_bricks') + + // Mars Stone (Argillite) + event.add('forge:stone', 'ad_astra:mars_stone') + event.add('tfc:sedimentary_items', 'ad_astra:mars_stone') + + event.add('forge:cobblestone', 'ad_astra:mars_cobblestone') + event.add('forge:cobblestone/normal', 'ad_astra:mars_cobblestone') + event.add('tfc:sedimentary_items', 'ad_astra:mars_cobblestone') + + event.add('forge:smooth_stone', 'ad_astra:polished_mars_stone') + event.add('tfc:sedimentary_items', 'ad_astra:polished_mars_stone') + event.add('tfc:rock/smooth', 'ad_astra:polished_mars_stone') + + event.add('forge:stone_bricks', 'ad_astra:mars_stone_bricks') + event.add('tfc:sedimentary_items', 'ad_astra:mars_stone_bricks') + event.add('tfc:rock/bricks', 'ad_astra:mars_stone_bricks') + + event.add('forge:stone_bricks', 'ad_astra:cracked_mars_stone_bricks') + event.add('tfc:sedimentary_items', 'ad_astra:cracked_mars_stone_bricks') + event.add('tfc:rock/bricks', 'ad_astra:cracked_mars_stone_bricks') + event.add('tfc:rock/cracked_bricks', 'ad_astra:cracked_mars_stone_bricks') + + event.add('forge:stone_bricks', 'ad_astra:chiseled_mars_stone_bricks') + event.add('tfc:sedimentary_items', 'ad_astra:chiseled_mars_stone_bricks') + event.add('tfc:rock/bricks', 'ad_astra:chiseled_mars_stone_bricks') + event.add('tfc:rock/chiseled_bricks', 'ad_astra:chiseled_mars_stone_bricks') + + // Venus Stone (Trachyte) + event.add('forge:stone', 'ad_astra:venus_stone') + event.add('tfc:igneous_extrusive_items', 'ad_astra:venus_stone') + + event.add('forge:cobblestone', 'ad_astra:venus_cobblestone') + event.add('forge:cobblestone/normal', 'ad_astra:venus_cobblestone') + event.add('tfc:igneous_extrusive_items', 'ad_astra:venus_cobblestone') + + event.add('forge:smooth_stone', 'ad_astra:polished_venus_stone') + event.add('tfc:igneous_extrusive_items', 'ad_astra:polished_venus_stone') + event.add('tfc:rock/smooth', 'ad_astra:polished_venus_stone') + + event.add('forge:stone_bricks', 'ad_astra:venus_stone_bricks') + event.add('tfc:igneous_extrusive_items', 'ad_astra:venus_stone_bricks') + event.add('tfc:rock/bricks', 'ad_astra:venus_stone_bricks') + + event.add('forge:stone_bricks', 'ad_astra:cracked_venus_stone_bricks') + event.add('tfc:igneous_extrusive_items', 'ad_astra:cracked_venus_stone_bricks') + event.add('tfc:rock/bricks', 'ad_astra:cracked_venus_stone_bricks') + event.add('tfc:rock/cracked_bricks', 'ad_astra:cracked_venus_stone_bricks') + + event.add('forge:stone_bricks', 'ad_astra:chiseled_venus_stone_bricks') + event.add('tfc:igneous_extrusive_items', 'ad_astra:chiseled_venus_stone_bricks') + event.add('tfc:rock/bricks', 'ad_astra:chiseled_venus_stone_bricks') + event.add('tfc:rock/chiseled_bricks', 'ad_astra:chiseled_venus_stone_bricks') + + // Red Granite + event.add('forge:stone', 'gtceu:red_granite') + event.add('tfc:igneous_intrusive_items', 'gtceu:red_granite') + + event.add('forge:cobblestone', 'gtceu:red_granite_cobblestone') + event.add('forge:cobblestone/normal', 'gtceu:red_granite_cobblestone') + event.add('tfc:igneous_intrusive_items', 'gtceu:red_granite_cobblestone') + + event.add('forge:cobblestone', 'gtceu:mossy_red_granite_cobblestone') + event.add('forge:cobblestone/normal', 'gtceu:mossy_red_granite_cobblestone') + event.add('tfc:igneous_intrusive_items', 'gtceu:mossy_red_granite_cobblestone') + + event.add('forge:smooth_stone', 'gtceu:polished_red_granite') + event.add('tfc:igneous_intrusive_items', 'gtceu:polished_red_granite') + event.add('tfc:rock/smooth', 'gtceu:polished_red_granite') + + event.add('forge:stone_bricks', 'gtceu:red_granite_bricks') + event.add('tfc:igneous_intrusive_items', 'gtceu:red_granite_bricks') + event.add('tfc:rock/bricks', 'gtceu:red_granite_bricks') + event.add('tfg:red_granite_cutter_set', 'gtceu:red_granite_bricks') + + event.add('forge:stone_bricks', 'gtceu:mossy_red_granite_bricks') + event.add('tfc:igneous_intrusive_items', 'gtceu:mossy_red_granite_bricks') + event.add('tfc:rock/bricks', 'gtceu:mossy_red_granite_bricks') + event.add('tfc:rock/mossy_bricks', 'gtceu:mossy_red_granite_bricks') + + event.add('forge:stone_bricks', 'gtceu:cracked_red_granite_bricks') + event.add('tfc:igneous_intrusive_items', 'gtceu:cracked_red_granite_bricks') + event.add('tfc:rock/bricks', 'gtceu:cracked_red_granite_bricks') + event.add('tfc:rock/cracked_bricks', 'gtceu:cracked_red_granite_bricks') + + event.add('forge:stone_bricks', 'gtceu:red_granite_tile') + event.add('tfc:igneous_intrusive_items', 'gtceu:red_granite_tile') + event.add('tfc:rock/bricks', 'gtceu:red_granite_tile') + event.add('tfc:rock/chiseled_bricks', 'gtceu:red_granite_tile') + event.add('tfg:red_granite_cutter_set', 'gtceu:red_granite_tile') + + event.add('forge:stone_bricks', 'gtceu:square_red_granite_bricks') + event.add('tfc:igneous_intrusive_items', 'gtceu:square_red_granite_bricks') + event.add('tfc:rock/bricks', 'gtceu:square_red_granite_bricks') + event.add('tfc:rock/chiseled_bricks', 'gtceu:square_red_granite_bricks') + event.add('tfg:red_granite_cutter_set', 'gtceu:square_red_granite_bricks') + + event.add('forge:stone_bricks', 'gtceu:red_granite_windmill_a') + event.add('tfc:igneous_intrusive_items', 'gtceu:red_granite_windmill_a') + event.add('tfc:rock/bricks', 'gtceu:red_granite_windmill_a') + event.add('tfc:rock/chiseled_bricks', 'gtceu:red_granite_windmill_a') + event.add('tfg:red_granite_cutter_set', 'gtceu:red_granite_windmill_a') + + event.add('forge:stone_bricks', 'gtceu:red_granite_windmill_b') + event.add('tfc:igneous_intrusive_items', 'gtceu:red_granite_windmill_b') + event.add('tfc:rock/bricks', 'gtceu:red_granite_windmill_b') + event.add('tfc:rock/chiseled_bricks', 'gtceu:red_granite_windmill_b') + event.add('tfg:red_granite_cutter_set', 'gtceu:red_granite_windmill_b') + + event.add('forge:stone_bricks', 'gtceu:small_red_granite_bricks') + event.add('tfc:igneous_intrusive_items', 'gtceu:small_red_granite_bricks') + event.add('tfc:rock/bricks', 'gtceu:small_red_granite_bricks') + event.add('tfc:rock/chiseled_bricks', 'gtceu:small_red_granite_bricks') + event.add('tfg:red_granite_cutter_set', 'gtceu:small_red_granite_bricks') + + event.add('forge:stone_bricks', 'gtceu:red_granite_small_tile') + event.add('tfc:igneous_intrusive_items', 'gtceu:red_granite_small_tile') + event.add('tfc:rock/bricks', 'gtceu:red_granite_small_tile') + event.add('tfc:rock/chiseled_bricks', 'gtceu:red_granite_small_tile') + event.add('tfg:red_granite_cutter_set', 'gtceu:red_granite_small_tile') + + event.add('forge:stone_bricks', 'gtceu:chiseled_red_granite') + event.add('tfc:igneous_intrusive_items', 'gtceu:chiseled_red_granite') + event.add('tfc:rock/bricks', 'gtceu:chiseled_red_granite') + event.add('tfc:rock/chiseled_bricks', 'gtceu:chiseled_red_granite') + event.add('tfg:red_granite_cutter_set', 'gtceu:chiseled_red_granite') + + // Mercury Stone (Komatiite) + event.add('forge:stone', 'ad_astra:mercury_stone') + event.add('tfc:igneous_intrusive_items', 'ad_astra:mercury_stone') + + event.add('forge:cobblestone', 'ad_astra:mercury_cobblestone') + event.add('forge:cobblestone/normal', 'ad_astra:mercury_cobblestone') + event.add('tfc:igneous_intrusive_items', 'ad_astra:mercury_cobblestone') + + event.add('forge:smooth_stone', 'ad_astra:polished_mercury_stone') + event.add('tfc:igneous_intrusive_items', 'ad_astra:polished_mercury_stone') + event.add('tfc:rock/smooth', 'ad_astra:polished_mercury_stone') + + event.add('forge:stone_bricks', 'ad_astra:mercury_stone_bricks') + event.add('tfc:igneous_intrusive_items', 'ad_astra:mercury_stone_bricks') + event.add('tfc:rock/bricks', 'ad_astra:mercury_stone_bricks') + + event.add('forge:stone_bricks', 'ad_astra:cracked_mercury_stone_bricks') + event.add('tfc:igneous_intrusive_items', 'ad_astra:cracked_mercury_stone_bricks') + event.add('tfc:rock/bricks', 'ad_astra:cracked_mercury_stone_bricks') + event.add('tfc:rock/cracked_bricks', 'ad_astra:cracked_mercury_stone_bricks') + + event.add('forge:stone_bricks', 'ad_astra:chiseled_mercury_stone_bricks') + event.add('tfc:igneous_intrusive_items', 'ad_astra:chiseled_mercury_stone_bricks') + event.add('tfc:rock/bricks', 'ad_astra:chiseled_mercury_stone_bricks') + event.add('tfc:rock/chiseled_bricks', 'ad_astra:chiseled_mercury_stone_bricks') + + // Permafrost (???) + event.add('forge:stone', 'ad_astra:permafrost') + event.add('tfc:sedimentary_items', 'ad_astra:permafrost') + + event.add('forge:smooth_stone', 'ad_astra:polished_permafrost') + event.add('tfc:sedimentary_items', 'ad_astra:polished_permafrost') + event.add('tfc:rock/smooth', 'ad_astra:polished_permafrost') + + event.add('forge:stone_bricks', 'ad_astra:permafrost_bricks') + event.add('tfc:sedimentary_items', 'ad_astra:permafrost_bricks') + event.add('tfc:rock/bricks', 'ad_astra:permafrost_bricks') + + event.add('forge:stone_bricks', 'ad_astra:cracked_permafrost_bricks') + event.add('tfc:sedimentary_items', 'ad_astra:cracked_permafrost_bricks') + event.add('tfc:rock/bricks', 'ad_astra:cracked_permafrost_bricks') + event.add('tfc:rock/cracked_bricks', 'ad_astra:cracked_permafrost_bricks') + + event.add('forge:stone_bricks', 'ad_astra:chiseled_permafrost_bricks') + event.add('tfc:igneous_intrusive_items', 'ad_astra:chiseled_permafrost_bricks') + event.add('tfc:rock/bricks', 'ad_astra:chiseled_permafrost_bricks') + event.add('tfc:rock/chiseled_bricks', 'ad_astra:chiseled_permafrost_bricks') + + // Dirt event.add('tfg:moon_plants', 'tfg:lunar_roots') event.add('tfg:moon_plants', 'tfg:lunar_sprouts') @@ -333,6 +698,7 @@ const registerTFGItemTags = (event) => { event.add('minecraft:mineable/shovel', 'tfg:grass/amber_mycelium') event.add('minecraft:mineable/shovel', 'tfg:grass/rusticus_mycelium') event.add('minecraft:mineable/shovel', 'tfg:grass/sangnum_mycelium') + // #endregion // Mars stone dust @@ -549,7 +915,7 @@ const registerTFGBlockTags = (event) => { event.add('minecraft:base_stone_nether', 'tfg:rock/hardened_dripstone') event.add('tfc:rock/hardened', 'tfg:rock/hardened_dripstone') // #endregion - + // #region Mars blocks event.add('minecraft:dirt', 'tfg:grass/mars_dirt') event.add('minecraft:dirt', 'tfg:grass/mars_clay_dirt') diff --git a/kubejs/startup_scripts/beneath/constants.js b/kubejs/startup_scripts/beneath/constants.js index 86a0d999d..69fcec829 100644 --- a/kubejs/startup_scripts/beneath/constants.js +++ b/kubejs/startup_scripts/beneath/constants.js @@ -3,6 +3,7 @@ global.BENEATH_DISABLED_ITEMS = [ "beneath:cobblerack", + "beneath:crackrack_rock", "beneath:lost_page", "beneath:ore/slimed_netherrack", "beneath:raw_slime", diff --git a/kubejs/startup_scripts/tfg/blocks.nether.js b/kubejs/startup_scripts/tfg/blocks.nether.js index a63cafe7d..7e2026d03 100644 --- a/kubejs/startup_scripts/tfg/blocks.nether.js +++ b/kubejs/startup_scripts/tfg/blocks.nether.js @@ -2,6 +2,7 @@ function registerTFGNetherBlocks(event) { + // Hardened stones event.create('tfg:rock/hardened_deepslate') .soundType('deepslate') .property(BlockProperties.AXIS) @@ -12,6 +13,7 @@ function registerTFGNetherBlocks(event) { .tagBlock('tfc:can_carve') .tagBoth('forge:stone') .tagBoth('tfc:rock/hardened') + .tagBoth('tfc:metamorphic_items') .tagBlock('minecraft:mineable/pickaxe') .mapColor('terracotta_grey') .fullBlock(true) @@ -26,7 +28,8 @@ function registerTFGNetherBlocks(event) { .tagBlock('tfc:can_carve') .tagBoth('forge:stone') .tagBoth('tfc:rock/hardened') - .mapColor('terracotta_grey') + .tagBoth('tfc:igneous_intrusive_items') + .mapColor('color_black') .tagBlock('minecraft:mineable/pickaxe') .fullBlock(true) .opaque(true) @@ -41,14 +44,17 @@ function registerTFGNetherBlocks(event) { .tagBlock('tfc:can_carve') .tagBoth('forge:stone') .tagBoth('tfc:rock/hardened') - .mapColor('terracotta') + .tagBoth('tfc:sedimentary_items') .tagBlock('minecraft:mineable/pickaxe') + .mapColor('terracotta') .fullBlock(true) .opaque(true) + // Spikes event.create('tfg:spike/dripstone_spike', 'tfc:rock_spike') .textureAll('minecraft:block/dripstone_block') .soundType('dripstone_block') + .tagBoth('tfc:sedimentary_items') .hardness(0.8) .resistance(0.8) .requiresTool(true) @@ -57,6 +63,7 @@ function registerTFGNetherBlocks(event) { event.create('tfg:spike/deepslate_spike', 'tfc:rock_spike') .textureAll('minecraft:block/deepslate') .soundType('deepslate') + .tagBoth('tfc:metamorphic_items') .hardness(0.8) .resistance(0.8) .requiresTool(true) @@ -65,11 +72,13 @@ function registerTFGNetherBlocks(event) { event.create('tfg:spike/blackstone_spike', 'tfc:rock_spike') .textureAll('minecraft:block/blackstone') .stoneSoundType() + .tagBoth('tfc:igneous_intrusive_items') .hardness(0.8) .resistance(0.8) .requiresTool(true) .tagBlock('minecraft:mineable/pickaxe') + // Loose rocks event.create('tfg:loose/deepslate', 'tfc:loose_rock') .itemTexture('tfg:item/loose/deepslate') .rockTypeModel('metamorphic') @@ -92,6 +101,117 @@ function registerTFGNetherBlocks(event) { .tagItem('tfc:sedimentary_rock') .tagItem("rnr:loose_rock_items") + event.create('tfg:loose/crackrack', 'tfc:loose_rock') + .itemTexture('tfg:item/loose/crackrack') + .rockTypeModel('igneous_intrusive') + .soundType('basalt') + .translationKey("block.tfg.loose.crackrack") + .tagBlock('tfc:loose_rocks') + .tagItem('tfc:any_knapping') + .tagItem('tfc:rock_knapping') + .tagItem('tfc:igneous_intrusive_rock') + .tagItem("rnr:loose_rock_items") + + // Cobblestones + event.create('tfg:rock/cobble_blackstone') + .soundType('stone') + .model('tfg:block/rock/cobble_blackstone') + .tagBoth('forge:cobblestone') + .tagBoth('forge:cobblestone/normal') + .tagBoth('tfc:igneous_intrusive_items') + .mapColor('color_black') + .tagBlock('minecraft:mineable/pickaxe') + .tagBlock('tfc:can_landslide') + .fullBlock(true) + .opaque(true) + + event.create('tfg:rock/cobble_dripstone') + .soundType('dripstone_block') + .model('tfg:block/rock/cobble_dripstone') + .tagBoth('forge:cobblestone') + .tagBoth('forge:cobblestone/normal') + .tagBoth('tfc:sedimentary_items') + .mapColor('terracotta') + .tagBlock('minecraft:mineable/pickaxe') + .tagBlock('tfc:can_landslide') + .fullBlock(true) + .opaque(true) + + event.create('tfg:rock/cobble_crackrack') + .soundType('netherrack') + .model('tfg:block/rock/cobble_crackrack') + .tagBoth('forge:cobblestone') + .tagBoth('forge:cobblestone/normal') + .tagBoth('tfc:igneous_intrusive_items') + .mapColor('crimson_stem') + .tagBlock('minecraft:mineable/pickaxe') + .tagBlock('tfc:can_landslide') + .fullBlock(true) + .opaque(true) + + // Smooth Stones + + event.create('tfg:rock/polished_crackrack') + .soundType('basalt') + .model('tfg:block/rock/polished_crackrack') + .tagBoth('forge:smooth_stone') + .tagBoth('tfc:igneous_intrusive_items') + .tagBoth('tfc:rock/smooth') + .mapColor('crimson_stem') + .tagBlock('minecraft:mineable/pickaxe') + .fullBlock(true) + .opaque(true) + + // Gravels + event.create('tfg:rock/gravel_deepslate') + .soundType('gravel') + .model('tfg:block/rock/gravel_deepslate') + .tagBoth('forge:gravel') + .tagBoth('tfc:rock/gravel') + .tagBoth('tfc:metamorphic_items') + .mapColor('terracotta_grey') + .tagBlock('minecraft:mineable/shovel') + .tagBlock('tfc:can_landslide') + .fullBlock(true) + .opaque(true) + + event.create('tfg:rock/gravel_blackstone') + .soundType('gravel') + .model('tfg:block/rock/gravel_blackstone') + .tagBoth('forge:gravel') + .tagBoth('tfc:rock/gravel') + .tagBoth('tfc:igneous_intrusive_items') + .mapColor('color_black') + .tagBlock('minecraft:mineable/shovel') + .tagBlock('tfc:can_landslide') + .fullBlock(true) + .opaque(true) + + event.create('tfg:rock/gravel_dripstone') + .soundType('gravel') + .model('tfg:block/rock/gravel_dripstone') + .tagBoth('forge:gravel') + .tagBoth('tfc:rock/gravel') + .tagBoth('tfc:sedimentary_items') + .mapColor('terracotta') + .tagBlock('minecraft:mineable/shovel') + .tagBlock('tfc:can_landslide') + .fullBlock(true) + .opaque(true) + + event.create('tfg:rock/gravel_crackrack') + .soundType('gravel') + .model('tfg:block/rock/gravel_crackrack') + .tagBoth('forge:gravel') + .tagBoth('tfc:rock/gravel') + .tagBoth('tfc:igneous_intrusive_items') + .mapColor('crimson_stem') + .tagBlock('minecraft:mineable/shovel') + .tagBlock('tfc:can_landslide') + .fullBlock(true) + .opaque(true) + + // Plants event.create('tfg:mushroom_roots', 'tfg:decorative_plant') .soundType('nether_wart') .tagItem('tfc:plants') diff --git a/kubejs/startup_scripts/tfg/blocks.space.js b/kubejs/startup_scripts/tfg/blocks.space.js index cfcf8a0cc..efc0014d9 100644 --- a/kubejs/startup_scripts/tfg/blocks.space.js +++ b/kubejs/startup_scripts/tfg/blocks.space.js @@ -51,6 +51,7 @@ function registerTFGSpaceBlocks(event) { .tagBlock('tfc:can_carve') .tagBoth('forge:stone') .tagBoth('tfc:rock/hardened') + .tagBoth('tfc:igneous_intrusive_items') .tagBlock('minecraft:mineable/pickaxe') .mapColor('terracotta_cyan') .fullBlock(true) @@ -65,6 +66,7 @@ function registerTFGSpaceBlocks(event) { .tagBlock('tfc:can_carve') .tagBoth('forge:stone') .tagBoth('tfc:rock/hardened') + .tagBoth('tfc:igneous_intrusive_items') .tagBlock('minecraft:mineable/pickaxe') .mapColor('terracotta_blue') .fullBlock(true) @@ -280,6 +282,202 @@ function registerTFGSpaceBlocks(event) { .requiresTool(true) .tagBlock('minecraft:mineable/pickaxe') + // Cobblestones + + event.create('tfg:rock/cobble_moon_deepslate') + .soundType('deepslate') + .model('tfg:block/rock/cobble_moon_deepslate') + .tagBoth('forge:cobblestone') + .tagBoth('forge:cobblestone/normal') + .tagBoth('tfc:igneous_intrusive_items') + .mapColor('terracotta_blue') + .tagBlock('minecraft:mineable/pickaxe') + .tagBlock('tfc:can_landslide') + .fullBlock(true) + .opaque(true) + + event.create('tfg:rock/cobble_permafrost') + .soundType('stone') + .model('tfg:block/rock/cobble_permafrost') + .tagBoth('forge:cobblestone') + .tagBoth('forge:cobblestone/normal') + .tagBoth('tfc:igneous_intrusive_items') + .mapColor('snow') + .tagBlock('minecraft:mineable/pickaxe') + .tagBlock('tfc:can_landslide') + .fullBlock(true) + .opaque(true) + + // Gravels + + event.create('tfg:rock/gravel_moon') + .soundType('gravel') + .model('tfg:block/rock/gravel_moon') + .tagBoth('forge:gravel') + .tagBoth('tfc:rock/gravel') + .tagBoth('tfc:igneous_intrusive_items') + .mapColor('terracotta_cyan') + .tagBlock('minecraft:mineable/shovel') + .tagBlock('tfc:can_landslide') + .fullBlock(true) + .opaque(true) + + event.create('tfg:rock/gravel_moon_deepslate') + .soundType('gravel') + .model('tfg:block/rock/gravel_moon_deepslate') + .tagBoth('forge:gravel') + .tagBoth('tfc:rock/gravel') + .tagBoth('tfc:igneous_intrusive_items') + .mapColor('terracotta_blue') + .tagBlock('minecraft:mineable/shovel') + .tagBlock('tfc:can_landslide') + .fullBlock(true) + .opaque(true) + + event.create('tfg:rock/gravel_glacio') + .soundType('gravel') + .model('tfg:block/rock/gravel_glacio') + .tagBoth('forge:gravel') + .tagBoth('tfc:rock/gravel') + .tagBoth('tfc:igneous_intrusive_items') + .mapColor('terracotta_light_blue') + .tagBlock('minecraft:mineable/shovel') + .tagBlock('tfc:can_landslide') + .fullBlock(true) + .opaque(true) + + event.create('tfg:rock/gravel_mars') + .soundType('gravel') + .model('tfg:block/rock/gravel_mars') + .tagBoth('forge:gravel') + .tagBoth('tfc:rock/gravel') + .tagBoth('tfc:igneous_intrusive_items') + .mapColor('terracotta_orange') + .tagBlock('minecraft:mineable/shovel') + .tagBlock('tfc:can_landslide') + .fullBlock(true) + .opaque(true) + + event.create('tfg:rock/gravel_venus') + .soundType('gravel') + .model('tfg:block/rock/gravel_venus') + .tagBoth('forge:gravel') + .tagBoth('tfc:rock/gravel') + .tagBoth('tfc:igneous_intrusive_items') + .mapColor('terracotta_yellow') + .tagBlock('minecraft:mineable/shovel') + .tagBlock('tfc:can_landslide') + .fullBlock(true) + .opaque(true) + + event.create('tfg:rock/gravel_mercury') + .soundType('gravel') + .model('tfg:block/rock/gravel_mercury') + .tagBoth('forge:gravel') + .tagBoth('tfc:rock/gravel') + .tagBoth('tfc:igneous_intrusive_items') + .mapColor('terracotta_purple') + .tagBlock('minecraft:mineable/shovel') + .tagBlock('tfc:can_landslide') + .fullBlock(true) + .opaque(true) + + event.create('tfg:rock/gravel_permafrost') + .soundType('gravel') + .model('tfg:block/rock/gravel_permafrost') + .tagBoth('forge:gravel') + .tagBoth('tfc:rock/gravel') + .tagBoth('tfc:igneous_intrusive_items') + .mapColor('snow') + .tagBlock('minecraft:mineable/shovel') + .tagBlock('tfc:can_landslide') + .fullBlock(true) + .opaque(true) + + event.create('tfg:rock/gravel_red_granite') + .soundType('gravel') + .model('tfg:block/rock/gravel_red_granite') + .tagBoth('forge:gravel') + .tagBoth('tfc:rock/gravel') + .tagBoth('tfc:igneous_intrusive_items') + .mapColor('terracotta_red') + .tagBlock('minecraft:mineable/shovel') + .tagBlock('tfc:can_landslide') + .fullBlock(true) + .opaque(true) + + // Smooth Stones + + event.create('tfg:rock/polished_moon_deepslate') + .soundType('deepslate') + .model('tfg:block/rock/polished_moon_deepslate') + .tagBoth('forge:smooth_stone') + .tagBoth('tfc:igneous_intrusive_items') + .tagBoth('tfc:rock/smooth') + .tagBoth('tfg:brick_index') + .mapColor('terracotta_blue') + .tagBlock('minecraft:mineable/pickaxe') + .fullBlock(true) + .opaque(true) + + // Decorative + + event.create('tfg:rock/bricks_moon_deepslate') + .soundType('deepslate') + .model('tfg:block/rock/bricks_moon_deepslate') + .tagBoth('minecraft:stone_bricks') + .tagBoth('forge:stone_bricks') + .tagBoth('tfc:rock/bricks') + .tagBoth('tfc:igneous_intrusive_items') + .tagBoth('tfg:brick_index') + .tagBoth('tfg:moon_deepslate_cutter_set') + .mapColor('terracotta_blue') + .tagBlock('minecraft:mineable/pickaxe') + .fullBlock(true) + .opaque(true) + + event.create('tfg:rock/cracked_bricks_moon_deepslate') + .soundType('deepslate') + .model('tfg:block/rock/cracked_bricks_moon_deepslate') + .tagBoth('minecraft:stone_bricks') + .tagBoth('forge:stone_bricks') + .tagBoth('tfc:rock/bricks') + .tagBoth('tfc:rock/cracked_bricks') + .tagBoth('tfc:igneous_intrusive_items') + .tagBoth('tfg:brick_index') + .tagBoth('tfg:moon_deepslate_cutter_set') + .mapColor('terracotta_blue') + .tagBlock('minecraft:mineable/pickaxe') + .fullBlock(true) + .opaque(true) + + event.create('tfg:rock/chiseled_bricks_moon_deepslate') + .soundType('deepslate') + .model('tfg:block/rock/chiseled_bricks_moon_deepslate') + .tagBoth('minecraft:stone_bricks') + .tagBoth('forge:stone_bricks') + .tagBoth('tfc:rock/bricks') + .tagBoth('tfc:rock/chiseled_bricks') + .tagBoth('tfc:igneous_intrusive_items') + .tagBoth('tfg:brick_index') + .tagBoth('tfg:moon_deepslate_cutter_set') + .mapColor('terracotta_blue') + .tagBlock('minecraft:mineable/pickaxe') + .fullBlock(true) + .opaque(true) + + event.create('tfg:rock/pillar_moon_deepslate') + .property(BlockProperties.AXIS) + .placementState(event => event.set(BlockProperties.AXIS, event.clickedFace.axis)) + .soundType('deepslate') + .tagBoth('tfc:igneous_intrusive_items') + .tagBoth('tfg:moon_deepslate_cutter_set') + .mapColor('terracotta_blue') + .tagBlock('minecraft:mineable/pickaxe') + .fullBlock(true) + .opaque(true) + + // #region Plants /* diff --git a/kubejs/startup_scripts/tfg/constants.js b/kubejs/startup_scripts/tfg/constants.js index 4a7f24965..808e98b57 100644 --- a/kubejs/startup_scripts/tfg/constants.js +++ b/kubejs/startup_scripts/tfg/constants.js @@ -167,6 +167,83 @@ global.FOOD_FRUIT = [ {name: 'shadow_berry', id: 'betterend:shadow_berry_cooked', saturation: 1, water: 5, fruit: 1.5, decay: 2 } ]; +/** @type {Hammering[]} */ +global.HAMMERING = [ + // Beneath + { raw: 'minecraft:deepslate', hammered: 'minecraft:cobbled_deepslate', duration: 10, eu: 16 }, + { raw: 'tfg:rock/hardened_deepslate', hammered: 'minecraft:cobbled_deepslate', duration: 10, eu: 16 }, + { raw: 'minecraft:cobbled_deepslate', hammered: 'tfg:rock/gravel_deepslate', duration: 10, eu: 16 }, + { raw: 'tfg:rock/gravel_deepslate', hammered: 'tfc:sand/black', duration: 70, eu: 2 }, + + { raw: 'minecraft:blackstone', hammered: 'tfg:rock/cobble_blackstone', duration: 10, eu: 16 }, + { raw: 'tfg:rock/hardened_blackstone', hammered: 'tfg:rock/cobble_blackstone', duration: 10, eu: 16 }, + { raw: 'tfg:rock/cobble_blackstone', hammered: 'tfg:rock/gravel_blackstone', duration: 10, eu: 16 }, + { raw: 'tfg:rock/gravel_blackstone', hammered: 'tfc:sand/black', duration: 70, eu: 2 }, + + { raw: 'minecraft:dripstone_block', hammered: 'tfg:rock/cobble_dripstone', duration: 10, eu: 16 }, + { raw: 'tfg:rock/hardened_dripstone', hammered: 'tfg:rock/cobble_dripstone', duration: 10, eu: 16 }, + { raw: 'tfg:rock/cobble_dripstone', hammered: 'tfg:rock/gravel_dripstone', duration: 10, eu: 16 }, + { raw: 'tfg:rock/gravel_dripstone', hammered: 'tfc:sand/brown', duration: 70, eu: 2 }, + + { raw: 'beneath:crackrack', hammered: 'tfg:rock/cobble_crackrack', duration: 10, eu: 16 }, + { raw: 'tfg:rock/cobble_crackrack', hammered: 'tfg:rock/gravel_crackrack', duration: 10, eu: 16 }, + { raw: 'tfg:rock/gravel_crackrack', hammered: 'tfc:sand/pink', duration: 70, eu: 2 }, + + { raw: 'minecraft:basalt', hammered: 'tfc:rock/cobble/basalt', duration: 10, eu: 16 }, + + // Moon + { raw: 'ad_astra:moon_stone', hammered: 'ad_astra:moon_cobblestone', duration: 10, eu: 16 }, + { raw: 'tfg:rock/hardened_moon_stone', hammered: 'ad_astra:moon_cobblestone', duration: 10, eu: 16 }, + { raw: 'ad_astra:moon_cobblestone', hammered: 'tfg:rock/gravel_moon', duration: 10, eu: 16 }, + { raw: 'tfg:rock/gravel_moon', hammered: 'ad_astra:moon_sand', duration: 70, eu: 2 }, + + { raw: 'ad_astra:moon_deepslate', hammered: 'tfg:rock/cobble_moon_deepslate', duration: 10, eu: 16 }, + { raw: 'ad_astra:hardened_moon_deepslate', hammered: 'tfg:rock/cobble_moon_deepslate', duration: 10, eu: 16 }, + { raw: 'tfg:rock/cobble_moon_deepslate', hammered: 'tfg:rock/gravel_moon_deepslate', duration: 10, eu: 16 }, + { raw: 'tfg:rock/gravel_moon_deepslate', hammered: 'ad_astra:moon_sand', duration: 10, eu: 16 }, + + { raw: 'ad_astra:glacio_stone', hammered: 'ad_astra:glacio_cobblestone', duration: 10, eu: 16 }, + { raw: 'tfg:rock/hardened_glacio_stone', hammered: 'ad_astra:glacio_cobblestone', duration: 10, eu: 16 }, + { raw: 'ad_astra:glacio_cobblestone', hammered: 'tfg:rock/gravel_glacio', duration: 10, eu: 16 }, + { raw: 'tfg:rock/gravel_glacio', hammered: 'tfc:sand/white', duration: 70, eu: 2 }, + + // Mars + { raw: 'ad_astra:mars_stone', hammered: 'ad_astra:mars_cobblestone', duration: 10, eu: 16 }, + { raw: 'tfg:rock/hardened_mars_stone', hammered: 'ad_astra:mars_cobblestone', duration: 10, eu: 16 }, + { raw: 'ad_astra:mars_cobblestone', hammered: 'tfg:rock/gravel_mars', duration: 10, eu: 16 }, + { raw: 'tfg:rock/gravel_mars', hammered: 'ad_astra:mars_sand', duration: 70, eu: 2 }, + + { raw: 'minecraft:red_sandstone', hammered: '4x minecraft:red_sand', duration: 10, eu: 16 }, + + { raw: 'gtceu:red_granite', hammered: 'gtceu:red_granite_cobblestone', duration: 10, eu: 16 }, + { raw: 'tfg:rock/hardened_red_granite', hammered: 'gtceu:red_granite_cobblestone', duration: 10, eu: 16 }, + { raw: 'gtceu:red_granite_cobblestone', hammered: 'tfg:rock/gravel_red_granite', duration: 10, eu: 16 }, + { raw: 'tfg:rock/gravel_red_granite', hammered: 'minecraft:red_sand', duration: 70, eu: 2 }, + + // Venus + { raw: 'ad_astra:venus_stone', hammered: 'ad_astra:venus_cobblestone', duration: 10, eu: 16 }, + { raw: 'tfg:rock/hardened_venus_stone', hammered: 'ad_astra:venus_cobblestone', duration: 10, eu: 16 }, + { raw: 'ad_astra:venus_cobblestone', hammered: 'tfg:rock/gravel_mars', duration: 10, eu: 16 }, + { raw: 'tfg:rock/gravel_mars', hammered: 'ad_astra:venus_sand', duration: 70, eu: 2 }, + + { raw: 'ad_astra:venus_sandstone', hammered: '4x ad_astra:venus_sand', duration: 70, eu: 2 }, + + // Mercury + { raw: 'ad_astra:mercury_stone', hammered: 'ad_astra:mercury_cobblestone', duration: 10, eu: 16 }, + { raw: 'tfg:rock/hardened_mercury_stone', hammered: 'ad_astra:mercury_cobblestone', duration: 10, eu: 16 }, + { raw: 'ad_astra:mercury_cobblestone', hammered: 'tfg:rock/gravel_mars', duration: 10, eu: 16 }, + { raw: 'tfg:rock/gravel_mars', hammered: 'tfc:sand/red', duration: 70, eu: 2 }, + + // Europa + { raw: 'ad_astra:permafrost', hammered: 'tfg:rock/cobble_permafrost', duration: 10, eu: 16 }, + { raw: 'tfg:rock/cobble_permafrost', hammered: 'tfg:rock/gravel_permafrost', duration: 10, eu: 16 }, + { raw: 'tfg:rock/gravel_permafrost', hammered: '4x gtceu:ice_dust', duration: 70, eu: 2 }, + + // Misc + { raw: 'ad_astra:conglomerate', hammered: 'tfc:rock/gravel/conglomerate', duration: 10, eu: 16 } + + ] + global.COOLING_FOODS = [ 'firmalife:food/vanilla_ice_cream', 'firmalife:food/chocolate_ice_cream', @@ -185,4 +262,4 @@ global.WARMING_FOODS = [ 'tfc:food/vegetables_soup', 'tfc:food/protein_soup', 'tfc:food/dairy_soup' -]; \ No newline at end of file +]; diff --git a/kubejs/startup_scripts/tfg/items.js b/kubejs/startup_scripts/tfg/items.js index 32a12587d..8a84d7294 100644 --- a/kubejs/startup_scripts/tfg/items.js +++ b/kubejs/startup_scripts/tfg/items.js @@ -86,6 +86,10 @@ const registerTFGItems = (event) => { .translationKey('item.tfg.brick.glacio_stone') event.create('tfg:brick/permafrost') .translationKey('item.tfg.brick.permafrost') + event.create('tfg:brick/red_granite') + .translationKey('item.tfg.red_granite') + event.create('tfg:brick/moon_deepslate') + .translationKey('item.tfg.moon_deepslate') // #endregion // #region Primitive rubber gloves