diff --git a/ModuleComputers/src/net/torvald/terrarum/modulecomputers/gameitems/ItemWearableWorldRadar.kt b/ModuleComputers/src/net/torvald/terrarum/modulecomputers/gameitems/ItemWearableWorldRadar.kt index 885e961ba..689555f31 100644 --- a/ModuleComputers/src/net/torvald/terrarum/modulecomputers/gameitems/ItemWearableWorldRadar.kt +++ b/ModuleComputers/src/net/torvald/terrarum/modulecomputers/gameitems/ItemWearableWorldRadar.kt @@ -15,6 +15,7 @@ import net.torvald.terrarum.gameitems.GameItem import net.torvald.terrarum.gameitems.ItemID import net.torvald.terrarum.itemproperties.Material import net.torvald.terrarum.modulebasegame.TerrarumIngame +import net.torvald.terrarum.modulebasegame.gameitems.FixtureItemBase import net.torvald.terrarum.modulecomputers.tsvmperipheral.WorldRadar import net.torvald.terrarum.ui.Toolkit import net.torvald.terrarum.ui.UICanvas @@ -36,7 +37,8 @@ class ItemWearableWorldRadar(originalID: String) : GameItem(originalID) { override val isDynamic = true override val material = Material() override val itemImage: TextureRegion - get() = CommonResourcePool.getAsTextureRegion("basegame-sprites-fixtures-signal_source.tga") + get() = FixtureItemBase.getItemImageFromSingleImage("basegame", "sprites/fixtures/signal_source.tga") + override var baseToolSize: Double? = baseMass diff --git a/src/net/torvald/terrarum/modulebasegame/gameactors/FixtureBase.kt b/src/net/torvald/terrarum/modulebasegame/gameactors/FixtureBase.kt index cf4be76a7..d25cbf66c 100644 --- a/src/net/torvald/terrarum/modulebasegame/gameactors/FixtureBase.kt +++ b/src/net/torvald/terrarum/modulebasegame/gameactors/FixtureBase.kt @@ -40,6 +40,11 @@ open class FixtureBase : ActorWithBody, CuedByTerrainChange { private constructor() : super(RenderOrder.BEHIND, PhysProperties.IMMOBILE, null) + /** + * Making the sprite: do not address the CommonResourcePool directly; just do it like this snippet: + * + * ```makeNewSprite(FixtureBase.getSpritesheet("basegame", "sprites/fixtures/tiki_torch.tga", 16, 32))``` + */ constructor( blockBox0: BlockBox, blockBoxProps: BlockBoxProps = BlockBoxProps(0), diff --git a/src/net/torvald/terrarum/modulebasegame/gameactors/FixtureLogicSignalEmitter.kt b/src/net/torvald/terrarum/modulebasegame/gameactors/FixtureLogicSignalEmitter.kt index 0b3e8fdcd..97fcb391f 100644 --- a/src/net/torvald/terrarum/modulebasegame/gameactors/FixtureLogicSignalEmitter.kt +++ b/src/net/torvald/terrarum/modulebasegame/gameactors/FixtureLogicSignalEmitter.kt @@ -26,13 +26,6 @@ class FixtureLogicSignalEmitter : FixtureBase, Electric { init { val itemImage = FixtureItemBase.getItemImageFromSingleImage("basegame", "sprites/fixtures/signal_source.tga") - CommonResourcePool.addToLoadingList("basegame-sprites-fixtures-signal_source.tga") { - val t = TextureRegion(Texture(ModMgr.getGdxFile("basegame", "sprites/fixtures/signal_source.tga"))) - t.flip(false, false) - /*return*/t - } - CommonResourcePool.loadAll() - density = 1400.0 setHitboxDimension(TILE_SIZE, TILE_SIZE, 0, -1) diff --git a/src/net/torvald/terrarum/modulebasegame/gameitems/FixtureItemBase.kt b/src/net/torvald/terrarum/modulebasegame/gameitems/FixtureItemBase.kt index 590a3d28c..1009cdbc3 100644 --- a/src/net/torvald/terrarum/modulebasegame/gameitems/FixtureItemBase.kt +++ b/src/net/torvald/terrarum/modulebasegame/gameitems/FixtureItemBase.kt @@ -40,8 +40,15 @@ open class FixtureItemBase(originalID: ItemID, val fixtureClassName: String) : G override val isUnique = false override val isDynamic = false override val material = Material() + + /** + * Do not address the CommonResourcePool directly; just do it like this snippet: + * + * ```get() = FixtureItemBase.getItemImageFromSingleImage("basegame", "sprites/fixtures/signal_source.tga")``` + */ override val itemImage: TextureRegion get() = CommonResourcePool.getAsTextureRegion("itemplaceholder_32") + override var baseToolSize: Double? = baseMass override fun effectWhileEquipped(actor: ActorWithBody, delta: Float) {