From 2d864e90724fae83136de2630cf3f109037cd37a Mon Sep 17 00:00:00 2001 From: MCTian-mi <35869948+MCTian-mi@users.noreply.github.com> Date: Sun, 15 Sep 2024 12:13:12 +0800 Subject: [PATCH] port cotton --- .../gregtechfoodoption/block/GTFOCrops.java | 1 + .../gregtechfoodoption/item/GTFOMetaItem.java | 6 +++ .../recipe/chain/SeedsChain.java | 3 ++ .../item/metaitems/component/cotton.json | 6 +++ .../models/item/metaitems/seed/cotton.json | 6 +++ .../items/metaitems/component/cotton.png | Bin 0 -> 429 bytes .../textures/items/metaitems/seed/cotton.png | Bin 0 -> 230 bytes .../blockstates/crop_cotton.json | 42 ++++++++++++++++++ .../assets/gregtechfoodoption/lang/en_us.lang | 3 ++ .../textures/crop/crop_cotton/stage0.png | Bin 0 -> 1452 bytes .../textures/crop/crop_cotton/stage1.png | Bin 0 -> 1839 bytes .../textures/crop/crop_cotton/stage2.png | Bin 0 -> 1818 bytes .../textures/crop/crop_cotton/stage3.png | Bin 0 -> 2066 bytes .../textures/crop/crop_cotton/stage4.png | Bin 0 -> 1919 bytes .../textures/crop/crop_cotton/stage5.png | Bin 0 -> 2347 bytes 15 files changed, 67 insertions(+) create mode 100644 src/main/resources/assets/gregtech/models/item/metaitems/component/cotton.json create mode 100644 src/main/resources/assets/gregtech/models/item/metaitems/seed/cotton.json create mode 100644 src/main/resources/assets/gregtech/textures/items/metaitems/component/cotton.png create mode 100644 src/main/resources/assets/gregtech/textures/items/metaitems/seed/cotton.png create mode 100644 src/main/resources/assets/gregtechfoodoption/blockstates/crop_cotton.json create mode 100644 src/main/resources/assets/gregtechfoodoption/textures/crop/crop_cotton/stage0.png create mode 100644 src/main/resources/assets/gregtechfoodoption/textures/crop/crop_cotton/stage1.png create mode 100644 src/main/resources/assets/gregtechfoodoption/textures/crop/crop_cotton/stage2.png create mode 100644 src/main/resources/assets/gregtechfoodoption/textures/crop/crop_cotton/stage3.png create mode 100644 src/main/resources/assets/gregtechfoodoption/textures/crop/crop_cotton/stage4.png create mode 100644 src/main/resources/assets/gregtechfoodoption/textures/crop/crop_cotton/stage5.png diff --git a/src/main/java/gregtechfoodoption/block/GTFOCrops.java b/src/main/java/gregtechfoodoption/block/GTFOCrops.java index edda7c97..15b1acd0 100644 --- a/src/main/java/gregtechfoodoption/block/GTFOCrops.java +++ b/src/main/java/gregtechfoodoption/block/GTFOCrops.java @@ -19,6 +19,7 @@ public class GTFOCrops { public static GTFOCrop CROP_BLACK_PEPPER = GTFOCrop.create("black_pepper"); public static GTFOCrop CROP_RICE = GTFOCrop.create("rice"); public static GTFOCrop CROP_WHITE_GRAPE = GTFOCrop.create("white_grape"); + public static GTFOCrop CROP_COTTON = GTFOCrop.create("cotton"); public static GTFOBerryBush BUSH_BLUEBERRY = GTFOBerryBush.create("blueberry"); public static GTFOBerryBush BUSH_BLACKBERRY = GTFOBerryBush.create("blackberry").setThorny(true); diff --git a/src/main/java/gregtechfoodoption/item/GTFOMetaItem.java b/src/main/java/gregtechfoodoption/item/GTFOMetaItem.java index 96de37f5..189863a5 100644 --- a/src/main/java/gregtechfoodoption/item/GTFOMetaItem.java +++ b/src/main/java/gregtechfoodoption/item/GTFOMetaItem.java @@ -371,6 +371,9 @@ public class GTFOMetaItem extends MetaItem imple public static MetaItem.MetaValueItem WHITE_GRAPES; public static MetaItem.MetaValueItem WHITE_GRAPE_SEED; + public static MetaItem.MetaValueItem COTTON; + public static MetaItem.MetaValueItem COTTON_SEED; + public static MetaItem.MetaValueItem UNFIRED_PLATE; public static MetaItem.MetaValueItem UNFIRED_BOWL; @@ -1178,6 +1181,9 @@ public void registerSubItems() { WHITE_GRAPES = addItem(320, "food.white_grapes").addComponents(new GTFOFoodStats(1, 1f).nutrients(0f, 1f, 0f, 0f, 0f)); WHITE_GRAPE_SEED = addItem(321, "seed.white_grape"); WHITE_GRAPE_SEED.addComponents(new GTFOCropSeedBehaviour(GTFOCrops.CROP_WHITE_GRAPE, WHITE_GRAPE_SEED.getStackForm(), WHITE_GRAPES.getStackForm())); + COTTON = addItem(9001, "component.cotton"); + COTTON_SEED = addItem(9000, "seed.cotton"); + COTTON_SEED.addComponents(new GTFOCropSeedBehaviour(GTFOCrops.CROP_COTTON, COTTON_SEED.getStackForm(), COTTON.getStackForm())); // 175-189 left blank for organic circuits diff --git a/src/main/java/gregtechfoodoption/recipe/chain/SeedsChain.java b/src/main/java/gregtechfoodoption/recipe/chain/SeedsChain.java index 2956eadc..6c9d9700 100644 --- a/src/main/java/gregtechfoodoption/recipe/chain/SeedsChain.java +++ b/src/main/java/gregtechfoodoption/recipe/chain/SeedsChain.java @@ -132,6 +132,9 @@ public static void init() { ModHandler.addShapedRecipe("gtfo_seed_white_grapes_ungenerify", WHITE_GRAPE_SEED.getStackForm(2), " S", " S ", " ", 'S', GTFOMetaItem.UNKNOWN_SEED); + ModHandler.addShapedRecipe("gtfo_seed_cotton_ungenerify", COTTON_SEED.getStackForm(2), + " ", " ", " SS", + 'S', GTFOMetaItem.UNKNOWN_SEED); ModHandler.addShapelessRecipe("gtfo_seed_soy_extraction", GTFOMetaItem.SOYBEAN_SEED.getStackForm(), diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/component/cotton.json b/src/main/resources/assets/gregtech/models/item/metaitems/component/cotton.json new file mode 100644 index 00000000..6f3f3eee --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/metaitems/component/cotton.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/metaitems/component/cotton" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/seed/cotton.json b/src/main/resources/assets/gregtech/models/item/metaitems/seed/cotton.json new file mode 100644 index 00000000..3a462c30 --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/metaitems/seed/cotton.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/metaitems/seed/cotton" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/component/cotton.png b/src/main/resources/assets/gregtech/textures/items/metaitems/component/cotton.png new file mode 100644 index 0000000000000000000000000000000000000000..7bc9a3670ebcc4966c6a51531a9970d9743502c0 GIT binary patch literal 429 zcmV;e0aE^nP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0YXVcK~y+T#gQ>i z!$1&4CpHDPVx0YBHfDNsudDU1ngw!pUF&fn(D&u`J7ib}^ko zXQQJ|=c~cxXhe5Wgahsx$(Y9=grMvBoDSM;H1Ir+_FFB~IF5rk>0dbRc5%QIMS+<2 zvMfog*JMb;)8UYI4TH|cW7IMF70&zp&9i)n$K{gtdOf=JeSQUe$<1s=VzEHogFN@s zRNvEqf{m&WaQ7E!{FJ72zgjs`dLKYt*z~a3-1@9~2EV12!H%2*4{;l{zu-HAKSJ~h Xs>PS3kUPde00000NkvXXu0mjfqBXSs literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/seed/cotton.png b/src/main/resources/assets/gregtech/textures/items/metaitems/seed/cotton.png new file mode 100644 index 0000000000000000000000000000000000000000..18777bf83e7658807d0e859007bd5806e29b6473 GIT binary patch literal 230 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 DVCLS! literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtechfoodoption/textures/crop/crop_cotton/stage4.png b/src/main/resources/assets/gregtechfoodoption/textures/crop/crop_cotton/stage4.png new file mode 100644 index 0000000000000000000000000000000000000000..73c68ccc99010a925893f90f057823fa49db4469 GIT binary patch literal 1919 zcmbVN3s4kg9AD%SX^fyoa?_0K`WRF9cJF<+a3FFQhj4hok%*WsyWhde-R*h1cy~CZ zsgaVB`AoB%MnD2_D1%ZFBhoAjGkoD_Cd`BmlceQqY{tIjaie89c{97;x4XaZ_xrzZ zjV&`ZYPf7Tf*?_87E=~nqope{0^Y~{exHWR(;mxQ0YOHLmaY(F`;M^)5_XNV=Zd-3 z42t1ha+>7}fZXr$Ks16RB>6owQw&7302Fd=Bi48DFotrh5u2m2l2%U&DB>)oUXWdy zX=h4{83T(YC87y_3KF=0NTYt2(=AYbBi7GL!M*gFz|ek(SZu_SB|$XTYC}_aFF*}) z1xw3gPY4BF|al2ob*Qbj0~IH{x5dP=E62Y(op^Rf;q%k<))7<@8fMWX1T z2*T&{$$ct0?=2)027`ehm4s4>Lj*1a+#>DA-NJ++1``k%FXs_C-i=C(bOB!?8Zl_< zfDbNDkk%~>#tBA@@Y5bbAtxoD`hhGH#Cb}*&VF&0A%GLOfLjzGRuRN{ig=M1iuiw_ z4t{<}0LIp84Qf2n7MCk1A&BNB(2c=>JQ6L~10FzR0f8^^GQhk9nmIx8#zUoe0WI=g zJI_0ZGG!Yw8C7cJ26W0C&du^Z;e`hd023_&BPL}HCk?nlZC8>M3A3i12Ja*}0JZWg z=Lq~0s-Q?UrO`bEg*C&{BK=q}%TNy9>!P8SLSbl~s^1E$ zl}d99BJE~Cn#qVkpXD6KQjA8gF93Rg1C>sLtMzIFPCFPDSCT-j((6eDT!zk@c&0?k z?9h4kf1aQ1k&L`%P8cr$+%EAdSS%JZh$OelCcTNuNuL6o@r0OJ08HQ=qL221hWj#r^+fRQiQ`v0uDjSQko35Bg zuGfagB)js%ZY|g1Sl&(atH|@mriUrotYH!6n6go;$B%Y29gAdRx1(939EtDk7y9mh z`mTdr#1#s$<1W1|wEIjsb7yZW*?&L&=L_{Rqj(@cBvQ2b!AKIuHHj6yglW8<#eojiY6amTZ^Z5a{BvQBeOATSe@CLFI?I#086Q{$EjI&~$|eyax!U)~c~ zMO(NdQ(O9&dT^z4M@B`J;Zk0G_qZ+5F=hAaELE4UF5ZmI_`0D+QTC>;8uYZRd)~Ou z9I~C4e^{%pXsa+PsuOposekz{d`3_FNxQ7#W}N2e!jzS@KYlPKYFKV(Qu@VfQ@VG( z)%@!9Y~)69-16g3*}n}_j_gu@c52ZQ#g_Qm(2vyq(2|UbyKDcDr=P8Q zUxCElYHx6DZRu612tv&hCN->4;@Y0t`bRSCP%hK$6QXEx5F;G&^l{!V)Zx0 zuiTwlTi$oC`C47;#mb30PdvAK{rqwoheFM{m8cnu`I4L{!^g|kb?x2MK;Aw(EftGt x_D9^AV39ZdIU@D_DJ^}Ww%FO-=NgbZQLD6}<+UAaH%NbxY35AR-kA$m`~~IbtcCyp literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtechfoodoption/textures/crop/crop_cotton/stage5.png b/src/main/resources/assets/gregtechfoodoption/textures/crop/crop_cotton/stage5.png new file mode 100644 index 0000000000000000000000000000000000000000..521e6675c3491f9ddce2369a4fd3109a7b7a6e0a GIT binary patch literal 2347 zcmb_e4NMbf7(QS)6xoI_5rJ@4!q9QOpI%Gvv`nBVMOuDDLF07C-O+Z?-r2iCVaB1( zA6$%zxJ)COh0G|Mf}1W7;+QgFO29<6kj05Im!bGGjmvOjoBIw*qnm#*YjXe3_q^}> zywCT2tkOQK0VO=w{6PX)rcxMDibINuu# zJQ-9rSr%y&EiW%umuu95%ZlO@MWGmh5(EMeh*aT}84u!=W{xu$d5Lw|McFPmVTF+? z65O&u1yUWW!6Eu+osw54pcv|5L=;zJN=>6cj`iV0x2tqCILD%VDevH&vIMZW4=dUP zS&(ePW2k+f9|{1pHJg1g9+`{7;R_+j>1Ch{uON>^OZgQdkLK}`;C8WmdKpM_rc#Ya zr@44W7F_v)P&(eJobi-lLaV0WgaW&h6UwDo4-DXqjLaKUO4ksKLU1ylz-SC~P4_xD zW7rtfEO7SXivL1!8Ye)HAA$nUaE#1670j`8vEXtrpkTX$vGS^NoIcU^NAe z9DN0rXyw+oIe-V>_QE@XPA;%{SSO5}f*^mB$(WL_-|F6J&JN2B-*{>Fp}HP%Bs3`a zJX-TvLUr&~{o=5tO`8HcHgvpjQ2nQ$I_syTW_RO2Y%`l47LjO+h~H9|LClJqH)m~L z!m-^gjltKlf-7r2r-pxcZ7`XNh{L~$&}dfIW{AzYy=ZV?a@~hPJs;QR;Nd&g#O7r} zRgMeM$?w#ilZG!tyOu1B{5Cv2GH`WSG_TwJ^}xW4koI|pmjuJal(o#X=E$LL|N7j- zi1(WuQLzyb>;H(EvTqP*WnIM;EBgX+r2}V-I%A9=5H%-&wDxs#hMK`sIxq5G23Z*}5T++|%9mQh!$V-4*27$`h8(Rn5nb zpWY?Yp6hp0*GdOW3xjmiLzbmBg>PGw8JU?l=$g54FiSEH1+>Ga!qld{U3W~gPw!ZK zYlt4Ysq61KcjeYSeZF>i=%wM%*57LO?>Tj@Eb5ZQQoEut!vDR&l+5azmIW=F=Z97s z{i}{#zdAeuRn-oD)OXzvDmq#ir0+X+d0oZD+l^Nn>bs&Wmq+fOknzcFe;;0dFW_D4 Ws*bS9SNxQ}Gp2Nl@kr`h>;3_x6)95y literal 0 HcmV?d00001