diff --git a/assets/mods/basegame/items/items.tga b/assets/mods/basegame/items/items.tga index 4f51eabdd..9462e4115 100644 --- a/assets/mods/basegame/items/items.tga +++ b/assets/mods/basegame/items/items.tga @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3160f604c594927f9aedfc1562c323f14481b137f88d084d86b1ab7a0575a02d +oid sha256:ed45623a6ab909f57b54b4529df14941787df3d4f6034d80c5ba60b78eab2cdc size 2408466 diff --git a/assets/mods/basegame/items/torch.tga b/assets/mods/basegame/items/torch.tga deleted file mode 100644 index ee6f87c79..000000000 --- a/assets/mods/basegame/items/torch.tga +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f17089a2b57abfea071abcda0ded14dc8c106a42c01f3ee12adb0ea4fe60e21d -size 450 diff --git a/assets/mods/basegame/items/torch_emsv.tga b/assets/mods/basegame/items/torch_emsv.tga deleted file mode 100644 index 7da1a7996..000000000 --- a/assets/mods/basegame/items/torch_emsv.tga +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:831450a9946187e6938f1378890d3ed91dddfbd71ef69cfb8f05f852368ab813 -size 450 diff --git a/src/net/torvald/terrarum/modulebasegame/gameitems/ItemMisc.kt b/src/net/torvald/terrarum/modulebasegame/gameitems/ItemMisc.kt index b68c1f9e8..a3f45b8bf 100644 --- a/src/net/torvald/terrarum/modulebasegame/gameitems/ItemMisc.kt +++ b/src/net/torvald/terrarum/modulebasegame/gameitems/ItemMisc.kt @@ -65,9 +65,9 @@ class ItemTorch(originalID: ItemID) : LightIngredientBase(originalID) { override var originalName = "BLOCK_TORCH" override val itemImage: TextureRegion - get() = FixtureItemBase.getItemImageFromSingleImage("basegame", "items/torch.tga") + get() = CommonResourcePool.getAsItemSheet("basegame.items").get(0,14) override val itemImageEmissive: TextureRegion - get() = FixtureItemBase.getItemImageFromSingleImage("basegame", "items/torch_emsv.tga") + get() = CommonResourcePool.getAsItemSheet("basegame.items").get(1,14) override fun getLumCol() = BlockCodex[Block.TORCH].getLumCol(0, 0) diff --git a/work_files/graphics/items/basegame_items.kra b/work_files/graphics/items/basegame_items.kra index 90aeaf8b2..5038aad32 100644 --- a/work_files/graphics/items/basegame_items.kra +++ b/work_files/graphics/items/basegame_items.kra @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b6dea6698e2ac5c95f807c1358a596a528ce1697924cad9ca8eb22075be5c25a -size 1586477 +oid sha256:a55db688bd9078eb5c27c4d08a6cb847d2d391e664c2d100a3498f6600b9ec09 +size 1606430