lang for buckets

assets/mods/basegame/crafting/items.json

@@ -10,5 +10,9 @@
   "item@basegame:34": { /* signal switch */
     "workbench": "",
     "ingredients": [[2, 1, "item@basegame:112", 1, "$ROCK", 1, "$WOOD"]] /* 1 copper ingot, 1 rock, 1 planks */
+  },
+  "item@basegame:1048576": { /* wooden bucket */
+    "workbench": "basiccrafting",
+    "ingredients": [[1, 3, "$WOOD"]] /* 3 planks */
   }
 }

assets/mods/basegame/locales/en/blocks.json

@@ -112,6 +112,7 @@
   
   "BLOCK_WATER": "Water",
   "BLOCK_LAVA": "Lava",
+  "BLOCK_CRUDE_OIL": "Crude Oil",
 
   "WIRE_RED": "Red Wire",
   "WIRE_GREEN": "Green Wire",

assets/mods/basegame/locales/en/items.json

@@ -1,6 +1,10 @@
 {
   "ITEM_ALLOYING_FURNACE": "Alloying Furnace",
   "ITEM_BRICK_SINGULAR": "Brick", /* always singular */
+  "ITEM_BUCKET_IRON": "Iron Bucket",
+  "ITEM_BUCKET_IRON_WITH": "Iron Bucket with %1$s",
+  "ITEM_BUCKET_WOODEN": "Wooden Bucket",
+  "ITEM_BUCKET_WOODEN_WITH": "Wooden Bucket with %1$s",
   "ITEM_CALENDAR": "Calendar",
   "ITEM_CHARCOAL": "Charcoal",
   "ITEM_CHERRY_BOMB": "Bomb",

assets/mods/basegame/locales/koKR/blocks.json

@@ -112,6 +112,7 @@
 
   "BLOCK_WATER": "물",
   "BLOCK_LAVA": "용암",
+  "BLOCK_CRUDE_OIL": "원유",
 
   "WIRE_RED": "붉은 전선",
   "WIRE_GREEN": "녹색 전선",

assets/mods/basegame/locales/koKR/items.json

@@ -1,6 +1,10 @@
 {
   "ITEM_ALLOYING_FURNACE": "합금 화로",
   "ITEM_BRICK_SINGULAR": "벽돌", /* always singular */
+  "ITEM_BUCKET_IRON": "철 양동이",
+  "ITEM_BUCKET_IRON_WITH": "%1$s 담은 철 양동이",
+  "ITEM_BUCKET_WOODEN": "나무 양동이",
+  "ITEM_BUCKET_WOODEN_WITH": "%1$s 담은 나무 양동이",
   "ITEM_CALENDAR": "달력",
   "ITEM_CHARCOAL": "목탄",
   "ITEM_CHERRY_BOMB": "폭탄",

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

@@ -34,13 +34,17 @@ class EntryPoint : ModuleEntryPoint() {
 
 
         // the order of invocation is important! Material should be the first as blocks and items are depend on it.
+        // group 0
         ModMgr.GameMaterialLoader.invoke(moduleName)
+        ModMgr.GameFluidLoader.invoke(moduleName)
+        // group 1
         ModMgr.GameItemLoader.invoke(moduleName)
+        // group 2
         ModMgr.GameBlockLoader.invoke(moduleName)
         ModMgr.GameOreLoader.invoke(moduleName)
-        ModMgr.GameFluidLoader.invoke(moduleName)
-        ModMgr.GameLanguageLoader.invoke(moduleName)
+        // group 3
         ModMgr.GameCraftingRecipeLoader.invoke(moduleName)
+        ModMgr.GameLanguageLoader.invoke(moduleName)
         ModMgr.GameAudioLoader.invoke(moduleName)
         ModMgr.GameWeatherLoader.invoke(moduleName)
 

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

@@ -2,11 +2,13 @@ package net.torvald.terrarum.modulebasegame.gameitems
 
 import net.torvald.terrarum.*
 import net.torvald.terrarum.blockproperties.Fluid
+import net.torvald.terrarum.blockproperties.FluidCodex
 import net.torvald.terrarum.gameactors.ActorWithBody
 import net.torvald.terrarum.gameitems.GameItem
 import net.torvald.terrarum.gameitems.ItemID
 import net.torvald.terrarum.gameitems.mouseInInteractableRange
 import net.torvald.terrarum.gameworld.FLUID_MIN_MASS
+import net.torvald.terrarum.langpack.Lang
 import net.torvald.terrarum.modulebasegame.gameactors.Pocketed
 
 /**
@@ -23,7 +25,7 @@ import net.torvald.terrarum.modulebasegame.gameactors.Pocketed
  *
  * Created by minjaesong on 2024-09-14.
  */
-open class ItemFluidStoragePrototype(originalID: ItemID, sheetX: Int, sheetY: Int, sheetName: String) : GameItem(originalID) {
+open class ItemFluidStoragePrototype(originalID: ItemID, sheetX: Int, sheetY: Int, sheetName: String, keyInLang: String) : GameItem(originalID) {
 
     private val module = originalID.substringAfter('@').substringBefore(':')
 
@@ -36,6 +38,11 @@ open class ItemFluidStoragePrototype(originalID: ItemID, sheetX: Int, sheetY: In
 
     @Transient private val fluid = if (sheetX == 0) null else "fluid@$module:$sheetX"
 
+    override var originalName = if (fluid != null)
+        "${FluidCodex[fluid].nameKey}>>=${keyInLang}_WITH"
+    else
+        keyInLang
+
     init {
         itemImage = CommonResourcePool.getAsItemSheet(sheetName).get(sheetX,sheetY)
     }
@@ -75,13 +82,13 @@ open class ItemFluidStoragePrototype(originalID: ItemID, sheetX: Int, sheetY: In
 }
 
 
-class ItemBucketWooden00(originalID: ItemID) : ItemFluidStoragePrototype(originalID, 0, 0, "basegame.buckets")
-class ItemBucketWooden01(originalID: ItemID) : ItemFluidStoragePrototype(originalID, 1, 0, "basegame.buckets")
-class ItemBucketWooden02(originalID: ItemID) : ItemFluidStoragePrototype(originalID, 2, 0, "basegame.buckets")
-class ItemBucketWooden03(originalID: ItemID) : ItemFluidStoragePrototype(originalID, 3, 0, "basegame.buckets")
+class ItemBucketWooden00(originalID: ItemID) : ItemFluidStoragePrototype(originalID, 0, 0, "basegame.buckets", "ITEM_BUCKET_WOODEN")
+class ItemBucketWooden01(originalID: ItemID) : ItemFluidStoragePrototype(originalID, 1, 0, "basegame.buckets", "ITEM_BUCKET_WOODEN")
+class ItemBucketWooden02(originalID: ItemID) : ItemFluidStoragePrototype(originalID, 2, 0, "basegame.buckets", "ITEM_BUCKET_WOODEN")
+class ItemBucketWooden03(originalID: ItemID) : ItemFluidStoragePrototype(originalID, 3, 0, "basegame.buckets", "ITEM_BUCKET_WOODEN")
 
 
-class ItemBucketIron00(originalID: ItemID) : ItemFluidStoragePrototype(originalID, 0, 1, "basegame.buckets")
-class ItemBucketIron01(originalID: ItemID) : ItemFluidStoragePrototype(originalID, 1, 1, "basegame.buckets")
-class ItemBucketIron02(originalID: ItemID) : ItemFluidStoragePrototype(originalID, 2, 1, "basegame.buckets")
-class ItemBucketIron03(originalID: ItemID) : ItemFluidStoragePrototype(originalID, 3, 1, "basegame.buckets")
+class ItemBucketIron00(originalID: ItemID) : ItemFluidStoragePrototype(originalID, 0, 1, "basegame.buckets", "ITEM_BUCKET_IRON")
+class ItemBucketIron01(originalID: ItemID) : ItemFluidStoragePrototype(originalID, 1, 1, "basegame.buckets", "ITEM_BUCKET_IRON")
+class ItemBucketIron02(originalID: ItemID) : ItemFluidStoragePrototype(originalID, 2, 1, "basegame.buckets", "ITEM_BUCKET_IRON")
+class ItemBucketIron03(originalID: ItemID) : ItemFluidStoragePrototype(originalID, 3, 1, "basegame.buckets", "ITEM_BUCKET_IRON")