From 0142b734ada6f0d57cb304e1f39b0bbe22307084 Mon Sep 17 00:00:00 2001
From: raumigit <86038378+raumigit@users.noreply.github.com>
Date: Sat, 19 Aug 2023 15:12:53 +0900
Subject: [PATCH 1/3] Update Code& New Textures
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Add(ja)
シートを被せた茶の木/茶葉/茶殻/遮光シート
CodeOnly
millstone
TexturesOnly
Tea Leave
---
 .../github/robustum/teatopia/common/Teatopia.kt  |   6 ++++++
 .../robustum/teatopia/common/TeatopiaBlocks.kt   |   7 +++++++
 .../robustum/teatopia/common/TeatopiaItems.kt    |  13 +++++++++++++
 .../resources/assets/teatopia/lang/ja_jp.json    |   7 ++++++-
 .../teatopia/textures/block/tea_leave_c.png      | Bin 0 -> 794 bytes
 .../teatopia/textures/block/tea_leave_nc.png     | Bin 0 -> 791 bytes
 .../textures/block/tea_leave_sheet_side.png      | Bin 0 -> 1229 bytes
 .../textures/block/tea_leave_sheet_top.png       | Bin 0 -> 417 bytes
 8 files changed, 32 insertions(+), 1 deletion(-)
 create mode 100644 src/main/resources/assets/teatopia/textures/block/tea_leave_c.png
 create mode 100644 src/main/resources/assets/teatopia/textures/block/tea_leave_nc.png
 create mode 100644 src/main/resources/assets/teatopia/textures/block/tea_leave_sheet_side.png
 create mode 100644 src/main/resources/assets/teatopia/textures/block/tea_leave_sheet_top.png

diff --git a/src/main/kotlin/io/github/robustum/teatopia/common/Teatopia.kt b/src/main/kotlin/io/github/robustum/teatopia/common/Teatopia.kt
index f83204f..cb1892c 100644
--- a/src/main/kotlin/io/github/robustum/teatopia/common/Teatopia.kt
+++ b/src/main/kotlin/io/github/robustum/teatopia/common/Teatopia.kt
@@ -28,7 +28,13 @@ object Teatopia : ModInitializer {
     override fun onInitialize() {
         TeatopiaItems.freshTeaLeaf
         TeatopiaItems.teaSapling
+        TeatopiaItems.driedTeaLeaves
+        TeatopiaItems.usedTeaLeaves
+        TeatopiaItems.lightShieldingSheet
         TeatopiaBlocks.teaTree
+        TeatopiaBlocks.teaTreeSheet
+        TeatopiaBlocks.millStone
+
         RESOURCE_PACK.addLang(id("en_us"), localeEn_Us)
         RRPCallback.BEFORE_VANILLA.register { it.add(RESOURCE_PACK) }
     }
diff --git a/src/main/kotlin/io/github/robustum/teatopia/common/TeatopiaBlocks.kt b/src/main/kotlin/io/github/robustum/teatopia/common/TeatopiaBlocks.kt
index 33bddb0..e255cd5 100644
--- a/src/main/kotlin/io/github/robustum/teatopia/common/TeatopiaBlocks.kt
+++ b/src/main/kotlin/io/github/robustum/teatopia/common/TeatopiaBlocks.kt
@@ -18,6 +18,13 @@ object TeatopiaBlocks {
         addBlock(TeaTreeBlock(), "tea_tree", "Tea Tree")
     }
 
+    val teaTreeSheet by lazy {
+        addBlock(TeaTreeBlock(), "tea_tree_sheet", "Tea Tree (Sheet)")
+    }
+
+    val millStone by lazy {
+        addBlock(TeaTreeBlock(), "millstone", "millstone")
+    }
     val blockItems: Map<Block, Item>
         get() = mutableBlockItems
     private val mutableBlockItems: MutableMap<Block, Item> = mutableMapOf()
diff --git a/src/main/kotlin/io/github/robustum/teatopia/common/TeatopiaItems.kt b/src/main/kotlin/io/github/robustum/teatopia/common/TeatopiaItems.kt
index 54cb428..50af3ae 100644
--- a/src/main/kotlin/io/github/robustum/teatopia/common/TeatopiaItems.kt
+++ b/src/main/kotlin/io/github/robustum/teatopia/common/TeatopiaItems.kt
@@ -17,6 +17,19 @@ object TeatopiaItems {
         addSimpleItem("tea_sapling", "Tea Sapling")
     }
 
+    val driedTeaLeaves by lazy {
+        addSimpleItem("dried_tea_leaves", "Dried tea leaves ")
+    }
+
+    val usedTeaLeaves by lazy {
+        addSimpleItem("used_tea_leaves", "Used tea leaves")
+    }
+
+    val lightShieldingSheet by lazy {
+        addSimpleItem("light_shielding_sheet", "Light shielding sheet")
+    }
+
+
     private fun addSimpleItem(name: String, localizationEn: String): Item =
         addItem(Item(Item.Settings().group(Teatopia.itemGroup)), name, localizationEn)
 
diff --git a/src/main/resources/assets/teatopia/lang/ja_jp.json b/src/main/resources/assets/teatopia/lang/ja_jp.json
index e8f7026..8a14c4a 100644
--- a/src/main/resources/assets/teatopia/lang/ja_jp.json
+++ b/src/main/resources/assets/teatopia/lang/ja_jp.json
@@ -1,6 +1,11 @@
 {
   "block.teatopia.tea_tree": "茶の木",
+  "block.teatopia.tea_tree_sheet": "シートを被せた茶の木",
   "item.teatopia.tea_tree": "茶の木",
   "item.teatopia.fresh_tea_leaf": "新鮮な茶葉",
-  "item.teatopia.tea_sapling": "茶の苗木"
+  "item.teatopia.tea_sapling": "茶の苗木",
+  "item.teatopia.dried_tea_leaves": "茶葉",
+  "item.teatopia.used_tea_leaves": "茶殻",
+  "item.teatopia.light_shielding_sheet": "遮光シート",
+
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/teatopia/textures/block/tea_leave_c.png b/src/main/resources/assets/teatopia/textures/block/tea_leave_c.png
new file mode 100644
index 0000000000000000000000000000000000000000..42cbe7a99e5a0ce30f72fdb35afd6ddfdbebb399
GIT binary patch
literal 794
zcmV+#1LgdQP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00001b5ch_0Itp)
z=>Px%x=BPqR5*=Ylg~@jaTv#6pRe2Zn`_Jc(A=sOE^V?FI>;{tJAH$&Lq*_e5DY3K
z@=!aJ2k{^V<smBS(kTc!b*VqVLqrE5tc*f1i&;&SP3Ko==GxQYn>u?=&xhyX`MjU^
z`~4_uG$d0KMF83o2D+~Edc;=LMKpsn1z~qM#Q0EAwVXk`ew~g)5CzaXwns{(B3`eT
z@u8xMWszU2P+0|U5ayntQaMc~@79z#XvoCvH5JPuO+gLf{Yd?9@qVP`4C3lWv;-2%
zBK19yJ|vpidb?V}KBlpWW)Qay(~lig$pNHXg8Vx;XgX^&hczbe)>JB|37MK4X!oJL
z9<f!R7b$!KkJp*%vyhJuQB6VUOv6GR-1-*E)^M1G8CWja4kW`wQaMckx-NE!mOzpN
z4$M?e+qTBh8*TxxMneLi3==tYtcj@yWfjXJ>%XCKr;Ek8DjnSh6Svnk6=^<+C<T$u
z9elW7QL!xIN~AUR?+-FXnb{}&Ypw#Io4UXn$t%e88%6O896cSP(O&~9Eari;_u2%&
z95lonG^8iz5rBQ?9LVWmp8zB-8*=<+V3Ym-)gd{6_$@>`jO^=k3XyYe30MuXF$BP$
zMmo;d$=Ex#M^=ihyty-}QaMcuGc~?HN3~xtq%iB^hzURQw!?vi1onbmhMt^9l>P@5
z=|jr%5bK7I4^drLUGn}>RkfV*h`m%JeyqZuD!6sW0|1Bnk<ucpmO)vgAt`)c$LC+$
zv~u#&E-Cz2Cwjm~gR#Qfdlj{D6Yd6>eTwSIdBhiNbXd1WLoz;8+{`O>mERQ?9xuGQ
z<=lo{f~7nhv9^$G3v<xeMppf8Y~&l}iT5LcUPlF$9`?y{$);QkFh8?I>V!eKHNwm5
z-&8b%%uPVtg3d%6FRp!6(G0RY5B6tJe)tQSU?N*CoOtg5000hUSV?A0O#mtY000O8
Y00000007cclK=n!07*qoM6N<$f~sL)pa1{>

literal 0
HcmV?d00001

diff --git a/src/main/resources/assets/teatopia/textures/block/tea_leave_nc.png b/src/main/resources/assets/teatopia/textures/block/tea_leave_nc.png
new file mode 100644
index 0000000000000000000000000000000000000000..bca7edb3850313af58b2f71466d1ab6951a5fc96
GIT binary patch
literal 791
zcmV+y1L*vTP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00001b5ch_0Itp)
z=>Px%w@E}nR5*=QlD|vyd=$k$-$%(am?2~_AnM{Ead8R`ogzpV1))<w2&fUEgMJ6?
zP&$+fwL_@l<Rlb2`8T-fkjY7xst|wBr2(;^cDe81+v0Pld*O2Kx#t{JtJNe)5&&G+
z#V`!2)vDrG1wkOTZR0o&<#JiAt*wb=S-7r?0%$ZEl4TjDX;LniRTzfS@Av8V``ETk
zyWLh=Yl-7nl}aV4*Xt?_L$Pfe6-AMppP!E|Mo}c)ZkIGo84Lz^o`+!=40j5Jf*6KD
zyWLg*<BsEuX#QR-7K@T)8Mn8$c%DZP1mZXjaU3hHwFE&Rb8~b2saC5hpU=zP-5sWB
z0^s|;oSmI1+qTK&a-?aBVHhJ#9LJ&4>5ygF4<*m@L~AVoTU%S=x~>$9MFG%SOBjX{
zMUem;92^KhtyU8N<$0bgEiG|+daA-Ol)+%Y#KZ*8&(AC_E>f@8NBXR+tcX&I`T2QH
zPEJ%9hBBVZ<(Qe70pQ}|;vf4w&l7;%-Ceo4x#8jAfz{PjEXx8QO;cz#n*vZOm84WE
zjb2$_Ul)K%r6K@3J3DfCcql{g-)}Kg-S>T2SXhukp)dmReP4zk0J&UFHa0d!^LV4t
zkY2CH@$s?JT1%(X;qvlQZEkML<KrWq=lxLq-<_$cDc;}T(OQdP82m|+gzM{Tip8SD
zajd4NrvZ3-d*k!-lke|uOw&YbEmv1ps?};K$8mUidLl^@RIOH%mzNhT%Nj*_dwW}6
zUtgJ>o#pS}zciaoH4NL>*ch!=OKGitqCE7pTrQ9LkB<+&zP>O`lcS>}6^5Z?Sw@<s
z_`XjZ$N#v+(1qV(4ePhk!|+5=B>8+^q9_tosZ=D(GJ3rpolb}4<z*%(C)wZMS3wX+
zk|g-PkL$YZ?d_=`2&CKXa({o1Wm)_OmakkGR$q0G0000EWmrjOO-%qQ0000800000
V0002eQ<DGy002ovPDHLkV1iahYoGuC

literal 0
HcmV?d00001

diff --git a/src/main/resources/assets/teatopia/textures/block/tea_leave_sheet_side.png b/src/main/resources/assets/teatopia/textures/block/tea_leave_sheet_side.png
new file mode 100644
index 0000000000000000000000000000000000000000..6604f9f404980fea8852377cfa5f4aa93da9251a
GIT binary patch
literal 1229
zcmV;;1Ty=HP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0004nX+uL$Nkc;*
zaB^>EX>4Tx04R}tkv&MmKpe$iQ?*4Zf_4xQ%ut;yh>D1lRIvyaN?V~-2a`*`ph-iL
z;^HW{799LotU9<j>+0Yt2!bCVt}afBE>hzEl0u7E503ls?%w0>9U#<7Of@^k0ade%
zL^L9%GpnNS6@K)g3&WU|n5oB-iz&1nU-$6v^)Ae_+MoM#^e9=A0UnWfj_HO)yg@v@
zY3ZEziG!>lDa7Z*V+LK2_>t?f%Ws_X4huXpXrvPJ#6e;)-@<YWvx1=#PZ5U{Rik_%
z?Xtpoi?dp)u*N<43j<kgCCPP~Lx^GtF~lK4Mg>KbU?EJaMv939?MK@92OWQ$Tr#<e
zVB}ap87d^l5B>+gyESu@6K+x<0(8FE_Qwd|+Xd=X+x|Yb?fMDeeFm<yroUVRW<E);
zHnq?Z(7O#>TsJj&54hX`2A*`ukQ~WNQ^@6j_cQvY4A6fIbg#L+HTH4(0Hmm^<s0DO
z5E#u<_IjIl`&)ba_e`U|AHUpk#y@#U*#H0l24YJ`L;(K){{a7>y{D4^000SaNLh0L
z04^f{04^f|c%?sf00007bV*G`2j>V91|<>_GKf+D000?uMObu0Z*6U5Zgc=ca%Ew3
zWn>_CX>@2HM@dakSAh-}0007{Nkl<ZILlp;yN(=H5Qe{VPM_}S>&|-C?5@}mHqvSV
zK|lbJqaooLHX^|>5D{38mK5<0JOO?H2ZTt-p%Vm%i)<v%?sWHT_w?nQB4~L6S5*3|
zRQmqE)ba7#GK?d`FcO6!VQ3LxvndfEw3aBebp62S9P=UvpsZ`W^Qa`7i}!*J0uG9t
zvZ@)zksvS_ZSdYRjMH(Y6<yb3g8=V6L10kl=kE(Z(=>Py`o0H1L@-(th9OCkP}Mbk
z-*dEB0I=O|8J$BN%<l@oTX&E411}R1z^1IwT9c*;Mr(#~1QD#Y0I1W`rHBaCc1vIa
ziacW&N1CQZYmJDYjmEplN)pfT-qZI30;uBPNQ{{l(<EVivq1r~S%kHgw%w7$Gm4@B
zV10c}Xf1g@g{jWY?g@Z%4uCAnXxkR&+}?_aaND+6W6)YNI>)Z-h@%-Q%@0K@O&rev
z=(;JyG>P%vv%PIlN}-e@o<)@P7Jyk4PM>)lV%PU5U~%UV8(98(^$PDjX%Z8KA;U0W
zjM<}CRYkSEMV*|Si2!MmV2s)0kK@ST9J^gd63+;&B?tnVwgn)GW8yeQ-M@D(&O4f>
z#d$}XBy?Se)*5XLS(?%`4fXaGfG7$vTGQ@2oO7r+ol9U02SrZT_q6S9Ld{abFl1Af
zIOnIY1Oc0}LMcU&XHzz-tA)JyXCR+<WLd`3M{D)rmxa9ecVPKWj)^LM{b8p7mY0Y%
z@cWObPrgYczZ0VXR#yvo`e?oHclAiW3rI5f`Mb4x_Y0)HhMT|Oqm|~__g?X4efn)A
z4<6_8rhf5|y|%hq$ZPHJbL8S7q8>cXWpiCqt`B+n+YKLo7IAWX%9F4ERLe``?_c0z
r1@C=upP#<^LoF|n%}c1CgPOztugyi3-!?8C00000NkvXXu0mjf^m8-B

literal 0
HcmV?d00001

diff --git a/src/main/resources/assets/teatopia/textures/block/tea_leave_sheet_top.png b/src/main/resources/assets/teatopia/textures/block/tea_leave_sheet_top.png
new file mode 100644
index 0000000000000000000000000000000000000000..0e486b047881365cf7d0d78b430c1e1340259d70
GIT binary patch
literal 417
zcmV;S0bc%zP)<h;3K|Lk000e1NJLTq000mG000mO0ssI2kdbIM0004KNkl<ZC>2H0
z*-isN3`Eg>gUr6~3?WjG`2Qc|jEsV01-IKS-|8V1RaZA-UbIEo^~17lXIb@CJ<Q9o
zt{=Co&dYWjS0TCOO&W%Ep7-bTN9_BjrnZ}!ZZhxMr2OqxWko}`>*u8DIPR(rU-zec
zoHj?3@?|;1<MB;Sh4i(-=(?RTCI==5W|c%lj~RI~MBBA011535XEhkyezT%g7ng^u
zPT*V{2vvDJgNocjcwvUCrXAD2-R%S;ETqkwD{loXdU#+j(Gahaj^L(;C%h>lk9soa
z9e}x3atDTlBN)GUthL9t;wLFx58sX$K(pmI&AYMJ_W?;XC{ir4M<_W;0*r(u{Ft=F
zD|yM}4>6J={CGinJgD2R+h&16{%1O1$otqp9Z8xb|ANtd{VzEKh>ssUnvj?YbVZ4f
zU``~@^8t=mr6Bg2?s$MCJU?B)IFl_{uhwaER+U>wQXcNZk9k+Wj~_#chs{H*00000
LNkvXXu0mjf!*09Z

literal 0
HcmV?d00001


From dce493f4807c48da9bad781d4151b1522724e819 Mon Sep 17 00:00:00 2001
From: raumigit <86038378+raumigit@users.noreply.github.com>
Date: Sat, 19 Aug 2023 15:21:49 +0900
Subject: [PATCH 2/3] Delete tea_leave_nc.png

---
 .../teatopia/textures/block/tea_leave_nc.png      | Bin 791 -> 0 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 src/main/resources/assets/teatopia/textures/block/tea_leave_nc.png

diff --git a/src/main/resources/assets/teatopia/textures/block/tea_leave_nc.png b/src/main/resources/assets/teatopia/textures/block/tea_leave_nc.png
deleted file mode 100644
index bca7edb3850313af58b2f71466d1ab6951a5fc96..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 791
zcmV+y1L*vTP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00001b5ch_0Itp)
z=>Px%w@E}nR5*=QlD|vyd=$k$-$%(am?2~_AnM{Ead8R`ogzpV1))<w2&fUEgMJ6?
zP&$+fwL_@l<Rlb2`8T-fkjY7xst|wBr2(;^cDe81+v0Pld*O2Kx#t{JtJNe)5&&G+
z#V`!2)vDrG1wkOTZR0o&<#JiAt*wb=S-7r?0%$ZEl4TjDX;LniRTzfS@Av8V``ETk
zyWLh=Yl-7nl}aV4*Xt?_L$Pfe6-AMppP!E|Mo}c)ZkIGo84Lz^o`+!=40j5Jf*6KD
zyWLg*<BsEuX#QR-7K@T)8Mn8$c%DZP1mZXjaU3hHwFE&Rb8~b2saC5hpU=zP-5sWB
z0^s|;oSmI1+qTK&a-?aBVHhJ#9LJ&4>5ygF4<*m@L~AVoTU%S=x~>$9MFG%SOBjX{
zMUem;92^KhtyU8N<$0bgEiG|+daA-Ol)+%Y#KZ*8&(AC_E>f@8NBXR+tcX&I`T2QH
zPEJ%9hBBVZ<(Qe70pQ}|;vf4w&l7;%-Ceo4x#8jAfz{PjEXx8QO;cz#n*vZOm84WE
zjb2$_Ul)K%r6K@3J3DfCcql{g-)}Kg-S>T2SXhukp)dmReP4zk0J&UFHa0d!^LV4t
zkY2CH@$s?JT1%(X;qvlQZEkML<KrWq=lxLq-<_$cDc;}T(OQdP82m|+gzM{Tip8SD
zajd4NrvZ3-d*k!-lke|uOw&YbEmv1ps?};K$8mUidLl^@RIOH%mzNhT%Nj*_dwW}6
zUtgJ>o#pS}zciaoH4NL>*ch!=OKGitqCE7pTrQ9LkB<+&zP>O`lcS>}6^5Z?Sw@<s
z_`XjZ$N#v+(1qV(4ePhk!|+5=B>8+^q9_tosZ=D(GJ3rpolb}4<z*%(C)wZMS3wX+
zk|g-PkL$YZ?d_=`2&CKXa({o1Wm)_OmakkGR$q0G0000EWmrjOO-%qQ0000800000
V0002eQ<DGy002ovPDHLkV1iahYoGuC


From 956676a93dbd515d622747ed4dae473b164a9a5c Mon Sep 17 00:00:00 2001
From: raumigit <86038378+raumigit@users.noreply.github.com>
Date: Sat, 19 Aug 2023 15:22:04 +0900
Subject: [PATCH 3/3] Delete tea_leave_c.png

---
 .../teatopia/textures/block/tea_leave_c.png       | Bin 794 -> 0 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 src/main/resources/assets/teatopia/textures/block/tea_leave_c.png

diff --git a/src/main/resources/assets/teatopia/textures/block/tea_leave_c.png b/src/main/resources/assets/teatopia/textures/block/tea_leave_c.png
deleted file mode 100644
index 42cbe7a99e5a0ce30f72fdb35afd6ddfdbebb399..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 794
zcmV+#1LgdQP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00001b5ch_0Itp)
z=>Px%x=BPqR5*=Ylg~@jaTv#6pRe2Zn`_Jc(A=sOE^V?FI>;{tJAH$&Lq*_e5DY3K
z@=!aJ2k{^V<smBS(kTc!b*VqVLqrE5tc*f1i&;&SP3Ko==GxQYn>u?=&xhyX`MjU^
z`~4_uG$d0KMF83o2D+~Edc;=LMKpsn1z~qM#Q0EAwVXk`ew~g)5CzaXwns{(B3`eT
z@u8xMWszU2P+0|U5ayntQaMc~@79z#XvoCvH5JPuO+gLf{Yd?9@qVP`4C3lWv;-2%
zBK19yJ|vpidb?V}KBlpWW)Qay(~lig$pNHXg8Vx;XgX^&hczbe)>JB|37MK4X!oJL
z9<f!R7b$!KkJp*%vyhJuQB6VUOv6GR-1-*E)^M1G8CWja4kW`wQaMckx-NE!mOzpN
z4$M?e+qTBh8*TxxMneLi3==tYtcj@yWfjXJ>%XCKr;Ek8DjnSh6Svnk6=^<+C<T$u
z9elW7QL!xIN~AUR?+-FXnb{}&Ypw#Io4UXn$t%e88%6O896cSP(O&~9Eari;_u2%&
z95lonG^8iz5rBQ?9LVWmp8zB-8*=<+V3Ym-)gd{6_$@>`jO^=k3XyYe30MuXF$BP$
zMmo;d$=Ex#M^=ihyty-}QaMcuGc~?HN3~xtq%iB^hzURQw!?vi1onbmhMt^9l>P@5
z=|jr%5bK7I4^drLUGn}>RkfV*h`m%JeyqZuD!6sW0|1Bnk<ucpmO)vgAt`)c$LC+$
zv~u#&E-Cz2Cwjm~gR#Qfdlj{D6Yd6>eTwSIdBhiNbXd1WLoz;8+{`O>mERQ?9xuGQ
z<=lo{f~7nhv9^$G3v<xeMppf8Y~&l}iT5LcUPlF$9`?y{$);QkFh8?I>V!eKHNwm5
z-&8b%%uPVtg3d%6FRp!6(G0RY5B6tJe)tQSU?N*CoOtg5000hUSV?A0O#mtY000O8
Y00000007cclK=n!07*qoM6N<$f~sL)pa1{>