add falkory's fancy new textures and fix a lighting bug

This commit is contained in:
gamma-delta 2022-03-25 13:38:25 -05:00
parent 7a607174d8
commit f513e71d85
83 changed files with 208 additions and 189 deletions

View file

@ -20,7 +20,7 @@ apply plugin: 'net.minecraftforge.gradle'
apply plugin: 'org.parchmentmc.librarian.forgegradle' apply plugin: 'org.parchmentmc.librarian.forgegradle'
apply plugin: 'org.spongepowered.mixin' apply plugin: 'org.spongepowered.mixin'
version = '0.7.0-dev.3' version = '0.7.0-dev.4'
group = 'at.petra-k.hexcasting' // http://maven.apache.org/guides/mini/guide-naming-conventions.html group = 'at.petra-k.hexcasting' // http://maven.apache.org/guides/mini/guide-naming-conventions.html
archivesBaseName = 'hexcasting' archivesBaseName = 'hexcasting'

View file

@ -13,30 +13,30 @@ de50477d8d34bbd69db98249cc6c878be8bc80f3 assets/hexcasting/models/block/amethyst
df994438c20d9dec9009c9c56de74860a847681b assets/hexcasting/models/block/amethyst_tiles.json df994438c20d9dec9009c9c56de74860a847681b assets/hexcasting/models/block/amethyst_tiles.json
4e65ad75eeee22fa1d2c899fc86ac8b7b9a43701 assets/hexcasting/models/block/ancient_scroll_paper.json 4e65ad75eeee22fa1d2c899fc86ac8b7b9a43701 assets/hexcasting/models/block/ancient_scroll_paper.json
2a03847eb4ce6679219784cd1e29408e9cdb2c0b assets/hexcasting/models/block/ancient_scroll_paper_lantern.json 2a03847eb4ce6679219784cd1e29408e9cdb2c0b assets/hexcasting/models/block/ancient_scroll_paper_lantern.json
880e730e120c4f427b0839e754b2369a9b3b4482 assets/hexcasting/models/block/empty_impetus_dim_down.json 94c2f39fc0e4d53acbc0e8b378b0b00d0f0db7ab assets/hexcasting/models/block/empty_impetus_dim_down.json
6bd0ed320b8f5c411c36cf0fce2e88f4881327c1 assets/hexcasting/models/block/empty_impetus_dim_east.json d4d59f1e508715190a69baeb23068e3297c8e6d0 assets/hexcasting/models/block/empty_impetus_dim_east.json
9f46c1d18dbb34b1f643f9385308c35493437503 assets/hexcasting/models/block/empty_impetus_dim_north.json c55a466e8878d6144b7b1da08eb4a6db7e12aefb assets/hexcasting/models/block/empty_impetus_dim_north.json
55174e0b340c73834a48cb4702a25c0df245abdb assets/hexcasting/models/block/empty_impetus_dim_south.json 1344e5d80edd4ba51a215f6444cd42e523680670 assets/hexcasting/models/block/empty_impetus_dim_south.json
d9b460dc0abf7e88a65212f850355a5eb7148746 assets/hexcasting/models/block/empty_impetus_dim_up.json 458afbd51bc6778c658c1e999eb065355faf6013 assets/hexcasting/models/block/empty_impetus_dim_up.json
9cf4221f99e5e4d48c5416c518dc8afe5395ccc5 assets/hexcasting/models/block/empty_impetus_dim_west.json 47f9f5859be4a238d810edf8ea8fcc0bc38807cf assets/hexcasting/models/block/empty_impetus_dim_west.json
35661c65dd81edd052e12a48a76c16dcd62cd025 assets/hexcasting/models/block/empty_impetus_lit_down.json 9a8c934ac1e781861b367ec55df28458e7a03d2c assets/hexcasting/models/block/empty_impetus_lit_down.json
3fa282b745c34f0f53947a15ed9adbe721c1190d assets/hexcasting/models/block/empty_impetus_lit_east.json a9d44cb1769f8b434c842004efff40f511fba98b assets/hexcasting/models/block/empty_impetus_lit_east.json
e43163fc0ab7ad8bac456823c411db3cf2cd359b assets/hexcasting/models/block/empty_impetus_lit_north.json 8d6c1970ad96ca2a160e15381d66a431c5d6cb6d assets/hexcasting/models/block/empty_impetus_lit_north.json
15bd688592008a4e1c08395a87e9d15a95b989b3 assets/hexcasting/models/block/empty_impetus_lit_south.json 384ff24868e37611c32237320e5309462a4cde63 assets/hexcasting/models/block/empty_impetus_lit_south.json
fbc3be3a8f445ca61520dabccf8351f6e1da0327 assets/hexcasting/models/block/empty_impetus_lit_up.json 2d175aaca651b51d89c935a202af2eb1e4b942c2 assets/hexcasting/models/block/empty_impetus_lit_up.json
7e75627a2ab24a0c1d20083be7374a03c098b3c3 assets/hexcasting/models/block/empty_impetus_lit_west.json 04f99f505b02cc09298b6580e0ebaef79071a418 assets/hexcasting/models/block/empty_impetus_lit_west.json
06de8993d5f0db683b0f6cb7f236d323f2733b54 assets/hexcasting/models/block/impetus_rightclick_dim_down.json 6b7fd1b238fb586bd3d429575d085d801cc0d44f assets/hexcasting/models/block/impetus_rightclick_dim_down.json
6e31dfb9b8490482adb7df7a3973806c8fbf6b23 assets/hexcasting/models/block/impetus_rightclick_dim_east.json 803eedcc8f947f0894092b191616a5cb9ffad5c4 assets/hexcasting/models/block/impetus_rightclick_dim_east.json
1a559739fbd7ded56ca558227adeef162220222c assets/hexcasting/models/block/impetus_rightclick_dim_north.json afd49062ada4999442b93c4cc713d525287daa06 assets/hexcasting/models/block/impetus_rightclick_dim_north.json
ab3888f656003264f1decfb88c73d88ff407050a assets/hexcasting/models/block/impetus_rightclick_dim_south.json 450de1786418ffdb4b1b7e93e162bdf9efab71a8 assets/hexcasting/models/block/impetus_rightclick_dim_south.json
61733f16a1c064e07f79db2fce33406418e10118 assets/hexcasting/models/block/impetus_rightclick_dim_up.json fab4e4735f921927a1de4b408e87f420fa3ce81e assets/hexcasting/models/block/impetus_rightclick_dim_up.json
57422949b831c231ad1addecf0ebd8951bda2192 assets/hexcasting/models/block/impetus_rightclick_dim_west.json 4bd2b08aae6d075ad480c5aed3dc0ab53f0a2c40 assets/hexcasting/models/block/impetus_rightclick_dim_west.json
0cb51f8b8e3b44d93bf63111c959db93fbdf589b assets/hexcasting/models/block/impetus_rightclick_lit_down.json 3a625cd083a3d66a33837d655bea46a2152ecdb8 assets/hexcasting/models/block/impetus_rightclick_lit_down.json
bd394ea4742625276b3640abef34c7fa39f3880a assets/hexcasting/models/block/impetus_rightclick_lit_east.json bca5890bb319aa9430e293ba5fb3aa9f25313792 assets/hexcasting/models/block/impetus_rightclick_lit_east.json
50f3dfe15b8f084bcef9c7a88fc5df8984f9bb45 assets/hexcasting/models/block/impetus_rightclick_lit_north.json eec237419ee5cbf31aaa78b441ab5d240eef29f7 assets/hexcasting/models/block/impetus_rightclick_lit_north.json
159204f86618a2981500a127f627dfffc6624e4e assets/hexcasting/models/block/impetus_rightclick_lit_south.json a150856d94653145b33d14375f13a1bd30919a1f assets/hexcasting/models/block/impetus_rightclick_lit_south.json
fe7e16c7178aa1ac3ecfa8750d095cbd3838189b assets/hexcasting/models/block/impetus_rightclick_lit_up.json 81ee6de34ed90a9f03d4ff81dcf41fd750116cf6 assets/hexcasting/models/block/impetus_rightclick_lit_up.json
eca0d28d0c44af31e28baff46061ac72463bbc28 assets/hexcasting/models/block/impetus_rightclick_lit_west.json a2f6084689137e6afbcada22e20008470992c84f assets/hexcasting/models/block/impetus_rightclick_lit_west.json
649a5d560534d6f9502ed4f2d0fd88e3afecfa24 assets/hexcasting/models/block/scroll_paper.json 649a5d560534d6f9502ed4f2d0fd88e3afecfa24 assets/hexcasting/models/block/scroll_paper.json
9327633bd23735970a1ffe9811593a668e05947d assets/hexcasting/models/block/scroll_paper_lantern.json 9327633bd23735970a1ffe9811593a668e05947d assets/hexcasting/models/block/scroll_paper_lantern.json
d51541b464840530f4e734db1f67ed20e811ad14 assets/hexcasting/models/block/slate_block.json d51541b464840530f4e734db1f67ed20e811ad14 assets/hexcasting/models/block/slate_block.json
@ -69,7 +69,7 @@ c2ceb08a8662a7e4a311401b0baced1add6f2e35 assets/hexcasting/models/item/dye_color
f41fb9405b869644333872cd1ece40b1b07410d2 assets/hexcasting/models/item/dye_colorizer_red.json f41fb9405b869644333872cd1ece40b1b07410d2 assets/hexcasting/models/item/dye_colorizer_red.json
5894e7a1cc38ae5b09c651791c65c983d984d20c assets/hexcasting/models/item/dye_colorizer_white.json 5894e7a1cc38ae5b09c651791c65c983d984d20c assets/hexcasting/models/item/dye_colorizer_white.json
07959b86ed25559b4960c5f4aa7bab88bf9b5bf1 assets/hexcasting/models/item/dye_colorizer_yellow.json 07959b86ed25559b4960c5f4aa7bab88bf9b5bf1 assets/hexcasting/models/item/dye_colorizer_yellow.json
5e7b5bbe75fa4eb9461306ebf090038c53badaea assets/hexcasting/models/item/empty_impetus.json 0a552831b1ae261666bf1c8f76af55582becddaa assets/hexcasting/models/item/empty_impetus.json
f7f98a306a8a0529a54446b4876e624201525a1d assets/hexcasting/models/item/focus.json f7f98a306a8a0529a54446b4876e624201525a1d assets/hexcasting/models/item/focus.json
0146e90177ed71b25d2936ff3b2d9975e47c5142 assets/hexcasting/models/item/focus_double.json 0146e90177ed71b25d2936ff3b2d9975e47c5142 assets/hexcasting/models/item/focus_double.json
167b8e3f3367f12f8045369bea26d7a48e59b0d0 assets/hexcasting/models/item/focus_double_sealed.json 167b8e3f3367f12f8045369bea26d7a48e59b0d0 assets/hexcasting/models/item/focus_double_sealed.json
@ -85,7 +85,7 @@ a6cabea2984ed2b5b0dcd0087c762c9b9892a5fe assets/hexcasting/models/item/focus_pat
44db2dda5b3d2b7d1591804bdaaf5692c2a4cc5f assets/hexcasting/models/item/focus_vec3_sealed.json 44db2dda5b3d2b7d1591804bdaaf5692c2a4cc5f assets/hexcasting/models/item/focus_vec3_sealed.json
5228a94d6ef14d1694551d33646d3b103fdf658b assets/hexcasting/models/item/focus_widget.json 5228a94d6ef14d1694551d33646d3b103fdf658b assets/hexcasting/models/item/focus_widget.json
48a791a807603d131cdf8ea16948164006a6dc6f assets/hexcasting/models/item/focus_widget_sealed.json 48a791a807603d131cdf8ea16948164006a6dc6f assets/hexcasting/models/item/focus_widget_sealed.json
82aac8f7ce7b65e4b045907e52144cdaa0cef1b0 assets/hexcasting/models/item/impetus_rightclick.json 199a1c37b3fdb1e7da93408bbe85c5a2222e264e assets/hexcasting/models/item/impetus_rightclick.json
0cdfde8339a08638fd11ce7bef4a0769eb15bcf9 assets/hexcasting/models/item/lens.json 0cdfde8339a08638fd11ce7bef4a0769eb15bcf9 assets/hexcasting/models/item/lens.json
22ec49ee56e2d0d9fca4473f965c64b82d712f79 assets/hexcasting/models/item/patchouli_book.json 22ec49ee56e2d0d9fca4473f965c64b82d712f79 assets/hexcasting/models/item/patchouli_book.json
d7dd348ef3d402a0e6d1c601581e30e99f9bcc87 assets/hexcasting/models/item/phial_large_0.json d7dd348ef3d402a0e6d1c601581e30e99f9bcc87 assets/hexcasting/models/item/phial_large_0.json
@ -217,7 +217,7 @@ fd662ce6977b96065bd438ff332bc5b9f62560e6 data/hexcasting/loot_tables/blocks/scro
33b4d5e6928828898fea92523f7cb81f9b4eac36 data/hexcasting/loot_tables/blocks/slate_block.json 33b4d5e6928828898fea92523f7cb81f9b4eac36 data/hexcasting/loot_tables/blocks/slate_block.json
6b4459635b3d53cc2b6836fa97d29244a65b412d data/hexcasting/recipes/abacus.json 6b4459635b3d53cc2b6836fa97d29244a65b412d data/hexcasting/recipes/abacus.json
1f0c9a98d97fb81e1f504cdb6619a3dfab52ba5f data/hexcasting/recipes/ageing_scroll_paper_lantern.json 1f0c9a98d97fb81e1f504cdb6619a3dfab52ba5f data/hexcasting/recipes/ageing_scroll_paper_lantern.json
0a9df75d350505150da20b6c19919e56d41e01ed data/hexcasting/recipes/amethyst_dust_packing.json ef016ca292fa4edc7496b64e6f2931f4e7d90636 data/hexcasting/recipes/amethyst_dust_packing.json
91bb341776ce64a68e1c4200aa8f5b2fa6669820 data/hexcasting/recipes/amethyst_dust_unpacking.json 91bb341776ce64a68e1c4200aa8f5b2fa6669820 data/hexcasting/recipes/amethyst_dust_unpacking.json
4b3f5fe572ec06feab786e3ba93b0d80b145dd69 data/hexcasting/recipes/amethyst_sconce.json 4b3f5fe572ec06feab786e3ba93b0d80b145dd69 data/hexcasting/recipes/amethyst_sconce.json
e5c835d3866e8f5ecfb03c9e7c2c134a50951d67 data/hexcasting/recipes/amethyst_tiles.json e5c835d3866e8f5ecfb03c9e7c2c134a50951d67 data/hexcasting/recipes/amethyst_tiles.json

View file

@ -1,12 +1,12 @@
{ {
"parent": "minecraft:block/cube", "parent": "minecraft:block/cube",
"textures": { "textures": {
"down": "hexcasting:block/impetus/empty/front_dim", "down": "hexcasting:block/impetus/front_empty_dim",
"up": "hexcasting:block/impetus/empty/back_dim", "up": "hexcasting:block/impetus/back_empty_dim",
"north": "hexcasting:block/impetus/empty/down_dim", "north": "hexcasting:block/impetus/down_empty_dim",
"south": "hexcasting:block/impetus/empty/down_dim", "south": "hexcasting:block/impetus/down_empty_dim",
"east": "hexcasting:block/impetus/empty/down_dim", "east": "hexcasting:block/impetus/down_empty_dim",
"west": "hexcasting:block/impetus/empty/down_dim", "west": "hexcasting:block/impetus/down_empty_dim",
"particle": "hexcasting:block/slate" "particle": "hexcasting:block/slate"
} }
} }

View file

@ -1,12 +1,12 @@
{ {
"parent": "minecraft:block/cube", "parent": "minecraft:block/cube",
"textures": { "textures": {
"down": "hexcasting:block/impetus/empty/right_dim", "down": "hexcasting:block/impetus/right_empty_dim",
"up": "hexcasting:block/impetus/empty/right_dim", "up": "hexcasting:block/impetus/right_empty_dim",
"north": "hexcasting:block/impetus/empty/left_dim", "north": "hexcasting:block/impetus/left_empty_dim",
"south": "hexcasting:block/impetus/empty/right_dim", "south": "hexcasting:block/impetus/right_empty_dim",
"east": "hexcasting:block/impetus/empty/front_dim", "east": "hexcasting:block/impetus/front_empty_dim",
"west": "hexcasting:block/impetus/empty/back_dim", "west": "hexcasting:block/impetus/back_empty_dim",
"particle": "hexcasting:block/slate" "particle": "hexcasting:block/slate"
} }
} }

View file

@ -1,12 +1,12 @@
{ {
"parent": "minecraft:block/cube", "parent": "minecraft:block/cube",
"textures": { "textures": {
"down": "hexcasting:block/impetus/empty/down_dim", "down": "hexcasting:block/impetus/down_empty_dim",
"up": "hexcasting:block/impetus/empty/up_dim", "up": "hexcasting:block/impetus/up_empty_dim",
"north": "hexcasting:block/impetus/empty/front_dim", "north": "hexcasting:block/impetus/front_empty_dim",
"south": "hexcasting:block/impetus/empty/back_dim", "south": "hexcasting:block/impetus/back_empty_dim",
"east": "hexcasting:block/impetus/empty/right_dim", "east": "hexcasting:block/impetus/right_empty_dim",
"west": "hexcasting:block/impetus/empty/left_dim", "west": "hexcasting:block/impetus/left_empty_dim",
"particle": "hexcasting:block/slate" "particle": "hexcasting:block/slate"
} }
} }

View file

@ -1,12 +1,12 @@
{ {
"parent": "minecraft:block/cube", "parent": "minecraft:block/cube",
"textures": { "textures": {
"down": "hexcasting:block/impetus/empty/up_dim", "down": "hexcasting:block/impetus/up_empty_dim",
"up": "hexcasting:block/impetus/empty/down_dim", "up": "hexcasting:block/impetus/down_empty_dim",
"north": "hexcasting:block/impetus/empty/back_dim", "north": "hexcasting:block/impetus/back_empty_dim",
"south": "hexcasting:block/impetus/empty/front_dim", "south": "hexcasting:block/impetus/front_empty_dim",
"east": "hexcasting:block/impetus/empty/left_dim", "east": "hexcasting:block/impetus/left_empty_dim",
"west": "hexcasting:block/impetus/empty/right_dim", "west": "hexcasting:block/impetus/right_empty_dim",
"particle": "hexcasting:block/slate" "particle": "hexcasting:block/slate"
} }
} }

View file

@ -1,12 +1,12 @@
{ {
"parent": "minecraft:block/cube", "parent": "minecraft:block/cube",
"textures": { "textures": {
"down": "hexcasting:block/impetus/empty/back_dim", "down": "hexcasting:block/impetus/back_empty_dim",
"up": "hexcasting:block/impetus/empty/front_dim", "up": "hexcasting:block/impetus/front_empty_dim",
"north": "hexcasting:block/impetus/empty/up_dim", "north": "hexcasting:block/impetus/up_empty_dim",
"south": "hexcasting:block/impetus/empty/up_dim", "south": "hexcasting:block/impetus/up_empty_dim",
"east": "hexcasting:block/impetus/empty/up_dim", "east": "hexcasting:block/impetus/up_empty_dim",
"west": "hexcasting:block/impetus/empty/up_dim", "west": "hexcasting:block/impetus/up_empty_dim",
"particle": "hexcasting:block/slate" "particle": "hexcasting:block/slate"
} }
} }

View file

@ -1,12 +1,12 @@
{ {
"parent": "minecraft:block/cube", "parent": "minecraft:block/cube",
"textures": { "textures": {
"down": "hexcasting:block/impetus/empty/left_dim", "down": "hexcasting:block/impetus/left_empty_dim",
"up": "hexcasting:block/impetus/empty/left_dim", "up": "hexcasting:block/impetus/left_empty_dim",
"north": "hexcasting:block/impetus/empty/right_dim", "north": "hexcasting:block/impetus/right_empty_dim",
"south": "hexcasting:block/impetus/empty/left_dim", "south": "hexcasting:block/impetus/left_empty_dim",
"east": "hexcasting:block/impetus/empty/back_dim", "east": "hexcasting:block/impetus/back_empty_dim",
"west": "hexcasting:block/impetus/empty/front_dim", "west": "hexcasting:block/impetus/front_empty_dim",
"particle": "hexcasting:block/slate" "particle": "hexcasting:block/slate"
} }
} }

View file

@ -1,12 +1,12 @@
{ {
"parent": "minecraft:block/cube", "parent": "minecraft:block/cube",
"textures": { "textures": {
"down": "hexcasting:block/impetus/empty/front_lit", "down": "hexcasting:block/impetus/front_empty_lit",
"up": "hexcasting:block/impetus/empty/back_lit", "up": "hexcasting:block/impetus/back_empty_lit",
"north": "hexcasting:block/impetus/empty/down_lit", "north": "hexcasting:block/impetus/down_empty_lit",
"south": "hexcasting:block/impetus/empty/down_lit", "south": "hexcasting:block/impetus/down_empty_lit",
"east": "hexcasting:block/impetus/empty/down_lit", "east": "hexcasting:block/impetus/down_empty_lit",
"west": "hexcasting:block/impetus/empty/down_lit", "west": "hexcasting:block/impetus/down_empty_lit",
"particle": "hexcasting:block/slate" "particle": "hexcasting:block/slate"
} }
} }

View file

@ -1,12 +1,12 @@
{ {
"parent": "minecraft:block/cube", "parent": "minecraft:block/cube",
"textures": { "textures": {
"down": "hexcasting:block/impetus/empty/right_lit", "down": "hexcasting:block/impetus/right_empty_lit",
"up": "hexcasting:block/impetus/empty/right_lit", "up": "hexcasting:block/impetus/right_empty_lit",
"north": "hexcasting:block/impetus/empty/left_lit", "north": "hexcasting:block/impetus/left_empty_lit",
"south": "hexcasting:block/impetus/empty/right_lit", "south": "hexcasting:block/impetus/right_empty_lit",
"east": "hexcasting:block/impetus/empty/front_lit", "east": "hexcasting:block/impetus/front_empty_lit",
"west": "hexcasting:block/impetus/empty/back_lit", "west": "hexcasting:block/impetus/back_empty_lit",
"particle": "hexcasting:block/slate" "particle": "hexcasting:block/slate"
} }
} }

View file

@ -1,12 +1,12 @@
{ {
"parent": "minecraft:block/cube", "parent": "minecraft:block/cube",
"textures": { "textures": {
"down": "hexcasting:block/impetus/empty/down_lit", "down": "hexcasting:block/impetus/down_empty_lit",
"up": "hexcasting:block/impetus/empty/up_lit", "up": "hexcasting:block/impetus/up_empty_lit",
"north": "hexcasting:block/impetus/empty/front_lit", "north": "hexcasting:block/impetus/front_empty_lit",
"south": "hexcasting:block/impetus/empty/back_lit", "south": "hexcasting:block/impetus/back_empty_lit",
"east": "hexcasting:block/impetus/empty/right_lit", "east": "hexcasting:block/impetus/right_empty_lit",
"west": "hexcasting:block/impetus/empty/left_lit", "west": "hexcasting:block/impetus/left_empty_lit",
"particle": "hexcasting:block/slate" "particle": "hexcasting:block/slate"
} }
} }

View file

@ -1,12 +1,12 @@
{ {
"parent": "minecraft:block/cube", "parent": "minecraft:block/cube",
"textures": { "textures": {
"down": "hexcasting:block/impetus/empty/up_lit", "down": "hexcasting:block/impetus/up_empty_lit",
"up": "hexcasting:block/impetus/empty/down_lit", "up": "hexcasting:block/impetus/down_empty_lit",
"north": "hexcasting:block/impetus/empty/back_lit", "north": "hexcasting:block/impetus/back_empty_lit",
"south": "hexcasting:block/impetus/empty/front_lit", "south": "hexcasting:block/impetus/front_empty_lit",
"east": "hexcasting:block/impetus/empty/left_lit", "east": "hexcasting:block/impetus/left_empty_lit",
"west": "hexcasting:block/impetus/empty/right_lit", "west": "hexcasting:block/impetus/right_empty_lit",
"particle": "hexcasting:block/slate" "particle": "hexcasting:block/slate"
} }
} }

View file

@ -1,12 +1,12 @@
{ {
"parent": "minecraft:block/cube", "parent": "minecraft:block/cube",
"textures": { "textures": {
"down": "hexcasting:block/impetus/empty/back_lit", "down": "hexcasting:block/impetus/back_empty_lit",
"up": "hexcasting:block/impetus/empty/front_lit", "up": "hexcasting:block/impetus/front_empty_lit",
"north": "hexcasting:block/impetus/empty/up_lit", "north": "hexcasting:block/impetus/up_empty_lit",
"south": "hexcasting:block/impetus/empty/up_lit", "south": "hexcasting:block/impetus/up_empty_lit",
"east": "hexcasting:block/impetus/empty/up_lit", "east": "hexcasting:block/impetus/up_empty_lit",
"west": "hexcasting:block/impetus/empty/up_lit", "west": "hexcasting:block/impetus/up_empty_lit",
"particle": "hexcasting:block/slate" "particle": "hexcasting:block/slate"
} }
} }

View file

@ -1,12 +1,12 @@
{ {
"parent": "minecraft:block/cube", "parent": "minecraft:block/cube",
"textures": { "textures": {
"down": "hexcasting:block/impetus/empty/left_lit", "down": "hexcasting:block/impetus/left_empty_lit",
"up": "hexcasting:block/impetus/empty/left_lit", "up": "hexcasting:block/impetus/left_empty_lit",
"north": "hexcasting:block/impetus/empty/right_lit", "north": "hexcasting:block/impetus/right_empty_lit",
"south": "hexcasting:block/impetus/empty/left_lit", "south": "hexcasting:block/impetus/left_empty_lit",
"east": "hexcasting:block/impetus/empty/back_lit", "east": "hexcasting:block/impetus/back_empty_lit",
"west": "hexcasting:block/impetus/empty/front_lit", "west": "hexcasting:block/impetus/front_empty_lit",
"particle": "hexcasting:block/slate" "particle": "hexcasting:block/slate"
} }
} }

View file

@ -1,12 +1,12 @@
{ {
"parent": "minecraft:block/cube", "parent": "minecraft:block/cube",
"textures": { "textures": {
"down": "hexcasting:block/impetus/rightclick/front_dim", "down": "hexcasting:block/impetus/rightclick_dim",
"up": "hexcasting:block/impetus/rightclick/back_dim", "up": "hexcasting:block/impetus/back_dim",
"north": "hexcasting:block/impetus/rightclick/down_dim", "north": "hexcasting:block/impetus/down_dim",
"south": "hexcasting:block/impetus/rightclick/down_dim", "south": "hexcasting:block/impetus/down_dim",
"east": "hexcasting:block/impetus/rightclick/down_dim", "east": "hexcasting:block/impetus/down_dim",
"west": "hexcasting:block/impetus/rightclick/down_dim", "west": "hexcasting:block/impetus/down_dim",
"particle": "hexcasting:block/slate" "particle": "hexcasting:block/slate"
} }
} }

View file

@ -1,12 +1,12 @@
{ {
"parent": "minecraft:block/cube", "parent": "minecraft:block/cube",
"textures": { "textures": {
"down": "hexcasting:block/impetus/rightclick/right_dim", "down": "hexcasting:block/impetus/right_dim",
"up": "hexcasting:block/impetus/rightclick/right_dim", "up": "hexcasting:block/impetus/right_dim",
"north": "hexcasting:block/impetus/rightclick/left_dim", "north": "hexcasting:block/impetus/left_dim",
"south": "hexcasting:block/impetus/rightclick/right_dim", "south": "hexcasting:block/impetus/right_dim",
"east": "hexcasting:block/impetus/rightclick/front_dim", "east": "hexcasting:block/impetus/rightclick_dim",
"west": "hexcasting:block/impetus/rightclick/back_dim", "west": "hexcasting:block/impetus/back_dim",
"particle": "hexcasting:block/slate" "particle": "hexcasting:block/slate"
} }
} }

View file

@ -1,12 +1,12 @@
{ {
"parent": "minecraft:block/cube", "parent": "minecraft:block/cube",
"textures": { "textures": {
"down": "hexcasting:block/impetus/rightclick/down_dim", "down": "hexcasting:block/impetus/down_dim",
"up": "hexcasting:block/impetus/rightclick/up_dim", "up": "hexcasting:block/impetus/up_dim",
"north": "hexcasting:block/impetus/rightclick/front_dim", "north": "hexcasting:block/impetus/rightclick_dim",
"south": "hexcasting:block/impetus/rightclick/back_dim", "south": "hexcasting:block/impetus/back_dim",
"east": "hexcasting:block/impetus/rightclick/right_dim", "east": "hexcasting:block/impetus/right_dim",
"west": "hexcasting:block/impetus/rightclick/left_dim", "west": "hexcasting:block/impetus/left_dim",
"particle": "hexcasting:block/slate" "particle": "hexcasting:block/slate"
} }
} }

View file

@ -1,12 +1,12 @@
{ {
"parent": "minecraft:block/cube", "parent": "minecraft:block/cube",
"textures": { "textures": {
"down": "hexcasting:block/impetus/rightclick/up_dim", "down": "hexcasting:block/impetus/up_dim",
"up": "hexcasting:block/impetus/rightclick/down_dim", "up": "hexcasting:block/impetus/down_dim",
"north": "hexcasting:block/impetus/rightclick/back_dim", "north": "hexcasting:block/impetus/back_dim",
"south": "hexcasting:block/impetus/rightclick/front_dim", "south": "hexcasting:block/impetus/rightclick_dim",
"east": "hexcasting:block/impetus/rightclick/left_dim", "east": "hexcasting:block/impetus/left_dim",
"west": "hexcasting:block/impetus/rightclick/right_dim", "west": "hexcasting:block/impetus/right_dim",
"particle": "hexcasting:block/slate" "particle": "hexcasting:block/slate"
} }
} }

View file

@ -1,12 +1,12 @@
{ {
"parent": "minecraft:block/cube", "parent": "minecraft:block/cube",
"textures": { "textures": {
"down": "hexcasting:block/impetus/rightclick/back_dim", "down": "hexcasting:block/impetus/back_dim",
"up": "hexcasting:block/impetus/rightclick/front_dim", "up": "hexcasting:block/impetus/rightclick_dim",
"north": "hexcasting:block/impetus/rightclick/up_dim", "north": "hexcasting:block/impetus/up_dim",
"south": "hexcasting:block/impetus/rightclick/up_dim", "south": "hexcasting:block/impetus/up_dim",
"east": "hexcasting:block/impetus/rightclick/up_dim", "east": "hexcasting:block/impetus/up_dim",
"west": "hexcasting:block/impetus/rightclick/up_dim", "west": "hexcasting:block/impetus/up_dim",
"particle": "hexcasting:block/slate" "particle": "hexcasting:block/slate"
} }
} }

View file

@ -1,12 +1,12 @@
{ {
"parent": "minecraft:block/cube", "parent": "minecraft:block/cube",
"textures": { "textures": {
"down": "hexcasting:block/impetus/rightclick/left_dim", "down": "hexcasting:block/impetus/left_dim",
"up": "hexcasting:block/impetus/rightclick/left_dim", "up": "hexcasting:block/impetus/left_dim",
"north": "hexcasting:block/impetus/rightclick/right_dim", "north": "hexcasting:block/impetus/right_dim",
"south": "hexcasting:block/impetus/rightclick/left_dim", "south": "hexcasting:block/impetus/left_dim",
"east": "hexcasting:block/impetus/rightclick/back_dim", "east": "hexcasting:block/impetus/back_dim",
"west": "hexcasting:block/impetus/rightclick/front_dim", "west": "hexcasting:block/impetus/rightclick_dim",
"particle": "hexcasting:block/slate" "particle": "hexcasting:block/slate"
} }
} }

View file

@ -1,12 +1,12 @@
{ {
"parent": "minecraft:block/cube", "parent": "minecraft:block/cube",
"textures": { "textures": {
"down": "hexcasting:block/impetus/rightclick/front_lit", "down": "hexcasting:block/impetus/rightclick_lit",
"up": "hexcasting:block/impetus/rightclick/back_lit", "up": "hexcasting:block/impetus/back_lit",
"north": "hexcasting:block/impetus/rightclick/down_lit", "north": "hexcasting:block/impetus/down_lit",
"south": "hexcasting:block/impetus/rightclick/down_lit", "south": "hexcasting:block/impetus/down_lit",
"east": "hexcasting:block/impetus/rightclick/down_lit", "east": "hexcasting:block/impetus/down_lit",
"west": "hexcasting:block/impetus/rightclick/down_lit", "west": "hexcasting:block/impetus/down_lit",
"particle": "hexcasting:block/slate" "particle": "hexcasting:block/slate"
} }
} }

View file

@ -1,12 +1,12 @@
{ {
"parent": "minecraft:block/cube", "parent": "minecraft:block/cube",
"textures": { "textures": {
"down": "hexcasting:block/impetus/rightclick/right_lit", "down": "hexcasting:block/impetus/right_lit",
"up": "hexcasting:block/impetus/rightclick/right_lit", "up": "hexcasting:block/impetus/right_lit",
"north": "hexcasting:block/impetus/rightclick/left_lit", "north": "hexcasting:block/impetus/left_lit",
"south": "hexcasting:block/impetus/rightclick/right_lit", "south": "hexcasting:block/impetus/right_lit",
"east": "hexcasting:block/impetus/rightclick/front_lit", "east": "hexcasting:block/impetus/rightclick_lit",
"west": "hexcasting:block/impetus/rightclick/back_lit", "west": "hexcasting:block/impetus/back_lit",
"particle": "hexcasting:block/slate" "particle": "hexcasting:block/slate"
} }
} }

View file

@ -1,12 +1,12 @@
{ {
"parent": "minecraft:block/cube", "parent": "minecraft:block/cube",
"textures": { "textures": {
"down": "hexcasting:block/impetus/rightclick/down_lit", "down": "hexcasting:block/impetus/down_lit",
"up": "hexcasting:block/impetus/rightclick/up_lit", "up": "hexcasting:block/impetus/up_lit",
"north": "hexcasting:block/impetus/rightclick/front_lit", "north": "hexcasting:block/impetus/rightclick_lit",
"south": "hexcasting:block/impetus/rightclick/back_lit", "south": "hexcasting:block/impetus/back_lit",
"east": "hexcasting:block/impetus/rightclick/right_lit", "east": "hexcasting:block/impetus/right_lit",
"west": "hexcasting:block/impetus/rightclick/left_lit", "west": "hexcasting:block/impetus/left_lit",
"particle": "hexcasting:block/slate" "particle": "hexcasting:block/slate"
} }
} }

View file

@ -1,12 +1,12 @@
{ {
"parent": "minecraft:block/cube", "parent": "minecraft:block/cube",
"textures": { "textures": {
"down": "hexcasting:block/impetus/rightclick/up_lit", "down": "hexcasting:block/impetus/up_lit",
"up": "hexcasting:block/impetus/rightclick/down_lit", "up": "hexcasting:block/impetus/down_lit",
"north": "hexcasting:block/impetus/rightclick/back_lit", "north": "hexcasting:block/impetus/back_lit",
"south": "hexcasting:block/impetus/rightclick/front_lit", "south": "hexcasting:block/impetus/rightclick_lit",
"east": "hexcasting:block/impetus/rightclick/left_lit", "east": "hexcasting:block/impetus/left_lit",
"west": "hexcasting:block/impetus/rightclick/right_lit", "west": "hexcasting:block/impetus/right_lit",
"particle": "hexcasting:block/slate" "particle": "hexcasting:block/slate"
} }
} }

View file

@ -1,12 +1,12 @@
{ {
"parent": "minecraft:block/cube", "parent": "minecraft:block/cube",
"textures": { "textures": {
"down": "hexcasting:block/impetus/rightclick/back_lit", "down": "hexcasting:block/impetus/back_lit",
"up": "hexcasting:block/impetus/rightclick/front_lit", "up": "hexcasting:block/impetus/rightclick_lit",
"north": "hexcasting:block/impetus/rightclick/up_lit", "north": "hexcasting:block/impetus/up_lit",
"south": "hexcasting:block/impetus/rightclick/up_lit", "south": "hexcasting:block/impetus/up_lit",
"east": "hexcasting:block/impetus/rightclick/up_lit", "east": "hexcasting:block/impetus/up_lit",
"west": "hexcasting:block/impetus/rightclick/up_lit", "west": "hexcasting:block/impetus/up_lit",
"particle": "hexcasting:block/slate" "particle": "hexcasting:block/slate"
} }
} }

View file

@ -1,12 +1,12 @@
{ {
"parent": "minecraft:block/cube", "parent": "minecraft:block/cube",
"textures": { "textures": {
"down": "hexcasting:block/impetus/rightclick/left_lit", "down": "hexcasting:block/impetus/left_lit",
"up": "hexcasting:block/impetus/rightclick/left_lit", "up": "hexcasting:block/impetus/left_lit",
"north": "hexcasting:block/impetus/rightclick/right_lit", "north": "hexcasting:block/impetus/right_lit",
"south": "hexcasting:block/impetus/rightclick/left_lit", "south": "hexcasting:block/impetus/left_lit",
"east": "hexcasting:block/impetus/rightclick/back_lit", "east": "hexcasting:block/impetus/back_lit",
"west": "hexcasting:block/impetus/rightclick/front_lit", "west": "hexcasting:block/impetus/rightclick_lit",
"particle": "hexcasting:block/slate" "particle": "hexcasting:block/slate"
} }
} }

View file

@ -1,3 +1,3 @@
{ {
"parent": "hexcasting:block/empty_impetus_dim_north" "parent": "hexcasting:block/empty_impetus_dim_east"
} }

View file

@ -1,3 +1,3 @@
{ {
"parent": "hexcasting:block/impetus_rightclick_dim_north" "parent": "hexcasting:block/impetus_rightclick_dim_east"
} }

View file

@ -1,7 +1,6 @@
{ {
"type": "minecraft:crafting_shaped", "type": "minecraft:crafting_shaped",
"pattern": [ "pattern": [
"XX",
"XX", "XX",
"XX" "XX"
], ],

View file

@ -46,8 +46,7 @@ public class WallScrollRenderer extends EntityRenderer<EntityWallScroll> {
ps.mulPose(Vector3f.YP.rotationDegrees(180f - yaw)); ps.mulPose(Vector3f.YP.rotationDegrees(180f - yaw));
ps.mulPose(Vector3f.ZP.rotationDegrees(180f)); ps.mulPose(Vector3f.ZP.rotationDegrees(180f));
int light = LevelRenderer.getLightColor(wallScroll.level, int light = LevelRenderer.getLightColor(wallScroll.level, wallScroll.getPos());
wallScroll.getPos().relative(wallScroll.getDirection()));
{ {
ps.pushPose(); ps.pushPose();

View file

@ -39,10 +39,15 @@ public class HexBlockStatesAndModels extends PaucalBlockStateAndModelProvider {
.build(); .build();
}); });
var slateTex = modLoc("block/slate"); impetus(HexBlocks.IMPETUS_RIGHTCLICK.get(), "impetus_rightclick", "rightclick");
arrowCircleBlock(HexBlocks.EMPTY_IMPETUS.get(), "empty_impetus", "block/impetus/empty", slateTex); arrowCircleBlock(HexBlocks.EMPTY_IMPETUS.get(), "empty_impetus", modLoc("block/slate"),
arrowCircleBlock(HexBlocks.IMPETUS_RIGHTCLICK.get(), "impetus_rightclick", "block/impetus/rightclick", "impetus/front_empty",
slateTex); "impetus/back_empty",
"impetus/up_empty",
"impetus/down_empty",
"impetus/left_empty",
"impetus/right_empty"
);
blockAndItem(HexBlocks.SLATE_BLOCK.get(), models().cubeAll("slate_block", modLoc("block/slate"))); blockAndItem(HexBlocks.SLATE_BLOCK.get(), models().cubeAll("slate_block", modLoc("block/slate")));
cubeBlockAndItem(HexBlocks.AMETHYST_DUST_BLOCK.get(), "amethyst_dust_block"); cubeBlockAndItem(HexBlocks.AMETHYST_DUST_BLOCK.get(), "amethyst_dust_block");
@ -57,18 +62,30 @@ public class HexBlockStatesAndModels extends PaucalBlockStateAndModelProvider {
simpleBlockItem(HexBlocks.SCONCE.get(), sconceModel); simpleBlockItem(HexBlocks.SCONCE.get(), sconceModel);
} }
private void arrowCircleBlock(Block block, String name, String stub, ResourceLocation particle) { private void impetus(Block block, String name, String stub) {
arrowCircleBlock(block, name, modLoc("block/slate"),
"impetus/" + stub,
"impetus/back",
"impetus/up",
"impetus/down",
"impetus/left",
"impetus/right"
);
}
private void arrowCircleBlock(Block block, String name, ResourceLocation particle, String frontStub,
String backStub, String upStub, String downStub, String leftStub, String rightStub) {
getVariantBuilder(block).forAllStates(bs -> { getVariantBuilder(block).forAllStates(bs -> {
var isLit = bs.getValue(BlockCircleComponent.ENERGIZED); var isLit = bs.getValue(BlockCircleComponent.ENERGIZED);
var litness = isLit ? "lit" : "dim"; var litness = isLit ? "lit" : "dim";
var dir = bs.getValue(BlockStateProperties.FACING); var dir = bs.getValue(BlockStateProperties.FACING);
var up = modLoc(stub + "/up_" + litness); var up = modLoc("block/" + upStub + "_" + litness);
var front = modLoc(stub + "/front_" + litness); var front = modLoc("block/" + frontStub + "_" + litness);
var back = modLoc(stub + "/back_" + litness); var back = modLoc("block/" + backStub + "_" + litness);
var left = modLoc(stub + "/left_" + litness); var left = modLoc("block/" + leftStub + "_" + litness);
var right = modLoc(stub + "/right_" + litness); var right = modLoc("block/" + rightStub + "_" + litness);
var down = modLoc(stub + "/down_" + litness); var down = modLoc("block/" + downStub + "_" + litness);
ResourceLocation bottom = null, top = null, north = null, south = null, east = null, west = null; ResourceLocation bottom = null, top = null, north = null, south = null, east = null, west = null;
switch (dir) { switch (dir) {
@ -119,7 +136,11 @@ public class HexBlockStatesAndModels extends PaucalBlockStateAndModelProvider {
var modelName = name + "_" + litness + "_" + dir.getName(); var modelName = name + "_" + litness + "_" + dir.getName();
var model = models().cube(modelName, bottom, top, north, south, east, west) var model = models().cube(modelName, bottom, top, north, south, east, west)
.texture("particle", particle); .texture("particle", particle);
if (!isLit && dir == Direction.NORTH) { // Ordinarily i would use north, because north is the lower-right direction in the inv
// and that's where other blocks face.
// But impetuses are only distinguished by their front faces and I don't want it covered
// by the number.
if (!isLit && dir == Direction.EAST) {
simpleBlockItem(block, model); simpleBlockItem(block, model);
} }
return ConfiguredModel.builder() return ConfiguredModel.builder()

Binary file not shown.

After

Width:  |  Height:  |  Size: 506 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 450 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 457 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 502 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 599 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 447 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 476 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 580 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 484 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 337 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 362 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 339 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 364 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 332 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 351 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 339 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 364 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 344 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 363 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 323 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 334 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 357 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 401 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 422 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 584 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 514 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 525 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 584 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 581 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 461 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 479 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 598 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 358 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 355 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 387 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 378 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 406 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 403 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 388 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 383 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 389 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 384 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 406 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 397 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 393 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 399 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 569 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 601 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 568 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 473 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 482 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 561 B