block functions now share one centralised core function

src/net/torvald/terrarum/modulebasegame/EntryPoint.kt

@@ -1,14 +1,16 @@
 package net.torvald.terrarum.modulebasegame
 
-import net.torvald.terrarum.*
+import net.torvald.terrarum.AppLoader
 import net.torvald.terrarum.AppLoader.IS_DEVELOPMENT_BUILD
 import net.torvald.terrarum.AppLoader.printdbg
+import net.torvald.terrarum.ModMgr
+import net.torvald.terrarum.ModuleEntryPoint
 import net.torvald.terrarum.blockproperties.BlockCodex
-import net.torvald.terrarum.gameactors.ActorWBMovable
 import net.torvald.terrarum.itemproperties.GameItem
 import net.torvald.terrarum.itemproperties.ItemCodex
 import net.torvald.terrarum.itemproperties.MaterialCodex
 import net.torvald.terrarum.modulebasegame.imagefont.WatchFont
+import net.torvald.terrarum.modulebasegame.items.BlockBase
 import net.torvald.terrarumsansbitmap.gdx.TextureRegionPack
 
 /**
@@ -74,48 +76,11 @@ class EntryPoint : ModuleEntryPoint() {
                     }
 
                     override fun startPrimaryUse(delta: Float): Boolean {
-                        val ingame = Terrarum.ingame!! as Ingame
+                        return BlockBase.blockStartPrimaryUse(this, i, delta)
+                    }
 
-                        val mousePoint = Point2d(Terrarum.mouseTileX.toDouble(), Terrarum.mouseTileY.toDouble())
-
-                        // check for collision with actors (BLOCK only)
-                        if (this.inventoryCategory == Category.BLOCK) {
-                            var ret1 = true
-                            ingame.actorContainerActive.forEach {
-                                if (it is ActorWBMovable && it.hIntTilewiseHitbox.intersects(mousePoint))
-                                    ret1 = false // return is not allowed here
-                            }
-                            if (!ret1) return ret1
-                        }
-
-                        // return false if the tile is already there
-                        if (this.inventoryCategory == Category.BLOCK &&
-                            this.dynamicID == ingame.world.getTileFromTerrain(Terrarum.mouseTileX, Terrarum.mouseTileY) ||
-                            this.inventoryCategory == Category.WALL &&
-                            this.dynamicID - ItemCodex.ITEM_WALLS.start == ingame.world.getTileFromWall(Terrarum.mouseTileX, Terrarum.mouseTileY) ||
-                            this.inventoryCategory == Category.WIRE &&
-                            1.shl(this.dynamicID - ItemCodex.ITEM_WIRES.start) and (ingame.world.getWiringBlocks(Terrarum.mouseTileX, Terrarum.mouseTileY) ?: 0) != 0
-                        )
-                            return false
-
-                        // filter passed, do the job
-                        // FIXME this is only useful for Player
-                        if (i in ItemCodex.ITEM_TILES) {
-                            ingame.world.setTileTerrain(
-                                    Terrarum.mouseTileX,
-                                    Terrarum.mouseTileY,
-                                    i
-                            )
-                        }
-                        else {
-                            ingame.world.setTileWall(
-                                    Terrarum.mouseTileX,
-                                    Terrarum.mouseTileY,
-                                    i
-                            )
-                        }
-
-                        return true
+                    override fun effectWhenEquipped(delta: Float) {
+                        BlockBase.blockEffectWhenEquipped(delta)
                     }
                 }
             }

src/net/torvald/terrarum/modulebasegame/IngameRenderer.kt

@@ -94,7 +94,7 @@ object IngameRenderer {
             LightmapRenderer.fireRecalculateEvent(actorsRenderBehind, actorsRenderFront, actorsRenderMidTop, actorsRenderMiddle, actorsRenderOverlay)
 
             prepLightmapRGBA()
-            BlocksDrawer.renderData(selectedWireBitToDraw)
+            BlocksDrawer.renderData()
             drawToRGB(actorsRenderBehind, actorsRenderMiddle, actorsRenderMidTop, actorsRenderFront, particlesContainer)
             drawToA(actorsRenderBehind, actorsRenderMiddle, actorsRenderMidTop, actorsRenderFront, particlesContainer)
             drawOverlayActors(actorsRenderOverlay)
@@ -214,9 +214,6 @@ object IngameRenderer {
         // works but some UI elements have wrong transparency -> should be fixed with Terrarum.gdxCleanAndSetBlend -- Torvald 2019-01-12
         blendNormal(batch)
         batch.color = Color.WHITE
-
-
-        selectedWireBitToDraw = 0
     }
 
 

src/net/torvald/terrarum/modulebasegame/gameactors/PlayerBuilderSigrid.kt

@@ -85,7 +85,7 @@ object PlayerBuilderSigrid {
         inventory.add(8448) // copper pick
         inventory.add(8449) // iron pick
         inventory.add(8450) // steel pick
-        inventory.add(8466) // wire piece
+        inventory.add(8466, 9995) // wire piece
         inventory.add(9000) // TEST water bucket
         inventory.add(9001) // TEST lava bucket
     }

src/net/torvald/terrarum/modulebasegame/items/BlockBase.kt

@@ -0,0 +1,97 @@
+package net.torvald.terrarum.modulebasegame.items
+
+import net.torvald.terrarum.Point2d
+import net.torvald.terrarum.Point2i
+import net.torvald.terrarum.Terrarum
+import net.torvald.terrarum.gameactors.ActorWBMovable
+import net.torvald.terrarum.gameworld.GameWorld
+import net.torvald.terrarum.itemproperties.GameItem
+import net.torvald.terrarum.itemproperties.ItemCodex
+import net.torvald.terrarum.modulebasegame.Ingame
+import net.torvald.terrarum.modulebasegame.IngameRenderer
+import net.torvald.terrarum.realestate.LandUtil
+
+/**
+ * Created by minjaesong on 2019-05-02.
+ */
+object BlockBase {
+
+    /**
+     * @param dontEncaseActors when set to true, blocks won't be placed where Actors are. You will want to set it false
+     * for wire items, otherwise you want it to be true.
+     */
+    fun blockStartPrimaryUse(gameItem: GameItem, itemID: Int, delta: Float): Boolean {
+        val ingame = Terrarum.ingame!! as Ingame
+        val mousePoint = Point2d(Terrarum.mouseTileX.toDouble(), Terrarum.mouseTileY.toDouble())
+        val mouseTile = Point2i(Terrarum.mouseTileX, Terrarum.mouseTileY)
+
+        // check for collision with actors (BLOCK only)
+        if (gameItem.inventoryCategory == GameItem.Category.BLOCK) {
+            var ret1 = true
+            ingame.actorContainerActive.forEach {
+                if (it is ActorWBMovable && it.hIntTilewiseHitbox.intersects(mousePoint))
+                    ret1 = false // return is not allowed here
+            }
+            if (!ret1) return ret1
+        }
+
+        // return false if the tile is already there
+        if (gameItem.inventoryCategory == GameItem.Category.BLOCK &&
+            gameItem.dynamicID == ingame.world.getTileFromTerrain(mouseTile.x, mouseTile.y) ||
+            gameItem.inventoryCategory == GameItem.Category.WALL &&
+            gameItem.dynamicID - ItemCodex.ITEM_WALLS.start == ingame.world.getTileFromWall(mouseTile.x, mouseTile.y)
+            )
+            return false
+
+        // filter passed, do the job
+        // FIXME this is only useful for Player
+        if (itemID in ItemCodex.ITEM_TILES) {
+            ingame.world.setTileTerrain(
+                    mouseTile.x,
+                    mouseTile.y,
+                    itemID
+            )
+        }
+        else {
+            ingame.world.setTileWall(
+                    mouseTile.x,
+                    mouseTile.y,
+                    itemID
+            )
+        }
+
+        return true
+    }
+
+    fun blockEffectWhenEquipped(delta: Float) {
+        IngameRenderer.selectedWireBitToDraw = 0
+    }
+
+    fun wireStartPrimaryUse(gameItem: GameItem, wireTypeBit: Int, delta: Float): Boolean {
+        val ingame = Terrarum.ingame!! as Ingame
+        val mouseTile = Point2i(Terrarum.mouseTileX, Terrarum.mouseTileY)
+
+        // return false if the tile is already there
+        if (ingame.world.getWiringBlocks(mouseTile.x, mouseTile.y) and wireTypeBit != 0)
+            return false
+
+        // filter passed, do the job
+        // FIXME this is only useful for Player
+        ingame.world.addNewConduitTo(
+                mouseTile.x,
+                mouseTile.y,
+                GameWorld.WiringNode(
+                        LandUtil.getBlockAddr(ingame.world, mouseTile.x, mouseTile.y),
+                        wireTypeBit,
+                        0f
+                )
+        )
+
+        return true
+    }
+
+    fun wireEffectWhenEquipped(typebit: Int, delta: Float) {
+        IngameRenderer.selectedWireBitToDraw = typebit
+    }
+    
+}

src/net/torvald/terrarum/modulebasegame/items/WirePieceSignalWire.kt

@@ -6,7 +6,6 @@ import net.torvald.terrarum.blockproperties.Wire
 import net.torvald.terrarum.itemproperties.GameItem
 import net.torvald.terrarum.itemproperties.ItemID
 import net.torvald.terrarum.itemproperties.Material
-import net.torvald.terrarum.modulebasegame.IngameRenderer
 import net.torvald.terrarumsansbitmap.gdx.TextureRegionPack
 
 /**
@@ -32,12 +31,10 @@ class WirePieceSignalWire(override val originalID: ItemID) : GameItem() {
     }
 
     override fun startPrimaryUse(delta: Float): Boolean {
-        println("Wire!")
-
-        return true
+        return BlockBase.wireStartPrimaryUse(this, Wire.BIT_SIGNAL_RED, delta)
     }
 
     override fun effectWhenEquipped(delta: Float) {
-        IngameRenderer.selectedWireBitToDraw = Wire.BIT_SIGNAL_RED
+        BlockBase.wireEffectWhenEquipped(Wire.BIT_SIGNAL_RED, delta)
     }
 }