From 3d0a1acbe1da5b98fb93c7241470144402cae59a Mon Sep 17 00:00:00 2001
From: minjaesong <alswo9628@gmail.com>
Date: Mon, 27 Nov 2023 12:18:15 +0900
Subject: [PATCH] lang update

---
 assets/mods/basegame/locales/en/blocks.json    |  8 ++++++++
 assets/mods/basegame/locales/en/items.json     | 18 ++++++++++++++++++
 .../gameactors/PlayerBuilderSigrid.kt          | 14 ++++++++------
 3 files changed, 34 insertions(+), 6 deletions(-)

diff --git a/assets/mods/basegame/locales/en/blocks.json b/assets/mods/basegame/locales/en/blocks.json
index 786ad1e0b..e6f8405b1 100644
--- a/assets/mods/basegame/locales/en/blocks.json
+++ b/assets/mods/basegame/locales/en/blocks.json
@@ -35,6 +35,11 @@
   "BLOCK_GRAVEL": "Gravel",
   "BLOCK_GRAVEL_GREY": "Grey Gravel",
 
+  "BLOCK_FOLIAGE_NORMAL": "Oak Leaves",
+  "BLOCK_FOLIAGE_EBONY": "Ebony Leaves",
+  "BLOCK_FOLIAGE_BIRCH": "Birch Leaves",
+  "BLOCK_FOLIAGE_ROSEWOOD": "Rosewood Leaves",
+
   "BLOCK_SNOW": "Snow",
 
   "BLOCK_ICE_FRAGILE": "Thin Ice",
@@ -78,6 +83,9 @@
   "BLOCK_SANDSTONE_GREEN": "Green Sandstone",
 
   "BLOCK_SCAFFOLDING_NORMAL": "Scaffolding",
+  "BLOCK_SCAFFOLDING_EBONY": "Ebony Scaffolding",
+  "BLOCK_SCAFFOLDING_BIRCH": "Birch Scaffolding",
+  "BLOCK_SCAFFOLDING_ROSEWOOD": "Rosewood Scaffolding",
 
   "BLOCK_LANTERN": "Lantern",
   "BLOCK_SUNSTONE": "Sunstone",
diff --git a/assets/mods/basegame/locales/en/items.json b/assets/mods/basegame/locales/en/items.json
index 7f69e3d34..59295c9c4 100644
--- a/assets/mods/basegame/locales/en/items.json
+++ b/assets/mods/basegame/locales/en/items.json
@@ -1,5 +1,6 @@
 {
   "ITEM_CALENDAR": "Calendar",
+  "ITEM_COAL_COKE": "Coal Coke",
   "ITEM_DOOR_OAK": "Oak Door",
   "ITEM_DOOR_EBONY": "Ebony Door",
   "ITEM_DOOR_BIRCH": "Birch Door",
@@ -10,7 +11,16 @@
   "ITEM_GEM_TOPAZ": "Raw Topaz",
   "ITEM_GEM_DIAMOND": "Raw Diamond",
   "ITEM_GEM_AMETHYST": "Raw Amethyst",
+  "ITEM_HATCHET_COPPER": "Copper Axe",
+  "ITEM_HATCHET_IRON": "Iron Axe",
+  "ITEM_HATCHET_STEEL": "Steel Axe",
+  "ITEM_HATCHET_STONE": "Stone Axe",
+  "ITEM_HATCHET_WOODEN": "Wooden Axe",
   "ITEM_LOGIC_SIGNAL_EMITTER": "Logic Signal Emitter",
+  "ITEM_LOGS_BIRCH": "Birch Logs",
+  "ITEM_LOGS_EBONY": "Ebony Logs",
+  "ITEM_LOGS_OAK": "Oak Logs",
+  "ITEM_LOGS_ROSEWOOD": "Rosewood Logs",
   "ITEM_ORE_CASSITERITE": "Tin Ore",
   "ITEM_ORE_COAL": "Coal",
   "ITEM_ORE_GALENA": "Lead Ore",
@@ -22,6 +32,12 @@
   "ITEM_PICK_COPPER": "Copper Pickaxe",
   "ITEM_PICK_IRON": "Iron Pickaxe",
   "ITEM_PICK_STEEL": "Steel Pickaxe",
+  "ITEM_PICK_STONE": "Stone Pickaxe",
+  "ITEM_PICK_WOODEN": "Wooden Pickaxe",
+  "ITEM_SEED_BIRCH": "Birch Seeds",
+  "ITEM_SEED_EBONY": "Ebony Nuts",
+  "ITEM_SEED_OAK": "Oak Acorn",
+  "ITEM_SEED_ROSEWOOD": "Rosewood Seeds",
   "ITEM_SLEDGEHAMMER_COPPER": "Copper Sledgehammer",
   "ITEM_SLEDGEHAMMER_IRON": "Iron Sledgehammer",
   "ITEM_SLEDGEHAMMER_STEEL": "Steel Sledgehammer",
@@ -30,6 +46,8 @@
   "ITEM_TYPEWRITER": "Typewriter",
   "ITEM_WIRE": "Wire",
   "ITEM_WIRE_CUTTER": "Wire Cutter",
+  "ITEM_WOOD_STICK": "Stick",
+  "ITEM_WOODEN_MALLET": "Wooden Mallet",
   "ITEM_WORKBENCH": "Workbench",
   "ITEM_WORLD_PORTAL": "Teleportation Station",
 
diff --git a/src/net/torvald/terrarum/modulebasegame/gameactors/PlayerBuilderSigrid.kt b/src/net/torvald/terrarum/modulebasegame/gameactors/PlayerBuilderSigrid.kt
index 0be43b2ce..ed48ee7f8 100644
--- a/src/net/torvald/terrarum/modulebasegame/gameactors/PlayerBuilderSigrid.kt
+++ b/src/net/torvald/terrarum/modulebasegame/gameactors/PlayerBuilderSigrid.kt
@@ -98,6 +98,7 @@ object PlayerBuilderSigrid {
 
         // item ids are defined in <module>/items/itemid.csv
 
+        /*
         inventory.add("item@basegame:1", 16) // copper pick
         inventory.add("item@basegame:2", 64) // iron pick
         inventory.add("item@basegame:3", 256) // steel pick
@@ -105,7 +106,6 @@ object PlayerBuilderSigrid {
         inventory.add("item@basegame:4", 16) // iron sledgehammer
         inventory.add("item@basegame:13", 16) // steel sledgehammer
 
-//        inventory.add("item@basegame:5", 995) // test tiki torch
 
         inventory.add("item@basegame:6", 95) // storage chest
         inventory.add("item@basegame:7", 1) // wire debugger
@@ -115,11 +115,13 @@ object PlayerBuilderSigrid {
         inventory.add("item@basegame:11", 10) // calendar
 
         inventory.add("item@basegame:16", 10) // workbench
-
-//        inventory.add("item@basegame:256", 995) // doors
-//        inventory.add("item@basegame:257", 995) // doors
-//        inventory.add("item@basegame:258", 995) // doors
-//        inventory.add("item@basegame:259", 995) // doors
+        */
+        for (i in 1..255) {
+            try {
+                inventory.add("item@basegame:${i}", 995)
+            }
+            catch (_: Throwable) {}
+        }
 
         inventory.add("item@basegame:320", 5) // portal