Merge pull request #45 from GTNewHorizons/feature/tfft-rework

TFFT rework

28 files changed, 80 insertions, 22 deletions

diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/TFFT.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/TFFT.png
new file mode 100644
index 0000000000..f00e6d571f
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/TFFT.png
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/TFFT_ACTIVE.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/TFFT_ACTIVE.png
new file mode 100644
index 0000000000..69cea70d75
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/TFFT_ACTIVE.png
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/TFFT_ACTIVE.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/iconsets/TFFT_ACTIVE.png.mcmeta
new file mode 100644
index 0000000000..3de4a0bdd8
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/TFFT_ACTIVE.png.mcmeta
@@ -0,0 +1,5 @@
+{
+  "animation": {
+    "frametime": 8
+  }
+}
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/TFFT_ACTIVE_GLOW.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/TFFT_ACTIVE_GLOW.png
new file mode 100644
index 0000000000..30557c19a1
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/TFFT_ACTIVE_GLOW.png
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/TFFT_ACTIVE_GLOW.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/iconsets/TFFT_ACTIVE_GLOW.png.mcmeta
new file mode 100644
index 0000000000..f16b74ddb1
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/TFFT_ACTIVE_GLOW.png.mcmeta
@@ -0,0 +1,6 @@
+{
+   "animation": {
+      "frametime": 8
+   }
+}
+
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/TFFT_HATCH.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/TFFT_HATCH.png
new file mode 100644
index 0000000000..ea3a35a5f0
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/TFFT_HATCH.png
diff --git a/src/main/resources/assets/kekztech/lang/en_US.lang b/src/main/resources/assets/kekztech/lang/en_US.lang
index 13fc831a0c..0e0245ae8e 100644
--- a/src/main/resources/assets/kekztech/lang/en_US.lang
+++ b/src/main/resources/assets/kekztech/lang/en_US.lang
@@ -110,17 +110,18 @@ item.kekztech_crafting_item.14.name=YSZ Ceramic Plate
 item.kekztech_crafting_item.15.name=GDC Ceramic Plate
 
 # -------- TFFT: Structure Blocks
-tile.kekztech_tfftcasingblock_block.name=T.F.F.T Casing
-tile.kekztech_tfftstoragefieldblock1_block.name=T.F.F.T Storage Field Block (Tier I)
-tile.kekztech_tfftstoragefieldblock1_block.0.desc=This is not a fluid tank
-tile.kekztech_tfftstoragefieldblock2_block.name=T.F.F.T Storage Field Block (Tier II)
-tile.kekztech_tfftstoragefieldblock3_block.name=T.F.F.T Storage Field Block (Tier III)
-tile.kekztech_tfftstoragefieldblock4_block.name=T.F.F.T Storage Field Block (Tier IV)
-tile.kekztech_tfftstoragefieldblock5_block.name=T.F.F.T Storage Field Block (Tier V)
-tile.kekztech_tfftmultihatch_block.0.name=[DEPRECATED] T.F.F.T Multi-Fluid I/O Hatch (Tier I)
-tile.kekztech_tfftmultihatch_block.1.name=[DEPRECATED] T.F.F.T Multi-Fluid I/O Hatch (Tier II)
-tile.kekztech_tfftmultihatch_block.2.name=[DEPRECATED] T.F.F.T Multi-Fluid I/O Hatch (Tier III)
-tile.kekztech_tfftmultihatch_block.0.desc=Put in crafting field to change to update
+tile.kekztech_tfftstoragefield_block.0.name=T.F.F.T Casing
+tile.kekztech_tfftstoragefield_block.1.name=T.F.F.T Storage Field Block (Tier I)
+tile.kekztech_tfftstoragefield_block.2.name=T.F.F.T Storage Field Block (Tier II)
+tile.kekztech_tfftstoragefield_block.3.name=T.F.F.T Storage Field Block (Tier III)
+tile.kekztech_tfftstoragefield_block.4.name=T.F.F.T Storage Field Block (Tier IV)
+tile.kekztech_tfftstoragefield_block.5.name=T.F.F.T Storage Field Block (Tier V)
+tile.kekztech_tfftstoragefield_block.6.name=T.F.F.T Storage Field Block (Tier VI)
+tile.kekztech_tfftstoragefield_block.7.name=T.F.F.T Storage Field Block (Tier VII)
+tile.kekztech_tfftstoragefield_block.8.name=T.F.F.T Storage Field Block (Tier VIII)
+tile.kekztech_tfftstoragefield_block.9.name=T.F.F.T Storage Field Block (Tier IX)
+tile.kekztech_tfftstoragefield_block.10.name=T.F.F.T Storage Field Block (Tier X)
+tile.kekztech_tfftstoragefield_block.desc=This is not a fluid tank
 
 # -------- Item Proxy: Structure Blocks
 tile.kekztech_itemproxycable_block.name=Item Proxy Network Cable
diff --git a/src/main/resources/assets/kekztech/lang/zh_CN.lang b/src/main/resources/assets/kekztech/lang/zh_CN.lang
index cfc135b863..d7ec936c48 100644
--- a/src/main/resources/assets/kekztech/lang/zh_CN.lang
+++ b/src/main/resources/assets/kekztech/lang/zh_CN.lang
@@ -110,17 +110,18 @@ item.kekztech_crafting_item.14.name=钇锆陶瓷板
 item.kekztech_crafting_item.15.name=钆铈陶瓷板
 
 # -------- TFFT: Structure Blocks
-tile.kekztech_tfftcasingblock_block.name=T.F.F.T机械方块
-tile.kekztech_tfftstoragefieldblock1_block.name=T.F.F.T存储库方块(T1)
-tile.kekztech_tfftstoragefieldblock1_block.0.desc=这不是流体储罐
-tile.kekztech_tfftstoragefieldblock2_block.name=T.F.F.T存储库方块(T2)
-tile.kekztech_tfftstoragefieldblock3_block.name=T.F.F.T存储库方块(T3)
-tile.kekztech_tfftstoragefieldblock4_block.name=T.F.F.T存储库方块(T4)
-tile.kekztech_tfftstoragefieldblock5_block.name=T.F.F.T存储库方块(T5)
-tile.kekztech_tfftmultihatch_block.0.name=[已弃用]T.F.F.T输入/输出仓(Tier I)
-tile.kekztech_tfftmultihatch_block.1.name=[已弃用]T.F.F.T输入/输出仓(Tier II)
-tile.kekztech_tfftmultihatch_block.2.name=[已弃用]T.F.F.T输入/输出仓(Tier III)
-tile.kekztech_tfftmultihatch_block.0.desc=放入合成栏以升级
+tile.kekztech_tfftstoragefield_block.0.name=T.F.F.T机械方块
+tile.kekztech_tfftstoragefield_block.1.name=T.F.F.T存储库方块(T1)
+tile.kekztech_tfftstoragefield_block.2.name=T.F.F.T存储库方块(T2)
+tile.kekztech_tfftstoragefield_block.3.name=T.F.F.T存储库方块(T3)
+tile.kekztech_tfftstoragefield_block.4.name=T.F.F.T存储库方块(T4)
+tile.kekztech_tfftstoragefield_block.5.name=T.F.F.T存储库方块(T5)
+tile.kekztech_tfftstoragefield_block.6.name=T.F.F.T存储库方块(T6)
+tile.kekztech_tfftstoragefield_block.7.name=T.F.F.T存储库方块(T7)
+tile.kekztech_tfftstoragefield_block.8.name=T.F.F.T存储库方块(T8)
+tile.kekztech_tfftstoragefield_block.9.name=T.F.F.T存储库方块(T9)
+tile.kekztech_tfftstoragefield_block.10.name=T.F.F.T存储库方块(T10)
+tile.kekztech_tfftstoragefield_block.desc=这不是流体储罐
 
 # -------- Item Proxy: Structure Blocks
 tile.kekztech_itemproxycable_block.name=物流网络线缆
diff --git a/src/main/resources/assets/kekztech/textures/blocks/TFFTCasing.png b/src/main/resources/assets/kekztech/textures/blocks/TFFTCasing.png
index dba2574939..1ff7495c1a 100644
--- a/src/main/resources/assets/kekztech/textures/blocks/TFFTCasing.png
+++ b/src/main/resources/assets/kekztech/textures/blocks/TFFTCasing.png
diff --git a/src/main/resources/assets/kekztech/textures/blocks/TFFTMultiHatch0_off.png b/src/main/resources/assets/kekztech/textures/blocks/TFFTMultiHatch0_off.png
deleted file mode 100755
index 96ced7f091..0000000000
--- a/src/main/resources/assets/kekztech/textures/blocks/TFFTMultiHatch0_off.png
+++ /dev/null
diff --git a/src/main/resources/assets/kekztech/textures/blocks/TFFTMultiHatch0_on.png b/src/main/resources/assets/kekztech/textures/blocks/TFFTMultiHatch0_on.png
deleted file mode 100755
index 149c7c847e..0000000000
--- a/src/main/resources/assets/kekztech/textures/blocks/TFFTMultiHatch0_on.png
+++ /dev/null
diff --git a/src/main/resources/assets/kekztech/textures/blocks/TFFTMultiHatch1_off.png b/src/main/resources/assets/kekztech/textures/blocks/TFFTMultiHatch1_off.png
deleted file mode 100755
index 259826d921..0000000000
--- a/src/main/resources/assets/kekztech/textures/blocks/TFFTMultiHatch1_off.png
+++ /dev/null
diff --git a/src/main/resources/assets/kekztech/textures/blocks/TFFTMultiHatch1_on.png b/src/main/resources/assets/kekztech/textures/blocks/TFFTMultiHatch1_on.png
deleted file mode 100755
index ed5dd7610b..0000000000
--- a/src/main/resources/assets/kekztech/textures/blocks/TFFTMultiHatch1_on.png
+++ /dev/null
diff --git a/src/main/resources/assets/kekztech/textures/blocks/TFFTMultiHatch2_off.png b/src/main/resources/assets/kekztech/textures/blocks/TFFTMultiHatch2_off.png
deleted file mode 100755
index 30fbb78f34..0000000000
--- a/src/main/resources/assets/kekztech/textures/blocks/TFFTMultiHatch2_off.png
+++ /dev/null
diff --git a/src/main/resources/assets/kekztech/textures/blocks/TFFTMultiHatch2_on.png b/src/main/resources/assets/kekztech/textures/blocks/TFFTMultiHatch2_on.png
deleted file mode 100755
index be6c2a6856..0000000000
--- a/src/main/resources/assets/kekztech/textures/blocks/TFFTMultiHatch2_on.png
+++ /dev/null
diff --git a/src/main/resources/assets/kekztech/textures/blocks/TFFTStorageFieldBlock1.png b/src/main/resources/assets/kekztech/textures/blocks/TFFTStorageFieldBlock1.png
index 424cf822c0..55b4a17c56 100644
--- a/src/main/resources/assets/kekztech/textures/blocks/TFFTStorageFieldBlock1.png
+++ b/src/main/resources/assets/kekztech/textures/blocks/TFFTStorageFieldBlock1.png
diff --git a/src/main/resources/assets/kekztech/textures/blocks/TFFTStorageFieldBlock10.png b/src/main/resources/assets/kekztech/textures/blocks/TFFTStorageFieldBlock10.png
new file mode 100644
index 0000000000..26aee7ef63
--- /dev/null
+++ b/src/main/resources/assets/kekztech/textures/blocks/TFFTStorageFieldBlock10.png
diff --git a/src/main/resources/assets/kekztech/textures/blocks/TFFTStorageFieldBlock10.png.mcmeta b/src/main/resources/assets/kekztech/textures/blocks/TFFTStorageFieldBlock10.png.mcmeta
new file mode 100644
index 0000000000..33611385bd
--- /dev/null
+++ b/src/main/resources/assets/kekztech/textures/blocks/TFFTStorageFieldBlock10.png.mcmeta
@@ -0,0 +1,45 @@
+{
+  "animation": {
+    "frametime": 1,
+    "frames": [
+      0,
+      1,
+      2,
+      3,
+      4,
+      5,
+      6,
+      7,
+      8,
+      9,
+      10,
+      11,
+      12,
+      13,
+      14,
+      15,
+      16,
+      17,
+      18,
+      19,
+      18,
+      17,
+      16,
+      15,
+      14,
+      13,
+      12,
+      11,
+      10,
+      9,
+      8,
+      7,
+      6,
+      5,
+      4,
+      3,
+      2,
+      1
+    ]
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/kekztech/textures/blocks/TFFTStorageFieldBlock2.png b/src/main/resources/assets/kekztech/textures/blocks/TFFTStorageFieldBlock2.png
index a286645cb3..8176f2e44b 100644
--- a/src/main/resources/assets/kekztech/textures/blocks/TFFTStorageFieldBlock2.png
+++ b/src/main/resources/assets/kekztech/textures/blocks/TFFTStorageFieldBlock2.png
diff --git a/src/main/resources/assets/kekztech/textures/blocks/TFFTStorageFieldBlock3.png b/src/main/resources/assets/kekztech/textures/blocks/TFFTStorageFieldBlock3.png
index 7e0ccf1192..bc03da1fee 100644
--- a/src/main/resources/assets/kekztech/textures/blocks/TFFTStorageFieldBlock3.png
+++ b/src/main/resources/assets/kekztech/textures/blocks/TFFTStorageFieldBlock3.png
diff --git a/src/main/resources/assets/kekztech/textures/blocks/TFFTStorageFieldBlock4.png b/src/main/resources/assets/kekztech/textures/blocks/TFFTStorageFieldBlock4.png
index c8ed271aa1..09738a5211 100644
--- a/src/main/resources/assets/kekztech/textures/blocks/TFFTStorageFieldBlock4.png
+++ b/src/main/resources/assets/kekztech/textures/blocks/TFFTStorageFieldBlock4.png
diff --git a/src/main/resources/assets/kekztech/textures/blocks/TFFTStorageFieldBlock5.png b/src/main/resources/assets/kekztech/textures/blocks/TFFTStorageFieldBlock5.png
index f5db48e3d2..20ad0ba3c6 100644
--- a/src/main/resources/assets/kekztech/textures/blocks/TFFTStorageFieldBlock5.png
+++ b/src/main/resources/assets/kekztech/textures/blocks/TFFTStorageFieldBlock5.png
diff --git a/src/main/resources/assets/kekztech/textures/blocks/TFFTStorageFieldBlock6.png b/src/main/resources/assets/kekztech/textures/blocks/TFFTStorageFieldBlock6.png
new file mode 100644
index 0000000000..126536a973
--- /dev/null
+++ b/src/main/resources/assets/kekztech/textures/blocks/TFFTStorageFieldBlock6.png
diff --git a/src/main/resources/assets/kekztech/textures/blocks/TFFTStorageFieldBlock7.png b/src/main/resources/assets/kekztech/textures/blocks/TFFTStorageFieldBlock7.png
new file mode 100644
index 0000000000..da20b67964
--- /dev/null
+++ b/src/main/resources/assets/kekztech/textures/blocks/TFFTStorageFieldBlock7.png
diff --git a/src/main/resources/assets/kekztech/textures/blocks/TFFTStorageFieldBlock8.png b/src/main/resources/assets/kekztech/textures/blocks/TFFTStorageFieldBlock8.png
new file mode 100644
index 0000000000..ba8046b244
--- /dev/null
+++ b/src/main/resources/assets/kekztech/textures/blocks/TFFTStorageFieldBlock8.png
diff --git a/src/main/resources/assets/kekztech/textures/blocks/TFFTStorageFieldBlock9.png b/src/main/resources/assets/kekztech/textures/blocks/TFFTStorageFieldBlock9.png
new file mode 100644
index 0000000000..d8c6374fb0
--- /dev/null
+++ b/src/main/resources/assets/kekztech/textures/blocks/TFFTStorageFieldBlock9.png
diff --git a/src/main/resources/assets/kekztech/textures/blocks/multi_hatch_off.png b/src/main/resources/assets/kekztech/textures/blocks/multi_hatch_off.png
deleted file mode 100644
index ae3108edad..0000000000
--- a/src/main/resources/assets/kekztech/textures/blocks/multi_hatch_off.png
+++ /dev/null
diff --git a/src/main/resources/assets/kekztech/textures/blocks/multi_hatch_on.png b/src/main/resources/assets/kekztech/textures/blocks/multi_hatch_on.png
deleted file mode 100644
index a1e931c3a2..0000000000
--- a/src/main/resources/assets/kekztech/textures/blocks/multi_hatch_on.png
+++ /dev/null