From 488a214a197e46fd9127f3e040b4eb546b0efe6b Mon Sep 17 00:00:00 2001
From: minjaesong <alswo9628@gmail.com>
Date: Tue, 29 Apr 2025 21:11:36 +0900
Subject: [PATCH] TODO new fluid container system

---
 .../mods/basegame/containers/containers.csv   |  3 ++
 assets/mods/basegame/items/itemid.csv         | 40 +++++++++------
 assets/mods/dwarventech/wires/1.tga           |  2 +-
 assets/mods/dwarventech/wires/3.tga           |  3 ++
 assets/mods/dwarventech/wires/4.tga           |  3 ++
 assets/mods/dwarventech/wires/wires.csv       |  2 +-
 .../gameitems/ItemFluidStorage.kt             |  2 +
 .../modulebasegame/ui/UIClipboardItem.kt      | 49 +++++++++++++++++++
 8 files changed, 86 insertions(+), 18 deletions(-)
 create mode 100644 assets/mods/basegame/containers/containers.csv
 create mode 100644 assets/mods/dwarventech/wires/3.tga
 create mode 100644 assets/mods/dwarventech/wires/4.tga
 create mode 100644 src/net/torvald/terrarum/modulebasegame/ui/UIClipboardItem.kt

diff --git a/assets/mods/basegame/containers/containers.csv b/assets/mods/basegame/containers/containers.csv
new file mode 100644
index 000000000..cc7013613
--- /dev/null
+++ b/assets/mods/basegame/containers/containers.csv
@@ -0,0 +1,3 @@
+id;itemid;tags
+1;item@basegame:59;FLUIDSTORAGE,OPENSTORAGE,NOEXTREMETHERM
+2;item@basegame:60;FLUIDSTORAGE,OPENSTORAGE
\ No newline at end of file
diff --git a/assets/mods/basegame/items/itemid.csv b/assets/mods/basegame/items/itemid.csv
index d3adf0b68..2c1e4b56c 100644
--- a/assets/mods/basegame/items/itemid.csv
+++ b/assets/mods/basegame/items/itemid.csv
@@ -58,6 +58,8 @@ id;classname;tags
 57;net.torvald.terrarum.modulebasegame.gameitems.ItemLogicSignalPushbutton;FIXTURE,SIGNAL
 58;net.torvald.terrarum.modulebasegame.gameitems.ItemLogicSignalPressurePlate;FIXTURE,SIGNAL
 
+59;net.torvald.terrarum.modulebasegame.gameitems.ItemBucketWooden;CONTAINER
+60;net.torvald.terrarum.modulebasegame.gameitems.ItemBucketIron;CONTAINER
 
 # ingots
 112;net.torvald.terrarum.modulebasegame.gameitems.IngotCopper;INGOT
@@ -171,10 +173,16 @@ id;classname;tags
 65536;net.torvald.terrarum.modulebasegame.gameitems.ItemFileRef;BASEOBJECT
 
 # fluids on storage
-# FUTURE QUEST: autogenerate them using FLUID CODEX
+# FUTURE QUEST: autogenerate them using CONTAINERS CODEX
+#   with new ItemID scheme:
+#       basegame_2<fluid@basegame:1
+#       stands for a wooden bucket (CONTAINERS basegame_2) holding a block of water (fluid@basegame:1)
+#
 # FLUIDSTORAGE: required tag for buckets/canisters
 # OPENSTORAGE: cannot hold gas. Canisters need LIDDEDSTORAGE/SEALEDSTORAGE
 # NOEXTREMETHERM: cannot hold cryogenic/molten fluids (can only hold fluid with therm 0 or 1)
+#
+# BELOW ARE COMPELETY IRRELEVANT AND PENDING FOR REMOVAL
 # 100000h..1000FFh : container type 0 x Fluid type 0..255
 # 100100h..1001FFh : container type 1 x Fluid type 0..255
 # 100200h..1002FFh : container type 2 x Fluid type 0..255
@@ -183,18 +191,18 @@ id;classname;tags
 # 100500h..1005FFh : container type 5 x Fluid type 0..255
 # ...
 # 10FF00h..10FFFFh : container type 255 x Fluid type 0..255
-1048576;net.torvald.terrarum.modulebasegame.gameitems.ItemBucketWooden00;FLUIDSTORAGE,OPENSTORAGE,NOEXTREMETHERM,FLUIDSTORAGEEMPTY
-1048577;net.torvald.terrarum.modulebasegame.gameitems.ItemBucketWooden01;FLUIDSTORAGE,OPENSTORAGE,NOEXTREMETHERM
-#1048578;net.torvald.terrarum.modulebasegame.gameitems.ItemBucketWooden02;FLUIDSTORAGE,OPENSTORAGE,NOEXTREMETHERM
-1048579;net.torvald.terrarum.modulebasegame.gameitems.ItemBucketWooden03;FLUIDSTORAGE,OPENSTORAGE,NOEXTREMETHERM
-
-1048832;net.torvald.terrarum.modulebasegame.gameitems.ItemBucketIron00;FLUIDSTORAGE,OPENSTORAGE,FLUIDSTORAGEEMPTY
-1048833;net.torvald.terrarum.modulebasegame.gameitems.ItemBucketIron01;FLUIDSTORAGE,OPENSTORAGE
-1048834;net.torvald.terrarum.modulebasegame.gameitems.ItemBucketIron02;FLUIDSTORAGE,OPENSTORAGE
-1048835;net.torvald.terrarum.modulebasegame.gameitems.ItemBucketIron03;FLUIDSTORAGE,OPENSTORAGE
-
-# reserved for debug items
-#16777216;net.torvald.terrarum.modulebasegame.gameitems.ItemBottomlessWaterBucket;DEBUG,TOOL
-#16777217;net.torvald.terrarum.modulebasegame.gameitems.ItemBottomlessLavaBucket;DEBUG,TOOL
-16777472;net.torvald.terrarum.modulebasegame.gameitems.ItemMysteriousATM;DEBUG
-16777473;net.torvald.terrarum.modulebasegame.gameitems.ItemDebugInventron;DEBUG
+#1048576;net.torvald.terrarum.modulebasegame.gameitems.ItemBucketWooden00;FLUIDSTORAGE,OPENSTORAGE,NOEXTREMETHERM,FLUIDSTORAGEEMPTY
+#1048577;net.torvald.terrarum.modulebasegame.gameitems.ItemBucketWooden01;FLUIDSTORAGE,OPENSTORAGE,NOEXTREMETHERM
+##1048578;net.torvald.terrarum.modulebasegame.gameitems.ItemBucketWooden02;FLUIDSTORAGE,OPENSTORAGE,NOEXTREMETHERM
+#1048579;net.torvald.terrarum.modulebasegame.gameitems.ItemBucketWooden03;FLUIDSTORAGE,OPENSTORAGE,NOEXTREMETHERM
+#
+#1048832;net.torvald.terrarum.modulebasegame.gameitems.ItemBucketIron00;FLUIDSTORAGE,OPENSTORAGE,FLUIDSTORAGEEMPTY
+#1048833;net.torvald.terrarum.modulebasegame.gameitems.ItemBucketIron01;FLUIDSTORAGE,OPENSTORAGE
+#1048834;net.torvald.terrarum.modulebasegame.gameitems.ItemBucketIron02;FLUIDSTORAGE,OPENSTORAGE
+#1048835;net.torvald.terrarum.modulebasegame.gameitems.ItemBucketIron03;FLUIDSTORAGE,OPENSTORAGE
+#
+## reserved for debug items
+##16777216;net.torvald.terrarum.modulebasegame.gameitems.ItemBottomlessWaterBucket;DEBUG,TOOL
+##16777217;net.torvald.terrarum.modulebasegame.gameitems.ItemBottomlessLavaBucket;DEBUG,TOOL
+#16777472;net.torvald.terrarum.modulebasegame.gameitems.ItemMysteriousATM;DEBUG
+#16777473;net.torvald.terrarum.modulebasegame.gameitems.ItemDebugInventron;DEBUG
diff --git a/assets/mods/dwarventech/wires/1.tga b/assets/mods/dwarventech/wires/1.tga
index 824f81539..fc9e10d17 100644
--- a/assets/mods/dwarventech/wires/1.tga
+++ b/assets/mods/dwarventech/wires/1.tga
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:23425ba34016e28d506cdce69e2ea4862bd348e6267c6c95ef8af9cc2ac6d0f0
+oid sha256:29998a810fe705e22bcd2eb51711b4f42a40d43c39614d17312c8e4ab19d3111
 size 16402
diff --git a/assets/mods/dwarventech/wires/3.tga b/assets/mods/dwarventech/wires/3.tga
new file mode 100644
index 000000000..824f81539
--- /dev/null
+++ b/assets/mods/dwarventech/wires/3.tga
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:23425ba34016e28d506cdce69e2ea4862bd348e6267c6c95ef8af9cc2ac6d0f0
+size 16402
diff --git a/assets/mods/dwarventech/wires/4.tga b/assets/mods/dwarventech/wires/4.tga
new file mode 100644
index 000000000..4fcced398
--- /dev/null
+++ b/assets/mods/dwarventech/wires/4.tga
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:dc8d44e46347bd120b542fdb9c2ccd5949138756767b3b52dcd163ef8c9095c4
+size 16402
diff --git a/assets/mods/dwarventech/wires/wires.csv b/assets/mods/dwarventech/wires/wires.csv
index 1b02e6aa6..a4316ffc0 100644
--- a/assets/mods/dwarventech/wires/wires.csv
+++ b/assets/mods/dwarventech/wires/wires.csv
@@ -3,7 +3,7 @@ id;drop;name;renderclass;accept;inputcount;inputtype;outputtype;javaclass;invent
 2;2;WIRE_IO_BUS;io_bus;io_bus;1;N/A;N/A;net.torvald.terrarum.modulecomputers.gameitems.WirePieceIOBus;dwarventech.items,1,1;1;""
 3;3;WIRE_TOKENRING_BLACK;token_ring;token_ring;1;N/A;N/A;net.torvald.terrarum.modulecomputers.gameitems.WirePieceNetworkBus;dwarventech.items,0,1;1;""
 4;4;WIRE_TOKENRING_BLUE;token_ring;token_ring;1;N/A;N/A;net.torvald.terrarum.modulecomputers.gameitems.WirePieceNetworkBus;dwarventech.items,0,1;1;""
-5;5;WIRE_MEMORY_BUS;memory_bus;memory_bus;1;N/A;N/A;net.torvald.terrarum.modulecomputers.gameitems.WirePieceNetworkBus;dwarventech.items,0,1;1;""
+#5;5;WIRE_MEMORY_BUS;memory_bus;memory_bus;1;N/A;N/A;net.torvald.terrarum.modulecomputers.gameitems.WirePieceNetworkBus;dwarventech.items,0,1;1;""
 
 
 # accept: which wiretype (defined elsewhere) the wires acceps. Use comma to separate multiple. N/A for electronic components (aka not wires)
diff --git a/src/net/torvald/terrarum/modulebasegame/gameitems/ItemFluidStorage.kt b/src/net/torvald/terrarum/modulebasegame/gameitems/ItemFluidStorage.kt
index a3e9162c3..88c3a233a 100644
--- a/src/net/torvald/terrarum/modulebasegame/gameitems/ItemFluidStorage.kt
+++ b/src/net/torvald/terrarum/modulebasegame/gameitems/ItemFluidStorage.kt
@@ -82,12 +82,14 @@ open class ItemFluidStoragePrototype(originalID: ItemID, sheetX: Int, sheetY: In
 }
 
 
+class ItemBucketWooden(originalID: ItemID) : ItemFluidStoragePrototype(originalID, 0, 0, "basegame.buckets", "ITEM_BUCKET_WOODEN")
 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 ItemBucketIron(originalID: ItemID) : ItemFluidStoragePrototype(originalID, 0, 1, "basegame.buckets", "ITEM_BUCKET_IRON")
 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")
diff --git a/src/net/torvald/terrarum/modulebasegame/ui/UIClipboardItem.kt b/src/net/torvald/terrarum/modulebasegame/ui/UIClipboardItem.kt
new file mode 100644
index 000000000..f5e19e4c3
--- /dev/null
+++ b/src/net/torvald/terrarum/modulebasegame/ui/UIClipboardItem.kt
@@ -0,0 +1,49 @@
+package net.torvald.terrarum.modulebasegame.ui
+
+import com.badlogic.gdx.graphics.OrthographicCamera
+import com.badlogic.gdx.graphics.g2d.SpriteBatch
+import net.torvald.terrarum.App
+import net.torvald.terrarum.ControlPresets
+import net.torvald.terrarum.RunningEnvironment
+import net.torvald.terrarum.langpack.Lang
+import net.torvald.terrarum.ui.Toolkit
+import net.torvald.terrarum.ui.UICanvas
+import net.torvald.unicode.getKeycapPC
+
+/**
+ * UI for ItemClipboard
+ *
+ * Created by minjaesong on 2025-04-13.
+ */
+class UIClipboardItem : UICanvas(
+    toggleKeyLiteral = "control_key_inventory",
+    toggleButtonLiteral = "control_gamepad_start",
+) {
+    override var width: Int = 800
+    override var height: Int = App.scr.height
+
+    private val y = UIInventoryFull.INVENTORY_CELLS_OFFSET_Y() + 1 - 34
+
+    private val drawStartX = (Toolkit.drawWidth - width) / 2 - 4
+    private val cellsStartY = y + 34
+
+    private val SP = "\u3000 "
+    val controlHelp: String
+        get() = if (App.environment == RunningEnvironment.PC)
+            "${getKeycapPC(ControlPresets.getKey("control_key_inventory"))} ${Lang["GAME_ACTION_CLOSE"]}"
+        else
+            "${App.gamepadLabelStart} ${Lang["GAME_ACTION_CLOSE"]}"
+
+
+    override fun updateImpl(delta: Float) {
+        TODO("Not yet implemented")
+    }
+
+    override fun renderImpl(frameDelta: Float, batch: SpriteBatch, camera: OrthographicCamera) {
+        TODO("Not yet implemented")
+    }
+
+    override fun dispose() {
+        TODO("Not yet implemented")
+    }
+}
\ No newline at end of file