Anvilcraft/HexCasting
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #54 from Falkory220/akashic

Browse source 
Lanterns retexture
This commit is contained in:
petrak@ 2022-04-08 09:49:29 -05:00 committed by GitHub
commit 6748508777
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
17 changed files with 20 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/generated/resources/.cache/cache
View file

@ -81,7 +81,7 @@ c4ac5b4b39c0c364a783c22eccb3d71cc911b3e5 assets/hexcasting/models/block/akashic_
de50477d8d34bbd69db98249cc6c878be8bc80f3 assets/hexcasting/models/block/amethyst_dust_block.json de50477d8d34bbd69db98249cc6c878be8bc80f3 assets/hexcasting/models/block/amethyst_dust_block.json
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 062366f91878466f15ebeeaa11d3fa4906918f7b assets/hexcasting/models/block/ancient_scroll_paper_lantern.json
dee605b03de1e145b8fe1b5e57cbc86cc8ceae9e assets/hexcasting/models/block/empty_directrix_dim_x.json dee605b03de1e145b8fe1b5e57cbc86cc8ceae9e assets/hexcasting/models/block/empty_directrix_dim_x.json
f23e20b75d407758c1def44d7f7a6c648fac3d59 assets/hexcasting/models/block/empty_directrix_dim_y.json f23e20b75d407758c1def44d7f7a6c648fac3d59 assets/hexcasting/models/block/empty_directrix_dim_y.json
f5f34f91c22a91e479a038cedd383fa807385d20 assets/hexcasting/models/block/empty_directrix_dim_z.json f5f34f91c22a91e479a038cedd383fa807385d20 assets/hexcasting/models/block/empty_directrix_dim_z.json
@ -161,7 +161,7 @@ a752ca73fe255f4cb2d062cba4447190985a795c assets/hexcasting/models/block/redstone
69fad01ca4978a584fe1fc76e49bda284b5bbc41 assets/hexcasting/models/block/redstone_directrix_unpowered_lit_up.json 69fad01ca4978a584fe1fc76e49bda284b5bbc41 assets/hexcasting/models/block/redstone_directrix_unpowered_lit_up.json
510f136cd3bbdb9571e2f90b54678b50808ba41b assets/hexcasting/models/block/redstone_directrix_unpowered_lit_west.json 510f136cd3bbdb9571e2f90b54678b50808ba41b assets/hexcasting/models/block/redstone_directrix_unpowered_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 b153bbd2773f0c7f114106170163530ebd28c440 assets/hexcasting/models/block/scroll_paper_lantern.json
d51541b464840530f4e734db1f67ed20e811ad14 assets/hexcasting/models/block/slate_block.json d51541b464840530f4e734db1f67ed20e811ad14 assets/hexcasting/models/block/slate_block.json
60c0f39882d22c2634cf738b0fe4e956eaa2adbe assets/hexcasting/models/item/abacus.json 60c0f39882d22c2634cf738b0fe4e956eaa2adbe assets/hexcasting/models/item/abacus.json
eba0bb8d1b28802748d98383d010615891489987 assets/hexcasting/models/item/akashic_bookshelf.json eba0bb8d1b28802748d98383d010615891489987 assets/hexcasting/models/item/akashic_bookshelf.json

6
src/generated/resources/assets/hexcasting/models/block/ancient_scroll_paper_lantern.json
View file

@ -1,6 +1,8 @@
{ {
"parent": "minecraft:block/cube_all", "parent": "minecraft:block/cube_bottom_top",
"textures": { "textures": {
"all": "hexcasting:block/ancient_scroll_paper_lantern" "side": "hexcasting:block/ancient_scroll_paper_lantern_side",
"bottom": "hexcasting:block/ancient_scroll_paper_lantern_bottom",
"top": "hexcasting:block/ancient_scroll_paper_lantern_top"
} }
} }

6
src/generated/resources/assets/hexcasting/models/block/scroll_paper_lantern.json
View file

@ -1,6 +1,8 @@
{ {
"parent": "minecraft:block/cube_all", "parent": "minecraft:block/cube_bottom_top",
"textures": { "textures": {
"all": "hexcasting:block/scroll_paper_lantern" "side": "hexcasting:block/scroll_paper_lantern_side",
"bottom": "hexcasting:block/scroll_paper_lantern_bottom",
"top": "hexcasting:block/scroll_paper_lantern_top"
} }
} }

12
src/main/java/at/petrak/hexcasting/datagen/HexBlockStatesAndModels.java
View file

@ -170,8 +170,16 @@ public class HexBlockStatesAndModels extends PaucalBlockStateAndModelProvider {
cubeBlockAndItem(HexBlocks.AMETHYST_TILES.get(), "amethyst_tiles"); cubeBlockAndItem(HexBlocks.AMETHYST_TILES.get(), "amethyst_tiles");
cubeBlockAndItem(HexBlocks.SCROLL_PAPER.get(), "scroll_paper"); cubeBlockAndItem(HexBlocks.SCROLL_PAPER.get(), "scroll_paper");
cubeBlockAndItem(HexBlocks.ANCIENT_SCROLL_PAPER.get(), "ancient_scroll_paper"); cubeBlockAndItem(HexBlocks.ANCIENT_SCROLL_PAPER.get(), "ancient_scroll_paper");
cubeBlockAndItem(HexBlocks.SCROLL_PAPER_LANTERN.get(), "scroll_paper_lantern");
cubeBlockAndItem(HexBlocks.ANCIENT_SCROLL_PAPER_LANTERN.get(), "ancient_scroll_paper_lantern"); blockAndItem(HexBlocks.SCROLL_PAPER_LANTERN.get(), models().cubeBottomTop("scroll_paper_lantern",
modLoc("block/scroll_paper_lantern_side"),
modLoc("block/scroll_paper_lantern_bottom"),
modLoc("block/scroll_paper_lantern_top")));
blockAndItem(HexBlocks.ANCIENT_SCROLL_PAPER_LANTERN.get(), models().cubeBottomTop("ancient_scroll_paper_lantern",
modLoc("block/ancient_scroll_paper_lantern_side"),
modLoc("block/ancient_scroll_paper_lantern_bottom"),
modLoc("block/ancient_scroll_paper_lantern_top")));
axisBlock(HexBlocks.AKASHIC_LOG.get(), modLoc("block/akashic/log"), modLoc("block/akashic/log_end")); axisBlock(HexBlocks.AKASHIC_LOG.get(), modLoc("block/akashic/log"), modLoc("block/akashic/log_end"));
axisBlock(HexBlocks.AKASHIC_LOG_STRIPPED.get(), modLoc("block/akashic/log_stripped"), axisBlock(HexBlocks.AKASHIC_LOG_STRIPPED.get(), modLoc("block/akashic/log_stripped"),

BIN
src/main/resources/assets/hexcasting/textures/block/amethyst_bricks.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 387 B

BIN
src/main/resources/assets/hexcasting/textures/block/amethyst_bricks_small.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 272 B

BIN
src/main/resources/assets/hexcasting/textures/block/amethyst_chiseled.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 494 B

BIN
src/main/resources/assets/hexcasting/textures/block/amethyst_dust_block.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 527 B

After

Width:  |  Height:  |  Size: 337 B

BIN
src/main/resources/assets/hexcasting/textures/block/amethyst_polished.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 492 B

BIN
src/main/resources/assets/hexcasting/textures/block/amethyst_tiles.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 468 B

After

Width:  |  Height:  |  Size: 371 B

BIN
src/main/resources/assets/hexcasting/textures/block/ancient_scroll_paper_lantern_bottom.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 511 B

BIN
src/main/resources/assets/hexcasting/textures/block/ancient_scroll_paper_lantern_side.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 253 B

BIN
src/main/resources/assets/hexcasting/textures/block/ancient_scroll_paper_lantern_top.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 505 B

BIN
src/main/resources/assets/hexcasting/textures/block/scroll_paper_lantern_bottom.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 505 B

BIN
src/main/resources/assets/hexcasting/textures/block/scroll_paper_lantern_side.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 241 B

BIN
src/main/resources/assets/hexcasting/textures/block/scroll_paper_lantern_top.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 501 B

BIN
src/main/resources/assets/hexcasting/textures/block/smooth_amethyst.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 411 B