moving sprites around

src/net/torvald/terrarum/blockproperties/BlockProp.kt

@@ -76,6 +76,9 @@ class BlockProp {
     }
 
     fun hasTag(s: String) = tags.contains(s)
+    fun hasAnyTagOf(vararg s: String) = s.any { hasTag(it) }
+    fun hasAnyTag(s: Collection<String>) = s.any { hasTag(it) }
+    fun hasAnyTag(s: Array<String>) = s.any { hasTag(it) }
 
     /**
      * @param luminosity

src/net/torvald/terrarum/modulebasegame/gameitems/ItemSwingingDoorOak.kt

@@ -17,7 +17,7 @@ class ItemSwingingDoorOak(originalID: ItemID) :
     override val isDynamic = false
     override val materialId = ""
     override val itemImage: TextureRegion
-        get() = CommonResourcePool.getAsItemSheet("basegame.items").get(8,3)
+        get() = CommonResourcePool.getAsItemSheet("basegame.items").get(8,10)
     override var baseToolSize: Double? = baseMass
     override var originalName = "ITEM_DOOR_OAK"
 }
@@ -30,7 +30,7 @@ class ItemSwingingDoorEbony(originalID: ItemID) :
     override val isDynamic = false
     override val materialId = ""
     override val itemImage: TextureRegion
-        get() = CommonResourcePool.getAsItemSheet("basegame.items").get(9,3)
+        get() = CommonResourcePool.getAsItemSheet("basegame.items").get(9,10)
     override var baseToolSize: Double? = baseMass
     override var originalName = "ITEM_DOOR_EBONY"
 }
@@ -43,7 +43,7 @@ class ItemSwingingDoorBirch(originalID: ItemID) :
     override val isDynamic = false
     override val materialId = ""
     override val itemImage: TextureRegion
-        get() = CommonResourcePool.getAsItemSheet("basegame.items").get(10,3)
+        get() = CommonResourcePool.getAsItemSheet("basegame.items").get(10,10)
     override var baseToolSize: Double? = baseMass
     override var originalName = "ITEM_DOOR_BIRCH"
 }
@@ -56,7 +56,7 @@ class ItemSwingingDoorRosewood(originalID: ItemID) :
     override val isDynamic = false
     override val materialId = ""
     override val itemImage: TextureRegion
-        get() = CommonResourcePool.getAsItemSheet("basegame.items").get(11,3)
+        get() = CommonResourcePool.getAsItemSheet("basegame.items").get(11,10)
     override var baseToolSize: Double? = baseMass
     override var originalName = "ITEM_DOOR_ROSEWOOD"
 }

src/net/torvald/terrarum/modulebasegame/gameitems/OreItemBase.kt

@@ -30,62 +30,70 @@ open class OreItemBase(originalID: ItemID) : GameItem(originalID) {
 }
 
 /* Wooden Log is a block */
-class OreWood(originalID: ItemID) : OreItemBase(originalID) {
-    override var originalName = "ITEM_WOOD"
+class ItemOakLogs(originalID: ItemID) : OreItemBase(originalID) {
+    override var originalName = "ITEM_LOGS_OAK"
     override val materialId = "WOOD"
     override val itemImage: TextureRegion
-        get() = CommonResourcePool.getAsItemSheet("basegame.items").get(0,6)
+        get() = CommonResourcePool.getAsItemSheet("basegame.items").get(0,10)
 }
+
+class ItemOakSEED(originalID: ItemID) : OreItemBase(originalID) {
+    override var originalName = "ITEM_ACORN_OAK"
+    override val materialId = "WOOD"
+    override val itemImage: TextureRegion
+        get() = CommonResourcePool.getAsItemSheet("basegame.items").get(0,11)
+}
+
 class OreStick(originalID: ItemID) : OreItemBase(originalID) {
     override var originalName = "ITEM_WOOD_STICK"
     override val materialId = "WOOD"
     override val itemImage: TextureRegion
-        get() = CommonResourcePool.getAsItemSheet("basegame.items").get(1,6)
+        get() = CommonResourcePool.getAsItemSheet("basegame.items").get(0,6)
 }
 class OreCopper(originalID: ItemID) : OreItemBase(originalID) {
     override var originalName = "ITEM_ORE_MALACHITE"
     override val itemImage: TextureRegion
-        get() = CommonResourcePool.getAsItemSheet("basegame.items").get(2,6)
+        get() = CommonResourcePool.getAsItemSheet("basegame.items").get(1,6)
 }
 class OreIron(originalID: ItemID) : OreItemBase(originalID) {
     override var originalName = "ITEM_ORE_HAEMATITE"
     override val itemImage: TextureRegion
-        get() = CommonResourcePool.getAsItemSheet("basegame.items").get(3,6)
+        get() = CommonResourcePool.getAsItemSheet("basegame.items").get(2,6)
 }
 class OreCoal(originalID: ItemID) : OreItemBase(originalID) {
     override var originalName = "ITEM_ORE_COAL"
     override val itemImage: TextureRegion
-        get() = CommonResourcePool.getAsItemSheet("basegame.items").get(4,6)
+        get() = CommonResourcePool.getAsItemSheet("basegame.items").get(3,6)
 }
 class OreZinc(originalID: ItemID) : OreItemBase(originalID) {
     override var originalName = "ITEM_ORE_SPHALERITE"
     override val itemImage: TextureRegion
-        get() = CommonResourcePool.getAsItemSheet("basegame.items").get(5,6)
+        get() = CommonResourcePool.getAsItemSheet("basegame.items").get(4,6)
 }
 class OreTin(originalID: ItemID) : OreItemBase(originalID) {
     override var originalName = "ITEM_ORE_CASSITERITE"
     override val itemImage: TextureRegion
-        get() = CommonResourcePool.getAsItemSheet("basegame.items").get(6,6)
+        get() = CommonResourcePool.getAsItemSheet("basegame.items").get(5,6)
 }
 class OreGold(originalID: ItemID) : OreItemBase(originalID) {
     override var originalName = "ITEM_ORE_NATURAL_GOLD"
     override val materialId: String = "AURM"
     override val itemImage: TextureRegion
-        get() = CommonResourcePool.getAsItemSheet("basegame.items").get(7, 6)
+        get() = CommonResourcePool.getAsItemSheet("basegame.items").get(6, 6)
 }
 class OreSilver(originalID: ItemID) : OreItemBase(originalID) {
     override var originalName = "ITEM_ORE_NATURAL_SILVER"
     override val materialId: String = "ARGN"
     override val itemImage: TextureRegion
-        get() = CommonResourcePool.getAsItemSheet("basegame.items").get(8,6)
+        get() = CommonResourcePool.getAsItemSheet("basegame.items").get(7,6)
 }
 class OreLead(originalID: ItemID) : OreItemBase(originalID) {
     override var originalName = "ITEM_ORE_GALENA"
     override val itemImage: TextureRegion
-        get() = CommonResourcePool.getAsItemSheet("basegame.items").get(9,6)
+        get() = CommonResourcePool.getAsItemSheet("basegame.items").get(8,6)
 }
 class ItemCoalCoke(originalID: ItemID) : OreItemBase(originalID) {
     override var originalName = "ITEM_COAL_COKE"
     override val itemImage: TextureRegion
-        get() = CommonResourcePool.getAsItemSheet("basegame.items").get(1,10)
+        get() = CommonResourcePool.getAsItemSheet("basegame.items").get(9,6)
 }

src/net/torvald/terrarum/ui/UIItemTextLineInput.kt

@@ -553,7 +553,11 @@ class UIItemTextLineInput(
 
                 App.fontGameFBO.draw(it, text, -1f*cursorDrawScroll + textDrawOffset, -2f)
             } }
-            textCommitListener(getTextOrPlaceholder())
+
+            try {
+                textCommitListener(getTextOrPlaceholder())
+            }
+            catch (_: ConcurrentModificationException) { /* it's a render code, it's fine to do nothing */ }
         }
 
         batch.begin()
@@ -685,7 +689,9 @@ class UIItemTextLineInput(
         oldPosX = posX
     }
 
+    /** This function is likely to raise a ConcurrentModificationException */
     fun getText() = textbufToString()
+    /** This function is likely to raise a ConcurrentModificationException */
     fun getTextOrPlaceholder(): String = if (textbuf.isEmpty()) currentPlaceholderText.toJavaString() else getText()
     fun clearText() {
         resetIME()