curioustorvald/Terrarum
1
0
Fork 0
mirror of https://github.com/curioustorvald/Terrarum.git synced 2026-06-11 19:14:05 +09:00
Code Issues Packages Projects Releases Wiki Activity

lang for buckets

Browse Source
This commit is contained in:
minjaesong
2024-09-14 22:27:46 +09:00
parent dfac9ed9a8
commit e8eae1e961
7 changed files with 36 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
assets/mods/basegame/crafting/items.json
View File

@@ -10,5 +10,9 @@
"item@basegame:34": { /* signal switch */ "item@basegame:34": { /* signal switch */
"workbench": "", "workbench": "",
"ingredients": [[2, 1, "item@basegame:112", 1, "$ROCK", 1, "$WOOD"]] /* 1 copper ingot, 1 rock, 1 planks */ "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 */
} }
} }

1
assets/mods/basegame/locales/en/blocks.json
View File

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

4
assets/mods/basegame/locales/en/items.json
View File

@@ -1,6 +1,10 @@
{ {
"ITEM_ALLOYING_FURNACE": "Alloying Furnace", "ITEM_ALLOYING_FURNACE": "Alloying Furnace",
"ITEM_BRICK_SINGULAR": "Brick", /* always singular */ "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_CALENDAR": "Calendar",
"ITEM_CHARCOAL": "Charcoal", "ITEM_CHARCOAL": "Charcoal",
"ITEM_CHERRY_BOMB": "Bomb", "ITEM_CHERRY_BOMB": "Bomb",

1
assets/mods/basegame/locales/koKR/blocks.json
View File

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

4
assets/mods/basegame/locales/koKR/items.json
View File

@@ -1,6 +1,10 @@
{ {
"ITEM_ALLOYING_FURNACE": "합금 화로", "ITEM_ALLOYING_FURNACE": "합금 화로",
"ITEM_BRICK_SINGULAR": "벽돌", /* always singular */ "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_CALENDAR": "달력",
"ITEM_CHARCOAL": "목탄", "ITEM_CHARCOAL": "목탄",
"ITEM_CHERRY_BOMB": "폭탄", "ITEM_CHERRY_BOMB": "폭탄",

8
src/net/torvald/terrarum/modulebasegame/EntryPoint.kt
View File

@@ -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. // 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.GameMaterialLoader.invoke(moduleName)
ModMgr.GameFluidLoader.invoke(moduleName)
// group 1
ModMgr.GameItemLoader.invoke(moduleName) ModMgr.GameItemLoader.invoke(moduleName)
// group 2
ModMgr.GameBlockLoader.invoke(moduleName) ModMgr.GameBlockLoader.invoke(moduleName)
ModMgr.GameOreLoader.invoke(moduleName) ModMgr.GameOreLoader.invoke(moduleName)
ModMgr.GameFluidLoader.invoke(moduleName) // group 3
ModMgr.GameLanguageLoader.invoke(moduleName)
ModMgr.GameCraftingRecipeLoader.invoke(moduleName) ModMgr.GameCraftingRecipeLoader.invoke(moduleName)
ModMgr.GameLanguageLoader.invoke(moduleName)
ModMgr.GameAudioLoader.invoke(moduleName) ModMgr.GameAudioLoader.invoke(moduleName)
ModMgr.GameWeatherLoader.invoke(moduleName) ModMgr.GameWeatherLoader.invoke(moduleName)

25
src/net/torvald/terrarum/modulebasegame/gameitems/ItemFluidStorage.kt
View File

@@ -2,11 +2,13 @@ package net.torvald.terrarum.modulebasegame.gameitems
import net.torvald.terrarum.* import net.torvald.terrarum.*
import net.torvald.terrarum.blockproperties.Fluid import net.torvald.terrarum.blockproperties.Fluid
import net.torvald.terrarum.blockproperties.FluidCodex
import net.torvald.terrarum.gameactors.ActorWithBody import net.torvald.terrarum.gameactors.ActorWithBody
import net.torvald.terrarum.gameitems.GameItem import net.torvald.terrarum.gameitems.GameItem
import net.torvald.terrarum.gameitems.ItemID import net.torvald.terrarum.gameitems.ItemID
import net.torvald.terrarum.gameitems.mouseInInteractableRange import net.torvald.terrarum.gameitems.mouseInInteractableRange
import net.torvald.terrarum.gameworld.FLUID_MIN_MASS import net.torvald.terrarum.gameworld.FLUID_MIN_MASS
import net.torvald.terrarum.langpack.Lang
import net.torvald.terrarum.modulebasegame.gameactors.Pocketed 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. * 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(':') 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" @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 { init {
itemImage = CommonResourcePool.getAsItemSheet(sheetName).get(sheetX,sheetY) 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 ItemBucketWooden00(originalID: ItemID) : ItemFluidStoragePrototype(originalID, 0, 0, "basegame.buckets", "ITEM_BUCKET_WOODEN")
class ItemBucketWooden01(originalID: ItemID) : ItemFluidStoragePrototype(originalID, 1, 0, "basegame.buckets") class ItemBucketWooden01(originalID: ItemID) : ItemFluidStoragePrototype(originalID, 1, 0, "basegame.buckets", "ITEM_BUCKET_WOODEN")
class ItemBucketWooden02(originalID: ItemID) : ItemFluidStoragePrototype(originalID, 2, 0, "basegame.buckets") class ItemBucketWooden02(originalID: ItemID) : ItemFluidStoragePrototype(originalID, 2, 0, "basegame.buckets", "ITEM_BUCKET_WOODEN")
class ItemBucketWooden03(originalID: ItemID) : ItemFluidStoragePrototype(originalID, 3, 0, "basegame.buckets") class ItemBucketWooden03(originalID: ItemID) : ItemFluidStoragePrototype(originalID, 3, 0, "basegame.buckets", "ITEM_BUCKET_WOODEN")
class ItemBucketIron00(originalID: ItemID) : ItemFluidStoragePrototype(originalID, 0, 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") class ItemBucketIron01(originalID: ItemID) : ItemFluidStoragePrototype(originalID, 1, 1, "basegame.buckets", "ITEM_BUCKET_IRON")
class ItemBucketIron02(originalID: ItemID) : ItemFluidStoragePrototype(originalID, 2, 1, "basegame.buckets") class ItemBucketIron02(originalID: ItemID) : ItemFluidStoragePrototype(originalID, 2, 1, "basegame.buckets", "ITEM_BUCKET_IRON")
class ItemBucketIron03(originalID: ItemID) : ItemFluidStoragePrototype(originalID, 3, 1, "basegame.buckets") class ItemBucketIron03(originalID: ItemID) : ItemFluidStoragePrototype(originalID, 3, 1, "basegame.buckets", "ITEM_BUCKET_IRON")