diff --git a/kubejs/assets/tfg/blockstates/large_nest_box.json b/kubejs/assets/tfg/blockstates/large_nest_box.json index 52b03f4c9..350cb2cc4 100644 --- a/kubejs/assets/tfg/blockstates/large_nest_box.json +++ b/kubejs/assets/tfg/blockstates/large_nest_box.json @@ -1,138 +1,209 @@ { - "variants": { - "facing=north,has_egg_type=0,nest_part=0": { - "model": "tfg:block/large_nest_box/large_nest_box_empty" - }, - "facing=north,has_egg_type=0,nest_part=1": { - "model": "tfg:block/large_nest_box/large_nest_box_empty", - "y": 90 - }, - "facing=north,has_egg_type=0,nest_part=2": { - "model": "tfg:block/large_nest_box/large_nest_box_empty", - "y": 270 - }, - "facing=north,has_egg_type=0,nest_part=3": { - "model": "tfg:block/large_nest_box/large_nest_box_empty", - "y": 180 - }, + "variants": { + "facing=north,has_egg_type=0,nest_part=0": { + "model": "tfg:block/large_nest_box/large_nest_box_empty" + }, + "facing=north,has_egg_type=0,nest_part=1": { + "model": "tfg:block/large_nest_box/large_nest_box_empty", + "y": 90 + }, + "facing=north,has_egg_type=0,nest_part=2": { + "model": "tfg:block/large_nest_box/large_nest_box_empty", + "y": 270 + }, + "facing=north,has_egg_type=0,nest_part=3": { + "model": "tfg:block/large_nest_box/large_nest_box_empty", + "y": 180 + }, + + + "facing=south,has_egg_type=0,nest_part=0": { + "model": "tfg:block/large_nest_box/large_nest_box_empty", + "y": 180 + }, + "facing=south,has_egg_type=0,nest_part=1": { + "model": "tfg:block/large_nest_box/large_nest_box_empty", + "y": 270 + }, + "facing=south,has_egg_type=0,nest_part=2": { + "model": "tfg:block/large_nest_box/large_nest_box_empty", + "y": 90 + }, + "facing=south,has_egg_type=0,nest_part=3": { + "model": "tfg:block/large_nest_box/large_nest_box_empty" + }, + + + "facing=east,has_egg_type=0,nest_part=0": { + "model": "tfg:block/large_nest_box/large_nest_box_empty", + "y": 90 + }, + "facing=east,has_egg_type=0,nest_part=1": { + "model": "tfg:block/large_nest_box/large_nest_box_empty", + "y": 180 + }, + "facing=east,has_egg_type=0,nest_part=2": { + "model": "tfg:block/large_nest_box/large_nest_box_empty" + }, + "facing=east,has_egg_type=0,nest_part=3": { + "model": "tfg:block/large_nest_box/large_nest_box_empty", + "y": 270 + }, + + + "facing=west,has_egg_type=0,nest_part=0": { + "model": "tfg:block/large_nest_box/large_nest_box_empty", + "y": 270 + }, + "facing=west,has_egg_type=0,nest_part=1": { + "model": "tfg:block/large_nest_box/large_nest_box_empty" + + }, + "facing=west,has_egg_type=0,nest_part=2": { + "model": "tfg:block/large_nest_box/large_nest_box_empty", + "y": 180 + }, + "facing=west,has_egg_type=0,nest_part=3": { + "model": "tfg:block/large_nest_box/large_nest_box_empty", + "y": 90 + + }, + + + "facing=north,has_egg_type=1,nest_part=0": { + "model": "tfg:block/large_nest_box/large_nest_box_sniffer_0" + }, + "facing=north,has_egg_type=1,nest_part=1": { + "model": "tfg:block/large_nest_box/large_nest_box_sniffer_1", + "y": 90 + }, + "facing=north,has_egg_type=1,nest_part=2": { + "model": "tfg:block/large_nest_box/large_nest_box_sniffer_2", + "y": 270 + }, + "facing=north,has_egg_type=1,nest_part=3": { + "model": "tfg:block/large_nest_box/large_nest_box_sniffer_3", + "y": 180 + }, + + "facing=south,has_egg_type=1,nest_part=0": { + "model": "tfg:block/large_nest_box/large_nest_box_sniffer_0", + "y": 180 + }, + "facing=south,has_egg_type=1,nest_part=1": { + "model": "tfg:block/large_nest_box/large_nest_box_sniffer_1", + "y": 270 + }, + "facing=south,has_egg_type=1,nest_part=2": { + "model": "tfg:block/large_nest_box/large_nest_box_sniffer_2", + "y": 90 + }, + "facing=south,has_egg_type=1,nest_part=3": { + "model": "tfg:block/large_nest_box/large_nest_box_sniffer_3" + }, + + "facing=east,has_egg_type=1,nest_part=0": { + "model": "tfg:block/large_nest_box/large_nest_box_sniffer_0", + "y": 90 + }, + "facing=east,has_egg_type=1,nest_part=1": { + "model": "tfg:block/large_nest_box/large_nest_box_sniffer_1", + "y": 180 + }, + "facing=east,has_egg_type=1,nest_part=2": { + "model": "tfg:block/large_nest_box/large_nest_box_sniffer_2" + }, + "facing=east,has_egg_type=1,nest_part=3": { + "model": "tfg:block/large_nest_box/large_nest_box_sniffer_3", + "y": 270 + }, + + "facing=west,has_egg_type=1,nest_part=0": { + "model": "tfg:block/large_nest_box/large_nest_box_sniffer_0", + "y": 270 + }, + "facing=west,has_egg_type=1,nest_part=1": { + "model": "tfg:block/large_nest_box/large_nest_box_sniffer_1" + + }, + "facing=west,has_egg_type=1,nest_part=2": { + "model": "tfg:block/large_nest_box/large_nest_box_sniffer_2", + "y": 180 + }, + "facing=west,has_egg_type=1,nest_part=3": { + "model": "tfg:block/large_nest_box/large_nest_box_sniffer_3", + "y": 90 + + }, + + + + "facing=north,has_egg_type=2,nest_part=0": { + "model": "tfg:block/large_nest_box/large_nest_box_wraptor_0" + }, + "facing=north,has_egg_type=2,nest_part=1": { + "model": "tfg:block/large_nest_box/large_nest_box_wraptor_1", + "y": 90 + }, + "facing=north,has_egg_type=2,nest_part=2": { + "model": "tfg:block/large_nest_box/large_nest_box_wraptor_2", + "y": 270 + }, + "facing=north,has_egg_type=2,nest_part=3": { + "model": "tfg:block/large_nest_box/large_nest_box_wraptor_3", + "y": 180 + }, + + "facing=south,has_egg_type=2,nest_part=0": { + "model": "tfg:block/large_nest_box/large_nest_box_wraptor_0", + "y": 180 + }, + "facing=south,has_egg_type=2,nest_part=1": { + "model": "tfg:block/large_nest_box/large_nest_box_wraptor_1", + "y": 270 + }, + "facing=south,has_egg_type=2,nest_part=2": { + "model": "tfg:block/large_nest_box/large_nest_box_wraptor_2", + "y": 90 + }, + "facing=south,has_egg_type=2,nest_part=3": { + "model": "tfg:block/large_nest_box/large_nest_box_wraptor_3" + }, + + "facing=east,has_egg_type=2,nest_part=0": { + "model": "tfg:block/large_nest_box/large_nest_box_wraptor_0", + "y": 90 + }, + "facing=east,has_egg_type=2,nest_part=1": { + "model": "tfg:block/large_nest_box/large_nest_box_wraptor_1", + "y": 180 + }, + "facing=east,has_egg_type=2,nest_part=2": { + "model": "tfg:block/large_nest_box/large_nest_box_wraptor_2" + }, + "facing=east,has_egg_type=2,nest_part=3": { + "model": "tfg:block/large_nest_box/large_nest_box_wraptor_3", + "y": 270 + }, + + "facing=west,has_egg_type=2,nest_part=0": { + "model": "tfg:block/large_nest_box/large_nest_box_wraptor_0", + "y": 270 + }, + "facing=west,has_egg_type=2,nest_part=1": { + "model": "tfg:block/large_nest_box/large_nest_box_wraptor_1" + + }, + "facing=west,has_egg_type=2,nest_part=2": { + "model": "tfg:block/large_nest_box/large_nest_box_wraptor_2", + "y": 180 + }, + "facing=west,has_egg_type=2,nest_part=3": { + "model": "tfg:block/large_nest_box/large_nest_box_wraptor_3", + "y": 90 + + } + + } - - "facing=south,has_egg_type=0,nest_part=0": { - "model": "tfg:block/large_nest_box/large_nest_box_empty", - "y": 180 - }, - "facing=south,has_egg_type=0,nest_part=1": { - "model": "tfg:block/large_nest_box/large_nest_box_empty", - "y": 270 - }, - "facing=south,has_egg_type=0,nest_part=2": { - "model": "tfg:block/large_nest_box/large_nest_box_empty", - "y": 90 - }, - "facing=south,has_egg_type=0,nest_part=3": { - "model": "tfg:block/large_nest_box/large_nest_box_empty" - }, - - - "facing=east,has_egg_type=0,nest_part=0": { - "model": "tfg:block/large_nest_box/large_nest_box_empty", - "y": 90 - }, - "facing=east,has_egg_type=0,nest_part=1": { - "model": "tfg:block/large_nest_box/large_nest_box_empty", - "y": 180 - }, - "facing=east,has_egg_type=0,nest_part=2": { - "model": "tfg:block/large_nest_box/large_nest_box_empty" - }, - "facing=east,has_egg_type=0,nest_part=3": { - "model": "tfg:block/large_nest_box/large_nest_box_empty", - "y": 270 - }, - - - "facing=west,has_egg_type=0,nest_part=0": { - "model": "tfg:block/large_nest_box/large_nest_box_empty", - "y": 270 - }, - "facing=west,has_egg_type=0,nest_part=1": { - "model": "tfg:block/large_nest_box/large_nest_box_empty" - - }, - "facing=west,has_egg_type=0,nest_part=2": { - "model": "tfg:block/large_nest_box/large_nest_box_empty", - "y": 180 - }, - "facing=west,has_egg_type=0,nest_part=3": { - "model": "tfg:block/large_nest_box/large_nest_box_empty", - "y": 90 - - }, - - - "facing=north,has_egg_type=1,nest_part=0": { - "model": "tfg:block/large_nest_box/large_nest_box_sniffer_0" - }, - "facing=north,has_egg_type=1,nest_part=1": { - "model": "tfg:block/large_nest_box/large_nest_box_sniffer_1", - "y": 90 - }, - "facing=north,has_egg_type=1,nest_part=2": { - "model": "tfg:block/large_nest_box/large_nest_box_sniffer_2", - "y": 270 - }, - "facing=north,has_egg_type=1,nest_part=3": { - "model": "tfg:block/large_nest_box/large_nest_box_sniffer_3", - "y": 180 - }, - - "facing=south,has_egg_type=1,nest_part=0": { - "model": "tfg:block/large_nest_box/large_nest_box_sniffer_0", - "y": 180 - }, - "facing=south,has_egg_type=1,nest_part=1": { - "model": "tfg:block/large_nest_box/large_nest_box_sniffer_1", - "y": 270 - }, - "facing=south,has_egg_type=1,nest_part=2": { - "model": "tfg:block/large_nest_box/large_nest_box_sniffer_2", - "y": 90 - }, - "facing=south,has_egg_type=1,nest_part=3": { - "model": "tfg:block/large_nest_box/large_nest_box_sniffer_3" - }, - - "facing=east,has_egg_type=1,nest_part=0": { - "model": "tfg:block/large_nest_box/large_nest_box_sniffer_0", - "y": 90 - }, - "facing=east,has_egg_type=1,nest_part=1": { - "model": "tfg:block/large_nest_box/large_nest_box_sniffer_1", - "y": 180 - }, - "facing=east,has_egg_type=1,nest_part=2": { - "model": "tfg:block/large_nest_box/large_nest_box_sniffer_2" - }, - "facing=east,has_egg_type=1,nest_part=3": { - "model": "tfg:block/large_nest_box/large_nest_box_sniffer_3", - "y": 270 - }, - - "facing=west,has_egg_type=1,nest_part=0": { - "model": "tfg:block/large_nest_box/large_nest_box_sniffer_0", - "y": 270 - }, - "facing=west,has_egg_type=1,nest_part=1": { - "model": "tfg:block/large_nest_box/large_nest_box_sniffer_1" - - }, - "facing=west,has_egg_type=1,nest_part=2": { - "model": "tfg:block/large_nest_box/large_nest_box_sniffer_2", - "y": 180 - }, - "facing=west,has_egg_type=1,nest_part=3": { - "model": "tfg:block/large_nest_box/large_nest_box_sniffer_3", - "y": 90 - } - } } \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/large_nest_box_warped.json b/kubejs/assets/tfg/blockstates/large_nest_box_warped.json index b5894ba69..3ce30bae1 100644 --- a/kubejs/assets/tfg/blockstates/large_nest_box_warped.json +++ b/kubejs/assets/tfg/blockstates/large_nest_box_warped.json @@ -1,140 +1,206 @@ { - "variants": { - "facing=north,has_egg_type=0,nest_part=0": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_empty" - }, - "facing=north,has_egg_type=0,nest_part=1": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", - "y": 90 - }, - "facing=north,has_egg_type=0,nest_part=2": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", - "y": 270 - }, - "facing=north,has_egg_type=0,nest_part=3": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", - "y": 180 - }, - - - "facing=south,has_egg_type=0,nest_part=0": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", - "y": 180 - }, - "facing=south,has_egg_type=0,nest_part=1": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", - "y": 270 - }, - "facing=south,has_egg_type=0,nest_part=2": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", - "y": 90 - }, - "facing=south,has_egg_type=0,nest_part=3": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_empty" - }, - - - "facing=east,has_egg_type=0,nest_part=0": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", - "y": 90 - }, - "facing=east,has_egg_type=0,nest_part=1": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", - "y": 180 - }, - "facing=east,has_egg_type=0,nest_part=2": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_empty" - }, - "facing=east,has_egg_type=0,nest_part=3": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", - "y": 270 - }, - - - "facing=west,has_egg_type=0,nest_part=0": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", - "y": 270 - }, - "facing=west,has_egg_type=0,nest_part=1": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_empty" - - }, - "facing=west,has_egg_type=0,nest_part=2": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", - "y": 180 - }, - "facing=west,has_egg_type=0,nest_part=3": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", - "y": 90 - - }, - - - "facing=north,has_egg_type=1,nest_part=0": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_0" - }, - "facing=north,has_egg_type=1,nest_part=1": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_1", - "y": 90 - }, - "facing=north,has_egg_type=1,nest_part=2": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_2", - "y": 270 - }, - "facing=north,has_egg_type=1,nest_part=3": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_3", - "y": 180 - }, - - "facing=south,has_egg_type=1,nest_part=0": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_0", - "y": 180 - }, - "facing=south,has_egg_type=1,nest_part=1": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_1", - "y": 270 - }, - "facing=south,has_egg_type=1,nest_part=2": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_2", - "y": 90 - }, - "facing=south,has_egg_type=1,nest_part=3": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_3" - }, - - "facing=east,has_egg_type=1,nest_part=0": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_0", - "y": 90 - }, - "facing=east,has_egg_type=1,nest_part=1": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_1", - "y": 180 - }, - "facing=east,has_egg_type=1,nest_part=2": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_2" - }, - "facing=east,has_egg_type=1,nest_part=3": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_3", - "y": 270 - }, - - "facing=west,has_egg_type=1,nest_part=0": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_0", - "y": 270 - }, - "facing=west,has_egg_type=1,nest_part=1": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_1" - - }, - "facing=west,has_egg_type=1,nest_part=2": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_2", - "y": 180 - }, - "facing=west,has_egg_type=1,nest_part=3": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_3", - "y": 90 - - } - - } + "variants": { + "facing=north,has_egg_type=0,nest_part=0": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_empty" + }, + "facing=north,has_egg_type=0,nest_part=1": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", + "y": 90 + }, + "facing=north,has_egg_type=0,nest_part=2": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", + "y": 270 + }, + "facing=north,has_egg_type=0,nest_part=3": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", + "y": 180 + }, + + + "facing=south,has_egg_type=0,nest_part=0": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", + "y": 180 + }, + "facing=south,has_egg_type=0,nest_part=1": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", + "y": 270 + }, + "facing=south,has_egg_type=0,nest_part=2": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", + "y": 90 + }, + "facing=south,has_egg_type=0,nest_part=3": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_empty" + }, + + + "facing=east,has_egg_type=0,nest_part=0": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", + "y": 90 + }, + "facing=east,has_egg_type=0,nest_part=1": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", + "y": 180 + }, + "facing=east,has_egg_type=0,nest_part=2": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_empty" + }, + "facing=east,has_egg_type=0,nest_part=3": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", + "y": 270 + }, + + + "facing=west,has_egg_type=0,nest_part=0": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", + "y": 270 + }, + "facing=west,has_egg_type=0,nest_part=1": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_empty" + + }, + "facing=west,has_egg_type=0,nest_part=2": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", + "y": 180 + }, + "facing=west,has_egg_type=0,nest_part=3": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", + "y": 90 + + }, + + + "facing=north,has_egg_type=1,nest_part=0": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_0" + }, + "facing=north,has_egg_type=1,nest_part=1": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_1", + "y": 90 + }, + "facing=north,has_egg_type=1,nest_part=2": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_2", + "y": 270 + }, + "facing=north,has_egg_type=1,nest_part=3": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_3", + "y": 180 + }, + + "facing=south,has_egg_type=1,nest_part=0": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_0", + "y": 180 + }, + "facing=south,has_egg_type=1,nest_part=1": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_1", + "y": 270 + }, + "facing=south,has_egg_type=1,nest_part=2": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_2", + "y": 90 + }, + "facing=south,has_egg_type=1,nest_part=3": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_3" + }, + + "facing=east,has_egg_type=1,nest_part=0": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_0", + "y": 90 + }, + "facing=east,has_egg_type=1,nest_part=1": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_1", + "y": 180 + }, + "facing=east,has_egg_type=1,nest_part=2": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_2" + }, + "facing=east,has_egg_type=1,nest_part=3": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_3", + "y": 270 + }, + + "facing=west,has_egg_type=1,nest_part=0": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_0", + "y": 270 + }, + "facing=west,has_egg_type=1,nest_part=1": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_1" + + }, + "facing=west,has_egg_type=1,nest_part=2": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_2", + "y": 180 + }, + "facing=west,has_egg_type=1,nest_part=3": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_3", + "y": 90 + + }, + + + "facing=north,has_egg_type=2,nest_part=0": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_wraptor_0" + }, + "facing=north,has_egg_type=2,nest_part=1": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_wraptor_1", + "y": 90 + }, + "facing=north,has_egg_type=2,nest_part=2": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_wraptor_2", + "y": 270 + }, + "facing=north,has_egg_type=2,nest_part=3": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_wraptor_3", + "y": 180 + }, + + "facing=south,has_egg_type=2,nest_part=0": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_wraptor_0", + "y": 180 + }, + "facing=south,has_egg_type=2,nest_part=1": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_wraptor_1", + "y": 270 + }, + "facing=south,has_egg_type=2,nest_part=2": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_wraptor_2", + "y": 90 + }, + "facing=south,has_egg_type=2,nest_part=3": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_wraptor_3" + }, + + "facing=east,has_egg_type=2,nest_part=0": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_wraptor_0", + "y": 90 + }, + "facing=east,has_egg_type=2,nest_part=1": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_wraptor_1", + "y": 180 + }, + "facing=east,has_egg_type=2,nest_part=2": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_wraptor_2" + }, + "facing=east,has_egg_type=2,nest_part=3": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_wraptor_3", + "y": 270 + }, + + "facing=west,has_egg_type=2,nest_part=0": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_wraptor_0", + "y": 270 + }, + "facing=west,has_egg_type=2,nest_part=1": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_wraptor_1" + + }, + "facing=west,has_egg_type=2,nest_part=2": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_wraptor_2", + "y": 180 + }, + "facing=west,has_egg_type=2,nest_part=3": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_wraptor_3", + "y": 90 + + } + } } \ No newline at end of file diff --git a/kubejs/assets/tfg/lang/en_us.json b/kubejs/assets/tfg/lang/en_us.json index d568248de..6c711a1d8 100644 --- a/kubejs/assets/tfg/lang/en_us.json +++ b/kubejs/assets/tfg/lang/en_us.json @@ -568,6 +568,10 @@ "item.tfg.wood.lumber.glacian": "Glacian Lumber", "item.tfg.glacian_wool": "Glacian Ram Wool", "item.tfg.sniffer_wool": "Mineral Rich Tufts", + "item.tfg.sniffer_egg": "Sniffer Egg", + "item.tfg.wraptor_wool": "Mineral Rich Down Feathers", + "item.tfg.wraptor_egg": "Wraptor Egg", + "item.tfg.wraptor_sugar": "Wraptor Sugar", "item.tfg.aes_polyurethane": "Bio-AES Reinforced R-Polyurethane Foam", "item.tfg.mli_shielding": "Multi-Layer Insulated Shielding", "item.tfg.rocket_cone_t3": "Advanced Rocket Nose Cone", @@ -806,6 +810,9 @@ "entity.tfg.sniffer.male": "Sniffer", "entity.tfg.sniffer.female": "Sniffer", "tfg.tooltip.attribution.sniffer": "§9§oCredit: Minecraft", + "entity.tfg.wraptor.male": "Wraptor", + "entity.tfg.wraptor.female": "Wraptor", + "tfg.tooltip.attribution.wraptor": "§9§oCredit: Species", "item.treetap.tap": "Deprecated Item, Craft to Upgrade", "item.gtceu.zinc_ingot": "Deprecated Item, Craft to Upgrade", "item.gtceu.brass_ingot": "Deprecated Item, Craft to Upgrade", @@ -978,6 +985,10 @@ "tfg.tooltip.solar_panel.large_tier2": "Massive structure producing from §64096 to 16384 EU/t§r on the §6moon§r during the §6day§r", "tfg.tooltip.solar_panel.large_tier3": "Massive structure producing from §616384 to 65536 EU/t§r on the §6moon§r during the §6day§r", "tfg.tooltip.petrified_egg": "§7Requires Magma to Incubate", + "tfg.tooltip.large_egg": "§7Can only be incubated in a §oLarge Nest", + "tfg.tooltip.sniffer_wool": "§7Harvested from the back of a Sniffer", + "tfg.tooltip.wraptor_wool": "§7Harvested from the feathers of a Wraptor", + "tfg.tooltip.wraptor_sugar": "§7Don't think about it too much", "tfg.tooltip.obsolete.depreciated": "§cDeprecated, cannot be crafted any more", "tfc.jei.flint_knapping": "Flint Knapping", "tfc.recipe.barrel.tfg.barrel.dyeing.decorative_vase.black": "Dyeing", @@ -3516,4 +3527,4 @@ "quests.tfg_tips.tools_tips.harvest_basket.subtitle": "For competitive pie bakers.", "quests.tfg_tips.tools_tips.harvest_basket.task": "Any #tfg:harvester", "quests.tfg_tips.tools_tips.harvest_basket.desc": "&l&2Harvest Baskets&r&r are a new tool made just for &5TFG&r! These baskets can be used to harvest whole trees and bushes of fruit in one right-click! A regular &6Harvest Basket&r has a base durability of &n128&r. But an &3Aluminium Harvest Basket&r takes no damage on use." -} \ No newline at end of file +} diff --git a/kubejs/assets/tfg/models/block/large_nest_box/large_nest_box_warped_wraptor_0.json b/kubejs/assets/tfg/models/block/large_nest_box/large_nest_box_warped_wraptor_0.json new file mode 100644 index 000000000..dfb6ea81d --- /dev/null +++ b/kubejs/assets/tfg/models/block/large_nest_box/large_nest_box_warped_wraptor_0.json @@ -0,0 +1,88 @@ +{ + "parent": "minecraft:block/block", + "credit": "made with BlockBench", + "textures": { + "texture": "tfg:block/large_nest/large_nest_warped_sniffer_0", + "particle": "tfg:block/large_nest/large_nest_warped_sniffer_0" + }, + "elements": [ + { + "from": [4, 1, 12], + "to": [16, 3, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [10, 2, 13]}, + "faces": { + "north": {"uv": [0.25, 6.875, 1.75, 7.125], "texture": "texture"}, + "east": {"uv": [0, 6.875, 0.25, 7.125], "texture": "texture"}, + "south": {"uv": [2, 6.875, 3.5, 7.125], "texture": "texture"}, + "west": {"uv": [1.75, 6.875, 2, 7.125], "texture": "texture"}, + "up": {"uv": [1.75, 6.875, 0.25, 6.625], "texture": "texture"}, + "down": {"uv": [3.25, 6.625, 1.75, 6.875], "texture": "texture"} + } + }, + { + "from": [3, 0, 0], + "to": [16, 1, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [9.5, 0.5, 6.5]}, + "faces": { + "north": {"uv": [1.625, 4.75, 3.25, 4.875], "texture": "texture"}, + "east": {"uv": [0, 4.75, 1.625, 4.875], "texture": "texture"}, + "south": {"uv": [4.875, 4.75, 6.5, 4.875], "texture": "texture"}, + "west": {"uv": [3.25, 4.75, 4.875, 4.875], "texture": "texture"}, + "up": {"uv": [3.25, 4.75, 1.625, 3.125], "texture": "texture"}, + "down": {"uv": [4.875, 3.125, 3.25, 4.75], "texture": "texture"} + } + }, + { + "from": [3, 3, 13], + "to": [16, 4, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [9.5, 3.5, 14]}, + "faces": { + "north": {"uv": [0.5, 6.5, 2.125, 6.625], "texture": "texture"}, + "east": {"uv": [0.25, 6.5, 0.5, 6.625], "texture": "texture"}, + "south": {"uv": [2.375, 6.5, 4, 6.625], "texture": "texture"}, + "west": {"uv": [2.125, 6.5, 2.375, 6.625], "texture": "texture"}, + "up": {"uv": [2.125, 6.5, 0.5, 6.25], "texture": "texture"}, + "down": {"uv": [3.75, 6.25, 2.125, 6.5], "texture": "texture"} + } + }, + { + "from": [1, 3, 0], + "to": [3, 4, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [2, 3.5, 7.5]}, + "faces": { + "north": {"uv": [1.875, 6.125, 2.125, 6.25], "texture": "texture"}, + "east": {"uv": [0, 6.125, 1.875, 6.25], "texture": "texture"}, + "south": {"uv": [4, 6.125, 4.25, 6.25], "texture": "texture"}, + "west": {"uv": [2.125, 6.125, 4, 6.25], "texture": "texture"}, + "up": {"uv": [2.125, 6.125, 1.875, 4.25], "texture": "texture"}, + "down": {"uv": [2.375, 4.25, 2.125, 6.125], "texture": "texture"} + } + }, + { + "from": [2, 1, 0], + "to": [4, 3, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [3, 2, 7]}, + "faces": { + "north": {"uv": [5.25, 6.875, 5.5, 7.125], "texture": "texture"}, + "east": {"uv": [3.5, 6.875, 5.25, 7.125], "texture": "texture"}, + "south": {"uv": [7.25, 6.875, 7.5, 7.125], "texture": "texture"}, + "west": {"uv": [5.5, 6.875, 7.25, 7.125], "texture": "texture"}, + "up": {"uv": [5.5, 6.875, 5.25, 5.125], "texture": "texture"}, + "down": {"uv": [5.75, 5.125, 5.5, 6.875], "texture": "texture"} + } + }, + { + "from": [6, 1, 1], + "to": [14, 11, 9], + "rotation": {"angle": 0, "axis": "y", "origin": [14, 1, 5]}, + "faces": { + "north": {"uv": [6.375, 1.5, 7.375, 2.75], "texture": "texture"}, + "east": {"uv": [5.25, 1.5, 6.25, 2.75], "texture": "texture"}, + "south": {"uv": [8.75, 1.5, 9.75, 2.75], "texture": "texture"}, + "west": {"uv": [7.5, 1.5, 8.5, 2.75], "texture": "texture"}, + "up": {"uv": [7.5, 1.375, 6.5, 0.375], "texture": "texture"}, + "down": {"uv": [8.75, 0.25, 7.75, 1.25], "texture": "texture"} + } + } + ] +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/large_nest_box/large_nest_box_warped_wraptor_1.json b/kubejs/assets/tfg/models/block/large_nest_box/large_nest_box_warped_wraptor_1.json new file mode 100644 index 000000000..7ad994634 --- /dev/null +++ b/kubejs/assets/tfg/models/block/large_nest_box/large_nest_box_warped_wraptor_1.json @@ -0,0 +1,88 @@ +{ + "parent": "minecraft:block/block", + "credit": "made with BlockBench", + "textures": { + "texture": "tfg:block/large_nest/large_nest_warped_sniffer_0", + "particle": "tfg:block/large_nest/large_nest_warped_sniffer_0" + }, + "elements": [ + { + "from": [4, 1, 12], + "to": [16, 3, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [10, 2, 13]}, + "faces": { + "north": {"uv": [0.25, 6.5, 1.75, 6.75], "texture": "texture"}, + "east": {"uv": [0, 6.5, 0.25, 6.75], "texture": "texture"}, + "south": {"uv": [2, 6.5, 3.5, 6.75], "texture": "texture"}, + "west": {"uv": [1.75, 6.5, 2, 6.75], "texture": "texture"}, + "up": {"uv": [1.75, 6.5, 0.25, 6.25], "texture": "texture"}, + "down": {"uv": [3.25, 6.25, 1.75, 6.5], "texture": "texture"} + } + }, + { + "from": [3, 0, 0], + "to": [16, 1, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [9.5, 0.5, 6.5]}, + "faces": { + "north": {"uv": [1.625, 4.75, 3.25, 4.875], "texture": "texture"}, + "east": {"uv": [0, 4.75, 1.625, 4.875], "texture": "texture"}, + "south": {"uv": [4.875, 4.75, 6.5, 4.875], "texture": "texture"}, + "west": {"uv": [3.25, 4.75, 4.875, 4.875], "texture": "texture"}, + "up": {"uv": [3.25, 4.75, 1.625, 3.125], "texture": "texture"}, + "down": {"uv": [4.875, 3.125, 3.25, 4.75], "texture": "texture"} + } + }, + { + "from": [3, 3, 13], + "to": [16, 4, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [9.5, 3.5, 14]}, + "faces": { + "north": {"uv": [0.375, 5.625, 2, 5.75], "texture": "texture"}, + "east": {"uv": [0.125, 5.625, 0.375, 5.75], "texture": "texture"}, + "south": {"uv": [2.25, 5.625, 3.875, 5.75], "texture": "texture"}, + "west": {"uv": [2, 5.625, 2.25, 5.75], "texture": "texture"}, + "up": {"uv": [2, 5.625, 0.375, 5.375], "texture": "texture"}, + "down": {"uv": [3.625, 5.375, 2, 5.625], "texture": "texture"} + } + }, + { + "from": [1, 3, 0], + "to": [3, 4, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [2, 3.5, 7.5]}, + "faces": { + "north": {"uv": [3.625, 6.375, 3.875, 6.5], "texture": "texture"}, + "east": {"uv": [1.75, 6.375, 3.625, 6.5], "texture": "texture"}, + "south": {"uv": [5.75, 6.375, 6, 6.5], "texture": "texture"}, + "west": {"uv": [3.875, 6.375, 5.75, 6.5], "texture": "texture"}, + "up": {"uv": [3.875, 6.375, 3.625, 4.5], "texture": "texture"}, + "down": {"uv": [4.125, 4.5, 3.875, 6.375], "texture": "texture"} + } + }, + { + "from": [2, 1, 0], + "to": [4, 3, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [3, 2, 7]}, + "faces": { + "north": {"uv": [4.375, 5.125, 4.625, 5.375], "texture": "texture"}, + "east": {"uv": [2.625, 5.125, 4.375, 5.375], "texture": "texture"}, + "south": {"uv": [6.375, 5.125, 6.625, 5.375], "texture": "texture"}, + "west": {"uv": [4.625, 5.125, 6.375, 5.375], "texture": "texture"}, + "up": {"uv": [4.625, 5.125, 4.375, 3.375], "texture": "texture"}, + "down": {"uv": [4.875, 3.375, 4.625, 5.125], "texture": "texture"} + } + }, + { + "from": [8, 1, 2], + "to": [15, 10, 9], + "rotation": {"angle": 0, "axis": "y", "origin": [17, 1, 6]}, + "faces": { + "north": {"uv": [6.75, 1.75, 7.625, 2.875], "texture": "texture"}, + "east": {"uv": [5.875, 1.75, 6.75, 2.875], "texture": "texture"}, + "south": {"uv": [8.5, 1.75, 9.375, 2.875], "texture": "texture"}, + "west": {"uv": [7.625, 1.75, 8.5, 2.875], "texture": "texture"}, + "up": {"uv": [7.5, 1.25, 6.625, 0.375], "texture": "texture"}, + "down": {"uv": [8.625, 0.25, 7.75, 1.125], "texture": "texture"} + } + } + ] +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/large_nest_box/large_nest_box_warped_wraptor_2.json b/kubejs/assets/tfg/models/block/large_nest_box/large_nest_box_warped_wraptor_2.json new file mode 100644 index 000000000..774605ee8 --- /dev/null +++ b/kubejs/assets/tfg/models/block/large_nest_box/large_nest_box_warped_wraptor_2.json @@ -0,0 +1,88 @@ +{ + "parent": "minecraft:block/block", + "credit": "made with BlockBench", + "textures": { + "texture": "tfg:block/large_nest/large_nest_warped_sniffer_0", + "particle": "tfg:block/large_nest/large_nest_warped_sniffer_0" + }, + "elements": [ + { + "from": [4, 1, 12], + "to": [16, 3, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [10, 2, 13]}, + "faces": { + "north": {"uv": [0.5, 6.125, 2, 6.375], "texture": "texture"}, + "east": {"uv": [0.25, 6.125, 0.5, 6.375], "texture": "texture"}, + "south": {"uv": [2.25, 6.125, 3.75, 6.375], "texture": "texture"}, + "west": {"uv": [2, 6.125, 2.25, 6.375], "texture": "texture"}, + "up": {"uv": [2, 6.125, 0.5, 5.875], "texture": "texture"}, + "down": {"uv": [3.5, 5.875, 2, 6.125], "texture": "texture"} + } + }, + { + "from": [3, 0, 0], + "to": [16, 1, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [9.5, 0.5, 6.5]}, + "faces": { + "north": {"uv": [1.625, 4.75, 3.25, 4.875], "texture": "texture"}, + "east": {"uv": [0, 4.75, 1.625, 4.875], "texture": "texture"}, + "south": {"uv": [4.875, 4.75, 6.5, 4.875], "texture": "texture"}, + "west": {"uv": [3.25, 4.75, 4.875, 4.875], "texture": "texture"}, + "up": {"uv": [3.25, 4.75, 1.625, 3.125], "texture": "texture"}, + "down": {"uv": [4.875, 3.125, 3.25, 4.75], "texture": "texture"} + } + }, + { + "from": [3, 3, 13], + "to": [16, 4, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [9.5, 3.5, 14]}, + "faces": { + "north": {"uv": [0.5, 5.5, 2.125, 5.625], "texture": "texture"}, + "east": {"uv": [0.25, 5.5, 0.5, 5.625], "texture": "texture"}, + "south": {"uv": [2.375, 5.5, 4, 5.625], "texture": "texture"}, + "west": {"uv": [2.125, 5.5, 2.375, 5.625], "texture": "texture"}, + "up": {"uv": [2.125, 5.5, 0.5, 5.25], "texture": "texture"}, + "down": {"uv": [3.75, 5.25, 2.125, 5.5], "texture": "texture"} + } + }, + { + "from": [1, 3, 0], + "to": [3, 4, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [2, 3.5, 7.5]}, + "faces": { + "north": {"uv": [5.625, 5.125, 5.875, 5.25], "texture": "texture"}, + "east": {"uv": [3.75, 5.125, 5.625, 5.25], "texture": "texture"}, + "south": {"uv": [7.75, 5.125, 8, 5.25], "texture": "texture"}, + "west": {"uv": [5.875, 5.125, 7.75, 5.25], "texture": "texture"}, + "up": {"uv": [5.875, 5.125, 5.625, 3.25], "texture": "texture"}, + "down": {"uv": [6.125, 3.25, 5.875, 5.125], "texture": "texture"} + } + }, + { + "from": [2, 1, 0], + "to": [4, 3, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [3, 2, 7]}, + "faces": { + "north": {"uv": [5.5, 6.125, 5.75, 6.375], "texture": "texture"}, + "east": {"uv": [3.75, 6.125, 5.5, 6.375], "texture": "texture"}, + "south": {"uv": [7.5, 6.125, 7.75, 6.375], "texture": "texture"}, + "west": {"uv": [5.75, 6.125, 7.5, 6.375], "texture": "texture"}, + "up": {"uv": [5.75, 6.125, 5.5, 4.375], "texture": "texture"}, + "down": {"uv": [6, 4.375, 5.75, 6.125], "texture": "texture"} + } + }, + { + "from": [9, 1, 0], + "to": [15, 9, 6], + "rotation": {"angle": 0, "axis": "y", "origin": [17, 1, 4]}, + "faces": { + "north": {"uv": [6.875, 1.625, 7.625, 2.625], "texture": "texture"}, + "east": {"uv": [6.125, 1.625, 6.875, 2.625], "texture": "texture"}, + "south": {"uv": [8.375, 1.625, 9.125, 2.625], "texture": "texture"}, + "west": {"uv": [7.625, 1.625, 8.375, 2.625], "texture": "texture"}, + "up": {"uv": [7.375, 1.125, 6.625, 0.375], "texture": "texture"}, + "down": {"uv": [8.375, 0.5, 7.625, 1.25], "texture": "texture"} + } + } + ] +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/large_nest_box/large_nest_box_warped_wraptor_3.json b/kubejs/assets/tfg/models/block/large_nest_box/large_nest_box_warped_wraptor_3.json new file mode 100644 index 000000000..7958f0d07 --- /dev/null +++ b/kubejs/assets/tfg/models/block/large_nest_box/large_nest_box_warped_wraptor_3.json @@ -0,0 +1,88 @@ +{ + "parent": "minecraft:block/block", + "credit": "made with BlockBench", + "textures": { + "texture": "tfg:block/large_nest/large_nest_warped_sniffer_0", + "particle": "tfg:block/large_nest/large_nest_warped_sniffer_0" + }, + "elements": [ + { + "from": [4, 1, 12], + "to": [16, 3, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [10, 2, 13]}, + "faces": { + "north": {"uv": [1.375, 5.375, 2.875, 5.625], "texture": "texture"}, + "east": {"uv": [1.125, 5.375, 1.375, 5.625], "texture": "texture"}, + "south": {"uv": [3.125, 5.375, 4.625, 5.625], "texture": "texture"}, + "west": {"uv": [2.875, 5.375, 3.125, 5.625], "texture": "texture"}, + "up": {"uv": [2.875, 5.375, 1.375, 5.125], "texture": "texture"}, + "down": {"uv": [4.375, 5.125, 2.875, 5.375], "texture": "texture"} + } + }, + { + "from": [3, 0, 0], + "to": [16, 1, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [9.5, 0.5, 6.5]}, + "faces": { + "north": {"uv": [1.75, 4.75, 3.375, 4.875], "texture": "texture"}, + "east": {"uv": [0.125, 4.75, 1.75, 4.875], "texture": "texture"}, + "south": {"uv": [5, 4.75, 6.625, 4.875], "texture": "texture"}, + "west": {"uv": [3.375, 4.75, 5, 4.875], "texture": "texture"}, + "up": {"uv": [3.375, 4.75, 1.75, 3.125], "texture": "texture"}, + "down": {"uv": [5, 3.125, 3.375, 4.75], "texture": "texture"} + } + }, + { + "from": [3, 3, 13], + "to": [16, 4, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [9.5, 3.5, 14]}, + "faces": { + "north": {"uv": [2.875, 5.875, 4.5, 6], "texture": "texture"}, + "east": {"uv": [2.625, 5.875, 2.875, 6], "texture": "texture"}, + "south": {"uv": [4.75, 5.875, 6.375, 6], "texture": "texture"}, + "west": {"uv": [4.5, 5.875, 4.75, 6], "texture": "texture"}, + "up": {"uv": [4.5, 5.875, 2.875, 5.625], "texture": "texture"}, + "down": {"uv": [6.125, 5.625, 4.5, 5.875], "texture": "texture"} + } + }, + { + "from": [1, 3, 0], + "to": [3, 4, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [2, 3.5, 7.5]}, + "faces": { + "north": {"uv": [1.875, 6.625, 2.125, 6.75], "texture": "texture"}, + "east": {"uv": [0, 6.625, 1.875, 6.75], "texture": "texture"}, + "south": {"uv": [4, 6.625, 4.25, 6.75], "texture": "texture"}, + "west": {"uv": [2.125, 6.625, 4, 6.75], "texture": "texture"}, + "up": {"uv": [2.125, 6.625, 1.875, 4.75], "texture": "texture"}, + "down": {"uv": [2.375, 4.75, 2.125, 6.625], "texture": "texture"} + } + }, + { + "from": [2, 1, 0], + "to": [4, 3, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [3, 2, 7]}, + "faces": { + "north": {"uv": [5.25, 6.375, 5.5, 6.625], "texture": "texture"}, + "east": {"uv": [3.5, 6.375, 5.25, 6.625], "texture": "texture"}, + "south": {"uv": [7.25, 6.375, 7.5, 6.625], "texture": "texture"}, + "west": {"uv": [5.5, 6.375, 7.25, 6.625], "texture": "texture"}, + "up": {"uv": [5.5, 6.375, 5.25, 4.625], "texture": "texture"}, + "down": {"uv": [5.75, 4.625, 5.5, 6.375], "texture": "texture"} + } + }, + { + "from": [7, 1, 1], + "to": [14, 11, 8], + "rotation": {"angle": 0, "axis": "y", "origin": [15, 1, 5]}, + "faces": { + "north": {"uv": [7, 1.5, 7.875, 2.75], "texture": "texture"}, + "east": {"uv": [6.125, 1.5, 7, 2.75], "texture": "texture"}, + "south": {"uv": [8.75, 1.625, 9.625, 2.875], "texture": "texture"}, + "west": {"uv": [7.875, 1.5, 8.75, 2.75], "texture": "texture"}, + "up": {"uv": [7.5, 1.125, 6.625, 0.25], "texture": "texture"}, + "down": {"uv": [8.75, 0.25, 7.875, 1.125], "texture": "texture", "cullface": "down"} + } + } + ] +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/large_nest_box/large_nest_box_wraptor_0.json b/kubejs/assets/tfg/models/block/large_nest_box/large_nest_box_wraptor_0.json new file mode 100644 index 000000000..ee4ab4867 --- /dev/null +++ b/kubejs/assets/tfg/models/block/large_nest_box/large_nest_box_wraptor_0.json @@ -0,0 +1,88 @@ +{ + "parent": "minecraft:block/block", + "credit": "made with BlockBench", + "textures": { + "texture": "tfg:block/large_nest/large_nest_sniffer_0", + "particle": "tfg:block/large_nest/large_nest_sniffer_0" + }, + "elements": [ + { + "from": [4, 1, 12], + "to": [16, 3, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [10, 2, 13]}, + "faces": { + "north": {"uv": [0.25, 6.875, 1.75, 7.125], "texture": "texture"}, + "east": {"uv": [0, 6.875, 0.25, 7.125], "texture": "texture"}, + "south": {"uv": [2, 6.875, 3.5, 7.125], "texture": "texture"}, + "west": {"uv": [1.75, 6.875, 2, 7.125], "texture": "texture"}, + "up": {"uv": [1.75, 6.875, 0.25, 6.625], "texture": "texture"}, + "down": {"uv": [3.25, 6.625, 1.75, 6.875], "texture": "texture"} + } + }, + { + "from": [3, 0, 0], + "to": [16, 1, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [9.5, 0.5, 6.5]}, + "faces": { + "north": {"uv": [1.625, 4.75, 3.25, 4.875], "texture": "texture"}, + "east": {"uv": [0, 4.75, 1.625, 4.875], "texture": "texture"}, + "south": {"uv": [4.875, 4.75, 6.5, 4.875], "texture": "texture"}, + "west": {"uv": [3.25, 4.75, 4.875, 4.875], "texture": "texture"}, + "up": {"uv": [3.25, 4.75, 1.625, 3.125], "texture": "texture"}, + "down": {"uv": [4.875, 3.125, 3.25, 4.75], "texture": "texture"} + } + }, + { + "from": [3, 3, 13], + "to": [16, 4, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [9.5, 3.5, 14]}, + "faces": { + "north": {"uv": [0.5, 6.5, 2.125, 6.625], "texture": "texture"}, + "east": {"uv": [0.25, 6.5, 0.5, 6.625], "texture": "texture"}, + "south": {"uv": [2.375, 6.5, 4, 6.625], "texture": "texture"}, + "west": {"uv": [2.125, 6.5, 2.375, 6.625], "texture": "texture"}, + "up": {"uv": [2.125, 6.5, 0.5, 6.25], "texture": "texture"}, + "down": {"uv": [3.75, 6.25, 2.125, 6.5], "texture": "texture"} + } + }, + { + "from": [1, 3, 0], + "to": [3, 4, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [2, 3.5, 7.5]}, + "faces": { + "north": {"uv": [1.875, 6.125, 2.125, 6.25], "texture": "texture"}, + "east": {"uv": [0, 6.125, 1.875, 6.25], "texture": "texture"}, + "south": {"uv": [4, 6.125, 4.25, 6.25], "texture": "texture"}, + "west": {"uv": [2.125, 6.125, 4, 6.25], "texture": "texture"}, + "up": {"uv": [2.125, 6.125, 1.875, 4.25], "texture": "texture"}, + "down": {"uv": [2.375, 4.25, 2.125, 6.125], "texture": "texture"} + } + }, + { + "from": [2, 1, 0], + "to": [4, 3, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [3, 2, 7]}, + "faces": { + "north": {"uv": [5.25, 6.875, 5.5, 7.125], "texture": "texture"}, + "east": {"uv": [3.5, 6.875, 5.25, 7.125], "texture": "texture"}, + "south": {"uv": [7.25, 6.875, 7.5, 7.125], "texture": "texture"}, + "west": {"uv": [5.5, 6.875, 7.25, 7.125], "texture": "texture"}, + "up": {"uv": [5.5, 6.875, 5.25, 5.125], "texture": "texture"}, + "down": {"uv": [5.75, 5.125, 5.5, 6.875], "texture": "texture"} + } + }, + { + "from": [6, 1, 1], + "to": [14, 11, 9], + "rotation": {"angle": 0, "axis": "y", "origin": [14, 1, 5]}, + "faces": { + "north": {"uv": [6.375, 1.5, 7.375, 2.75], "texture": "texture"}, + "east": {"uv": [5.25, 1.5, 6.25, 2.75], "texture": "texture"}, + "south": {"uv": [8.75, 1.5, 9.75, 2.75], "texture": "texture"}, + "west": {"uv": [7.5, 1.5, 8.5, 2.75], "texture": "texture"}, + "up": {"uv": [7.5, 1.375, 6.5, 0.375], "texture": "texture"}, + "down": {"uv": [8.75, 0.25, 7.75, 1.25], "texture": "texture"} + } + } + ] +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/large_nest_box/large_nest_box_wraptor_1.json b/kubejs/assets/tfg/models/block/large_nest_box/large_nest_box_wraptor_1.json new file mode 100644 index 000000000..923132c0e --- /dev/null +++ b/kubejs/assets/tfg/models/block/large_nest_box/large_nest_box_wraptor_1.json @@ -0,0 +1,88 @@ +{ + "parent": "minecraft:block/block", + "credit": "made with BlockBench", + "textures": { + "texture": "tfg:block/large_nest/large_nest_sniffer_0", + "particle": "tfg:block/large_nest/large_nest_sniffer_0" + }, + "elements": [ + { + "from": [4, 1, 12], + "to": [16, 3, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [10, 2, 13]}, + "faces": { + "north": {"uv": [0.25, 6.5, 1.75, 6.75], "texture": "texture"}, + "east": {"uv": [0, 6.5, 0.25, 6.75], "texture": "texture"}, + "south": {"uv": [2, 6.5, 3.5, 6.75], "texture": "texture"}, + "west": {"uv": [1.75, 6.5, 2, 6.75], "texture": "texture"}, + "up": {"uv": [1.75, 6.5, 0.25, 6.25], "texture": "texture"}, + "down": {"uv": [3.25, 6.25, 1.75, 6.5], "texture": "texture"} + } + }, + { + "from": [3, 0, 0], + "to": [16, 1, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [9.5, 0.5, 6.5]}, + "faces": { + "north": {"uv": [1.625, 4.75, 3.25, 4.875], "texture": "texture"}, + "east": {"uv": [0, 4.75, 1.625, 4.875], "texture": "texture"}, + "south": {"uv": [4.875, 4.75, 6.5, 4.875], "texture": "texture"}, + "west": {"uv": [3.25, 4.75, 4.875, 4.875], "texture": "texture"}, + "up": {"uv": [3.25, 4.75, 1.625, 3.125], "texture": "texture"}, + "down": {"uv": [4.875, 3.125, 3.25, 4.75], "texture": "texture"} + } + }, + { + "from": [3, 3, 13], + "to": [16, 4, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [9.5, 3.5, 14]}, + "faces": { + "north": {"uv": [0.375, 5.625, 2, 5.75], "texture": "texture"}, + "east": {"uv": [0.125, 5.625, 0.375, 5.75], "texture": "texture"}, + "south": {"uv": [2.25, 5.625, 3.875, 5.75], "texture": "texture"}, + "west": {"uv": [2, 5.625, 2.25, 5.75], "texture": "texture"}, + "up": {"uv": [2, 5.625, 0.375, 5.375], "texture": "texture"}, + "down": {"uv": [3.625, 5.375, 2, 5.625], "texture": "texture"} + } + }, + { + "from": [1, 3, 0], + "to": [3, 4, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [2, 3.5, 7.5]}, + "faces": { + "north": {"uv": [3.625, 6.375, 3.875, 6.5], "texture": "texture"}, + "east": {"uv": [1.75, 6.375, 3.625, 6.5], "texture": "texture"}, + "south": {"uv": [5.75, 6.375, 6, 6.5], "texture": "texture"}, + "west": {"uv": [3.875, 6.375, 5.75, 6.5], "texture": "texture"}, + "up": {"uv": [3.875, 6.375, 3.625, 4.5], "texture": "texture"}, + "down": {"uv": [4.125, 4.5, 3.875, 6.375], "texture": "texture"} + } + }, + { + "from": [2, 1, 0], + "to": [4, 3, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [3, 2, 7]}, + "faces": { + "north": {"uv": [4.375, 5.125, 4.625, 5.375], "texture": "texture"}, + "east": {"uv": [2.625, 5.125, 4.375, 5.375], "texture": "texture"}, + "south": {"uv": [6.375, 5.125, 6.625, 5.375], "texture": "texture"}, + "west": {"uv": [4.625, 5.125, 6.375, 5.375], "texture": "texture"}, + "up": {"uv": [4.625, 5.125, 4.375, 3.375], "texture": "texture"}, + "down": {"uv": [4.875, 3.375, 4.625, 5.125], "texture": "texture"} + } + }, + { + "from": [8, 1, 2], + "to": [15, 10, 9], + "rotation": {"angle": 0, "axis": "y", "origin": [17, 1, 6]}, + "faces": { + "north": {"uv": [6.75, 1.75, 7.625, 2.875], "texture": "texture"}, + "east": {"uv": [5.875, 1.75, 6.75, 2.875], "texture": "texture"}, + "south": {"uv": [8.5, 1.75, 9.375, 2.875], "texture": "texture"}, + "west": {"uv": [7.625, 1.75, 8.5, 2.875], "texture": "texture"}, + "up": {"uv": [7.5, 1.25, 6.625, 0.375], "texture": "texture"}, + "down": {"uv": [8.625, 0.25, 7.75, 1.125], "texture": "texture"} + } + } + ] +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/large_nest_box/large_nest_box_wraptor_2.json b/kubejs/assets/tfg/models/block/large_nest_box/large_nest_box_wraptor_2.json new file mode 100644 index 000000000..623dbc70e --- /dev/null +++ b/kubejs/assets/tfg/models/block/large_nest_box/large_nest_box_wraptor_2.json @@ -0,0 +1,88 @@ +{ + "parent": "minecraft:block/block", + "credit": "made with BlockBench", + "textures": { + "texture": "tfg:block/large_nest/large_nest_sniffer_0", + "particle": "tfg:block/large_nest/large_nest_sniffer_0" + }, + "elements": [ + { + "from": [4, 1, 12], + "to": [16, 3, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [10, 2, 13]}, + "faces": { + "north": {"uv": [0.5, 6.125, 2, 6.375], "texture": "texture"}, + "east": {"uv": [0.25, 6.125, 0.5, 6.375], "texture": "texture"}, + "south": {"uv": [2.25, 6.125, 3.75, 6.375], "texture": "texture"}, + "west": {"uv": [2, 6.125, 2.25, 6.375], "texture": "texture"}, + "up": {"uv": [2, 6.125, 0.5, 5.875], "texture": "texture"}, + "down": {"uv": [3.5, 5.875, 2, 6.125], "texture": "texture"} + } + }, + { + "from": [3, 0, 0], + "to": [16, 1, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [9.5, 0.5, 6.5]}, + "faces": { + "north": {"uv": [1.625, 4.75, 3.25, 4.875], "texture": "texture"}, + "east": {"uv": [0, 4.75, 1.625, 4.875], "texture": "texture"}, + "south": {"uv": [4.875, 4.75, 6.5, 4.875], "texture": "texture"}, + "west": {"uv": [3.25, 4.75, 4.875, 4.875], "texture": "texture"}, + "up": {"uv": [3.25, 4.75, 1.625, 3.125], "texture": "texture"}, + "down": {"uv": [4.875, 3.125, 3.25, 4.75], "texture": "texture"} + } + }, + { + "from": [3, 3, 13], + "to": [16, 4, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [9.5, 3.5, 14]}, + "faces": { + "north": {"uv": [0.5, 5.5, 2.125, 5.625], "texture": "texture"}, + "east": {"uv": [0.25, 5.5, 0.5, 5.625], "texture": "texture"}, + "south": {"uv": [2.375, 5.5, 4, 5.625], "texture": "texture"}, + "west": {"uv": [2.125, 5.5, 2.375, 5.625], "texture": "texture"}, + "up": {"uv": [2.125, 5.5, 0.5, 5.25], "texture": "texture"}, + "down": {"uv": [3.75, 5.25, 2.125, 5.5], "texture": "texture"} + } + }, + { + "from": [1, 3, 0], + "to": [3, 4, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [2, 3.5, 7.5]}, + "faces": { + "north": {"uv": [5.625, 5.125, 5.875, 5.25], "texture": "texture"}, + "east": {"uv": [3.75, 5.125, 5.625, 5.25], "texture": "texture"}, + "south": {"uv": [7.75, 5.125, 8, 5.25], "texture": "texture"}, + "west": {"uv": [5.875, 5.125, 7.75, 5.25], "texture": "texture"}, + "up": {"uv": [5.875, 5.125, 5.625, 3.25], "texture": "texture"}, + "down": {"uv": [6.125, 3.25, 5.875, 5.125], "texture": "texture"} + } + }, + { + "from": [2, 1, 0], + "to": [4, 3, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [3, 2, 7]}, + "faces": { + "north": {"uv": [5.5, 6.125, 5.75, 6.375], "texture": "texture"}, + "east": {"uv": [3.75, 6.125, 5.5, 6.375], "texture": "texture"}, + "south": {"uv": [7.5, 6.125, 7.75, 6.375], "texture": "texture"}, + "west": {"uv": [5.75, 6.125, 7.5, 6.375], "texture": "texture"}, + "up": {"uv": [5.75, 6.125, 5.5, 4.375], "texture": "texture"}, + "down": {"uv": [6, 4.375, 5.75, 6.125], "texture": "texture"} + } + }, + { + "from": [9, 1, 0], + "to": [15, 9, 6], + "rotation": {"angle": 0, "axis": "y", "origin": [17, 1, 4]}, + "faces": { + "north": {"uv": [6.875, 1.625, 7.625, 2.625], "texture": "texture"}, + "east": {"uv": [6.125, 1.625, 6.875, 2.625], "texture": "texture"}, + "south": {"uv": [8.375, 1.625, 9.125, 2.625], "texture": "texture"}, + "west": {"uv": [7.625, 1.625, 8.375, 2.625], "texture": "texture"}, + "up": {"uv": [7.375, 1.125, 6.625, 0.375], "texture": "texture"}, + "down": {"uv": [8.375, 0.5, 7.625, 1.25], "texture": "texture"} + } + } + ] +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/large_nest_box/large_nest_box_wraptor_3.json b/kubejs/assets/tfg/models/block/large_nest_box/large_nest_box_wraptor_3.json new file mode 100644 index 000000000..80d3c0646 --- /dev/null +++ b/kubejs/assets/tfg/models/block/large_nest_box/large_nest_box_wraptor_3.json @@ -0,0 +1,88 @@ +{ + "parent": "minecraft:block/block", + "credit": "made with BlockBench", + "textures": { + "texture": "tfg:block/large_nest/large_nest_sniffer_0", + "particle": "tfg:block/large_nest/large_nest_sniffer_0" + }, + "elements": [ + { + "from": [4, 1, 12], + "to": [16, 3, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [10, 2, 13]}, + "faces": { + "north": {"uv": [1.375, 5.375, 2.875, 5.625], "texture": "texture"}, + "east": {"uv": [1.125, 5.375, 1.375, 5.625], "texture": "texture"}, + "south": {"uv": [3.125, 5.375, 4.625, 5.625], "texture": "texture"}, + "west": {"uv": [2.875, 5.375, 3.125, 5.625], "texture": "texture"}, + "up": {"uv": [2.875, 5.375, 1.375, 5.125], "texture": "texture"}, + "down": {"uv": [4.375, 5.125, 2.875, 5.375], "texture": "texture"} + } + }, + { + "from": [3, 0, 0], + "to": [16, 1, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [9.5, 0.5, 6.5]}, + "faces": { + "north": {"uv": [1.75, 4.75, 3.375, 4.875], "texture": "texture"}, + "east": {"uv": [0.125, 4.75, 1.75, 4.875], "texture": "texture"}, + "south": {"uv": [5, 4.75, 6.625, 4.875], "texture": "texture"}, + "west": {"uv": [3.375, 4.75, 5, 4.875], "texture": "texture"}, + "up": {"uv": [3.375, 4.75, 1.75, 3.125], "texture": "texture"}, + "down": {"uv": [5, 3.125, 3.375, 4.75], "texture": "texture"} + } + }, + { + "from": [3, 3, 13], + "to": [16, 4, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [9.5, 3.5, 14]}, + "faces": { + "north": {"uv": [2.875, 5.875, 4.5, 6], "texture": "texture"}, + "east": {"uv": [2.625, 5.875, 2.875, 6], "texture": "texture"}, + "south": {"uv": [4.75, 5.875, 6.375, 6], "texture": "texture"}, + "west": {"uv": [4.5, 5.875, 4.75, 6], "texture": "texture"}, + "up": {"uv": [4.5, 5.875, 2.875, 5.625], "texture": "texture"}, + "down": {"uv": [6.125, 5.625, 4.5, 5.875], "texture": "texture"} + } + }, + { + "from": [1, 3, 0], + "to": [3, 4, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [2, 3.5, 7.5]}, + "faces": { + "north": {"uv": [1.875, 6.625, 2.125, 6.75], "texture": "texture"}, + "east": {"uv": [0, 6.625, 1.875, 6.75], "texture": "texture"}, + "south": {"uv": [4, 6.625, 4.25, 6.75], "texture": "texture"}, + "west": {"uv": [2.125, 6.625, 4, 6.75], "texture": "texture"}, + "up": {"uv": [2.125, 6.625, 1.875, 4.75], "texture": "texture"}, + "down": {"uv": [2.375, 4.75, 2.125, 6.625], "texture": "texture"} + } + }, + { + "from": [2, 1, 0], + "to": [4, 3, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [3, 2, 7]}, + "faces": { + "north": {"uv": [5.25, 6.375, 5.5, 6.625], "texture": "texture"}, + "east": {"uv": [3.5, 6.375, 5.25, 6.625], "texture": "texture"}, + "south": {"uv": [7.25, 6.375, 7.5, 6.625], "texture": "texture"}, + "west": {"uv": [5.5, 6.375, 7.25, 6.625], "texture": "texture"}, + "up": {"uv": [5.5, 6.375, 5.25, 4.625], "texture": "texture"}, + "down": {"uv": [5.75, 4.625, 5.5, 6.375], "texture": "texture"} + } + }, + { + "from": [7, 1, 1], + "to": [14, 11, 8], + "rotation": {"angle": 0, "axis": "y", "origin": [15, 1, 5]}, + "faces": { + "north": {"uv": [7, 1.5, 7.875, 2.75], "texture": "texture"}, + "east": {"uv": [6.125, 1.5, 7, 2.75], "texture": "texture"}, + "south": {"uv": [8.75, 1.625, 9.625, 2.875], "texture": "texture"}, + "west": {"uv": [7.875, 1.5, 8.75, 2.75], "texture": "texture"}, + "up": {"uv": [7.5, 1.125, 6.625, 0.25], "texture": "texture"}, + "down": {"uv": [8.75, 0.25, 7.875, 1.125], "texture": "texture", "cullface": "down"} + } + } + ] +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/spawn_egg/wraptor.json b/kubejs/assets/tfg/models/item/spawn_egg/wraptor.json new file mode 100644 index 000000000..185724546 --- /dev/null +++ b/kubejs/assets/tfg/models/item/spawn_egg/wraptor.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "tfg:item/spawn_egg/moon_rabbit" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/wraptor_egg.json b/kubejs/assets/tfg/models/item/wraptor_egg.json new file mode 100644 index 000000000..787da8b8a --- /dev/null +++ b/kubejs/assets/tfg/models/item/wraptor_egg.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "species:item/wraptor_egg" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/wraptor_sugar.json b/kubejs/assets/tfg/models/item/wraptor_sugar.json new file mode 100644 index 000000000..9d9b5a455 --- /dev/null +++ b/kubejs/assets/tfg/models/item/wraptor_sugar.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "tfg:item/wraptor_sugar" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/wraptor_wool.json b/kubejs/assets/tfg/models/item/wraptor_wool.json new file mode 100644 index 000000000..bad6819a2 --- /dev/null +++ b/kubejs/assets/tfg/models/item/wraptor_wool.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "tfg:item/wraptor_wool" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/textures/block/large_nest/large_nest_sniffer_0.png b/kubejs/assets/tfg/textures/block/large_nest/large_nest_sniffer_0.png index b8f371f0e..da5bc52a1 100644 Binary files a/kubejs/assets/tfg/textures/block/large_nest/large_nest_sniffer_0.png and b/kubejs/assets/tfg/textures/block/large_nest/large_nest_sniffer_0.png differ diff --git a/kubejs/assets/tfg/textures/block/large_nest/large_nest_warped_sniffer_0.png b/kubejs/assets/tfg/textures/block/large_nest/large_nest_warped_sniffer_0.png index 0b01dc332..2e017a4d7 100644 Binary files a/kubejs/assets/tfg/textures/block/large_nest/large_nest_warped_sniffer_0.png and b/kubejs/assets/tfg/textures/block/large_nest/large_nest_warped_sniffer_0.png differ diff --git a/kubejs/assets/tfg/textures/item/wraptor_sugar.png b/kubejs/assets/tfg/textures/item/wraptor_sugar.png new file mode 100644 index 000000000..837e58dd4 Binary files /dev/null and b/kubejs/assets/tfg/textures/item/wraptor_sugar.png differ diff --git a/kubejs/assets/tfg/textures/item/wraptor_wool.png b/kubejs/assets/tfg/textures/item/wraptor_wool.png new file mode 100644 index 000000000..7f54b85b5 Binary files /dev/null and b/kubejs/assets/tfg/textures/item/wraptor_wool.png differ diff --git a/kubejs/client_scripts/tooltips.js b/kubejs/client_scripts/tooltips.js index c54b99749..91f52ef65 100644 --- a/kubejs/client_scripts/tooltips.js +++ b/kubejs/client_scripts/tooltips.js @@ -122,6 +122,30 @@ const registerTooltips = (event) => { event.addAdvanced(['species:petrified_egg'], (item, advanced, text) => { text.add(1, Text.translate('tfg.tooltip.petrified_egg')) }) + + event.addAdvanced(['tfg:sniffer_egg'], (item, advanced, text) => { + text.add(1, Text.translate('tfg.tooltip.attribution.sniffer')), + text.add(2, Text.translate('tfg.tooltip.large_egg') + + }) + + event.addAdvanced(['tfg:wraptor_egg'], (item, advanced, text) => { + text.add(1, Text.translate('tfg.tooltip.attribution.wraptor')), + text.add(2, Text.translate('tfg.tooltip.large_egg')) + }) + + event.addAdvanced(['tfg:sniffer_wool'], (item, advanced, text) => { + text.add(1, Text.translate('tfg.tooltip.sniffer_wool')) + }) + + event.addAdvanced(['tfg:wraptor_wool'], (item, advanced, text) => { + text.add(1, Text.translate('tfg.tooltip.wraptor_wool')) + }) + + event.addAdvanced(['tfg:wraptor_sugar'], (item, advanced, text) => { + text.add(1, Text.translate('tfg.tooltip.wraptor_sugar')) + }) + //#region Deprecated Items event.addAdvanced(['#megacells:mega_interface'], (item, advanced, text) => { diff --git a/kubejs/server_scripts/ad_astra/tags.js b/kubejs/server_scripts/ad_astra/tags.js index 112add8c1..c1742fdac 100644 --- a/kubejs/server_scripts/ad_astra/tags.js +++ b/kubejs/server_scripts/ad_astra/tags.js @@ -352,7 +352,7 @@ const registerAdAstraEntityTypeTags = (event) => { 'tfg:sniffer', 'tfg:glacian_ram', - 'species:wraptor', + 'tfg:wraptor', 'species:goober', 'species:cruncher', 'species:springling', diff --git a/kubejs/server_scripts/main_server_script.js b/kubejs/server_scripts/main_server_script.js index 46f6bc168..dc005716b 100644 --- a/kubejs/server_scripts/main_server_script.js +++ b/kubejs/server_scripts/main_server_script.js @@ -163,6 +163,7 @@ TFCEvents.data(event => { registerTFCDataForTFG(event) registerTFCDataForWaterFlasks(event) registerWABFoodData(event) + registerSpeciesFoodData(event) }) /** diff --git a/kubejs/server_scripts/species/data.js b/kubejs/server_scripts/species/data.js new file mode 100644 index 000000000..5510e5f0c --- /dev/null +++ b/kubejs/server_scripts/species/data.js @@ -0,0 +1,10 @@ +const registerSpeciesFoodData = (event) => { + + event.foodItem('species:cracked_wraptor_egg', food => { + food.hunger(4) + food.saturation(1) + food.water(5) + food.decayModifier(3) + }) + +} \ No newline at end of file diff --git a/kubejs/server_scripts/species/recipes.js b/kubejs/server_scripts/species/recipes.js index 2f3a5fa2e..6b4a2181c 100644 --- a/kubejs/server_scripts/species/recipes.js +++ b/kubejs/server_scripts/species/recipes.js @@ -69,4 +69,18 @@ function registerSpeciesRecipes(event) { generateGreenHouseRecipe(event, '8x tfg:saplings/alphacene', 'tfg:semiheavy_ammoniacal_water', 16000, '64x species:alphacene_mushroom_block', 'tfg:green_house/alphacene_mushroom', 'ad_astra:mars', 8, '8x minecraft:mushroom_stem', GTValues.VA[GTValues.MV]) + + event.shapeless('species:cracked_wraptor_egg', ['tfg:wraptor_egg', '#forge:tools/hammers']).id('tfg:shapeless/crack_egg') + event.shapeless('2x tfg:wraptor_sugar', ['species:cracked_wraptor_egg']).id('tfg:shapeless/juice_egg') + + event.recipes.gtceu.extractor('tfg:juice_egg_mv') + .itemInputs('species:cracked_wraptor_egg') + .itemOutputs('4x tfg:wraptor_sugar') + .duration(100) + .EUt(GTValues.VA[GTValues.MV]) + event.recipes.gtceu.extractor('tfg:juice_egg_full') + .itemInputs('tfg:wraptor_egg') + .itemOutputs('4x tfg:wraptor_sugar') + .duration(200) + .EUt(GTValues.VA[GTValues.MV]) } \ No newline at end of file diff --git a/kubejs/server_scripts/tfg/recipes.miscellaneous.js b/kubejs/server_scripts/tfg/recipes.miscellaneous.js index 17ea21a87..9e87f0aab 100644 --- a/kubejs/server_scripts/tfg/recipes.miscellaneous.js +++ b/kubejs/server_scripts/tfg/recipes.miscellaneous.js @@ -1005,6 +1005,14 @@ function registerTFGMiscellaneousRecipes(event) { .duration(80) .blastFurnaceTemp(3400) .EUt(GTValues.VA[GTValues.EV]) + event.recipes.gtceu.electric_blast_furnace('smelt_wraptor_wool') + .itemInputs('tfg:wraptor_wool') + .chancedOutput('gtceu:ash_dust', 5000, 0) + .outputFluids(Fluid.of('tfg:molten_aes', 100)) + .circuit(8) + .duration(60) + .blastFurnaceTemp(3400) + .EUt(GTValues.VA[GTValues.EV]) //endregion @@ -1338,7 +1346,6 @@ function registerTFGMiscellaneousRecipes(event) { event.replaceInput({ id: "minecraft:jukebox"}, 'minecraft:diamond', 'tfg:etching_diamond_tip'); - //Large Nest event.shaped('tfg:large_nest_box', [ diff --git a/kubejs/server_scripts/tfg/tags.js b/kubejs/server_scripts/tfg/tags.js index 8001e35f1..b272df7de 100644 --- a/kubejs/server_scripts/tfg/tags.js +++ b/kubejs/server_scripts/tfg/tags.js @@ -322,6 +322,7 @@ const registerTFGItemTags = (event) => { //Mars animal region event.add('tfg:martian_eggs', 'tfg:sniffer_egg') + event.add('tfg:martian_eggs', 'tfg:wraptor_egg') event.add('tfg:martian_animal_foods', 'betterend:amber_root_product') event.add('tfg:martian_animal_foods', 'betterend:blossom_berry_product') @@ -332,6 +333,7 @@ const registerTFGItemTags = (event) => { event.add('tfg:glacian_ram_food', '#tfg:martian_animal_foods') event.add('tfg:sniffer_food', '#tfg:martian_animal_foods') + event.add('tfg:wraptor_food', '#tfg:martian_animal_foods') //#endregion diff --git a/kubejs/startup_scripts/species/constants.js b/kubejs/startup_scripts/species/constants.js index 711a5db52..d37c205d2 100644 --- a/kubejs/startup_scripts/species/constants.js +++ b/kubejs/startup_scripts/species/constants.js @@ -34,7 +34,6 @@ global.SPECIES_DISABLED_ITEMS = [ 'species:ricoshield', 'species:smoke_bomb', 'species:wicked_dope', - 'species:cracked_wraptor_egg', 'species:monster_meal', 'species:wicked_treat', 'species:ghoul_tongue', diff --git a/kubejs/startup_scripts/tfg/items.js b/kubejs/startup_scripts/tfg/items.js index b314a0370..40901917a 100644 --- a/kubejs/startup_scripts/tfg/items.js +++ b/kubejs/startup_scripts/tfg/items.js @@ -367,7 +367,6 @@ const registerTFGItems = (event) => { event.create('tfg:elite_power_thruster') event.create('tfg:better_space_suit_fabric') - event.create('tfg:glacian_wool') //endregion //#region Universal compost items @@ -388,7 +387,13 @@ const registerTFGItems = (event) => { event.create('tfg:photo_cell_t1') .translationKey("item.tfg.basic.photovoltaic.cell") .texture('tfg:item/photo_cell_t1') - + //#endregion + + //#region Mars Animals + event.create('tfg:wraptor_sugar') + .tag('tfg:sugars') + .tag('tfg:haste_ingredients') + .tag('tfc:sweetener') //#endregion }