From 63fe28eee2f007a6205e36c3cbea5a1300173c8e Mon Sep 17 00:00:00 2001 From: minjaesong Date: Fri, 15 Nov 2024 23:41:25 +0900 Subject: [PATCH] wrap-up commits for "not a true Alpha 2.0 release I was hoping for" --- assets/mods/basegame/locales/en/items.json | 3 +++ .../terrarum/modulebasegame/gameactors/Electric.kt | 8 ++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/assets/mods/basegame/locales/en/items.json b/assets/mods/basegame/locales/en/items.json index 54b6a6420..9ec2f6623 100644 --- a/assets/mods/basegame/locales/en/items.json +++ b/assets/mods/basegame/locales/en/items.json @@ -1,5 +1,6 @@ { "ITEM_ALLOYING_FURNACE": "Alloying Furnace", + "ITEM_AXLE": "Axle", "ITEM_BRICK_SINGULAR": "Brick", /* always singular */ "ITEM_BUCKET_IRON": "Iron Bucket %1$s", "ITEM_BUCKET_WOODEN": "Wooden Bucket %1$s", @@ -17,6 +18,7 @@ "ITEM_ELECTRIC_WORKBENCH": "Electric Workbench", "ITEM_ENGRAVING_WORKBENCH": "Engraving Workbench", "ITEM_FURNACE_AND_ANVIL": "Furnace and Anvil", + "ITEM_GEARBOX": "Gearbox", "ITEM_GEM_RUBY": "Raw Ruby", "ITEM_GEM_EMERALD": "Raw Emerald", "ITEM_GEM_SAPPHIRE": "Raw Sapphire", @@ -30,6 +32,7 @@ "ITEM_HATCHET_STEEL": "Steel Axe", "ITEM_HATCHET_STONE": "Stone Axe", "ITEM_HATCHET_WOODEN": "Wooden Axe", + "ITEM_INDUCTION_MOTOR": "Induction Motor", "ITEM_INGOT_BRASS": "Brass Ingot", "ITEM_INGOT_BRONZE": "Bronze Ingot", "ITEM_INGOT_COPPER": "Copper Ingot", diff --git a/src/net/torvald/terrarum/modulebasegame/gameactors/Electric.kt b/src/net/torvald/terrarum/modulebasegame/gameactors/Electric.kt index 35b142723..e9ee4e772 100644 --- a/src/net/torvald/terrarum/modulebasegame/gameactors/Electric.kt +++ b/src/net/torvald/terrarum/modulebasegame/gameactors/Electric.kt @@ -175,7 +175,7 @@ open class Electric : FixtureBase { val wx = x + worldBlockPos!!.x val wy = y + worldBlockPos!!.y - println("Wxy($wx,$wy) getWireState($type)=$new, oldState($type)=$old") +// println("Wxy($wx,$wy) getWireState($type)=$new, oldState($type)=$old") if (new.x - old.x >= ELECTRIC_THRESHOLD_EDGE_DELTA && new.x >= ELECTRIC_THRESHOLD_HIGH) risingEdgeIndices.add(index) @@ -188,9 +188,9 @@ open class Electric : FixtureBase { } } - if (risingEdgeIndices.isNotEmpty()) { - println("risingEdgeIndices=$risingEdgeIndices") - } +// if (risingEdgeIndices.isNotEmpty()) { +// println("risingEdgeIndices=$risingEdgeIndices") +// } risingEdgeIndices.forEach { onRisingEdge(it) } fallingEdgeIndices.forEach { onFallingEdge(it) }