diff --git a/assets/mods/basegame/items/items.tga b/assets/mods/basegame/items/items.tga index 3012c5977..c4e6764ff 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:376edef960ff1c9addfaf5550978111d44eabc769f44076e60316ad23a1457c4 +oid sha256:f6acb450f5ce5db757f85c7fe66a27ecec5b35f633b0ee3aaeb9fd8c475cc2f7 size 2408466 diff --git a/src/net/torvald/terrarum/modulebasegame/gameitems/ItemJukebox.kt b/src/net/torvald/terrarum/modulebasegame/gameitems/ItemJukebox.kt index 561ec5a01..5a34af476 100644 --- a/src/net/torvald/terrarum/modulebasegame/gameitems/ItemJukebox.kt +++ b/src/net/torvald/terrarum/modulebasegame/gameitems/ItemJukebox.kt @@ -1,6 +1,7 @@ package net.torvald.terrarum.modulebasegame.gameitems import com.badlogic.gdx.graphics.g2d.TextureRegion +import net.torvald.terrarum.CommonResourcePool import net.torvald.terrarum.gameitems.ItemID /** @@ -13,9 +14,7 @@ class ItemJukebox(originalID: ItemID) : FixtureItemBase(originalID, "net.torvald override val isDynamic = false override val materialId = "" override val itemImage: TextureRegion - get() = getItemImageFromSingleImage("basegame", "sprites/fixtures/jukebox.tga") - override val itemImageEmissive: TextureRegion - get() = getItemImageFromSingleImage("basegame", "sprites/fixtures/jukebox_emsv.tga") + get() = CommonResourcePool.getAsItemSheet("basegame.items").get(6,3) override var baseToolSize: Double? = baseMass override var originalName = "ITEM_JUKEBOX" diff --git a/work_files/graphics/items/basegame_items.kra b/work_files/graphics/items/basegame_items.kra index 07c52cad1..f7f6891c4 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:c54ecbbf627b925b2ff6b5f8946c99498e398676616bf412f6956e6245ed71fd -size 1056305 +oid sha256:17b944ce40375963784d92e48cf95712b128188e85500641fe40b11039f9a930 +size 1081066