From d59c12882b7f9b5701af5254c1e9a660eb96d56c Mon Sep 17 00:00:00 2001 From: LimePot Date: Sun, 8 Jan 2023 00:28:11 -0700 Subject: [PATCH] Cyan Bush --- .../java/xyz/limepot/roses_mod/RosesMod.java | 10 +++++++++- .../xyz/limepot/roses_mod/RosesModClient.java | 3 +++ .../roses_mod/blockstates/cyan_rose_bush.json | 10 ++++++++++ .../resources/assets/roses_mod/lang/en_us.json | 3 ++- .../models/block/cyan_rose_bush_bottom.json | 6 ++++++ .../models/block/cyan_rose_bush_top.json | 6 ++++++ .../roses_mod/models/item/cyan_rose_bush.json | 6 ++++++ .../textures/block/cyan_rose_bush_bottom.png | Bin 0 -> 6255 bytes .../textures/block/cyan_rose_bush_top.png | Bin 0 -> 5841 bytes .../data/minecraft/tags/blocks/tall_flowers.json | 6 ++++++ .../data/minecraft/tags/items/tall_flowers.json | 6 ++++++ .../loot_tables/blocks/cyan_rose_bush.json | 14 ++++++++++++++ 12 files changed, 68 insertions(+), 2 deletions(-) create mode 100644 src/main/resources/assets/roses_mod/blockstates/cyan_rose_bush.json create mode 100644 src/main/resources/assets/roses_mod/models/block/cyan_rose_bush_bottom.json create mode 100644 src/main/resources/assets/roses_mod/models/block/cyan_rose_bush_top.json create mode 100644 src/main/resources/assets/roses_mod/models/item/cyan_rose_bush.json create mode 100644 src/main/resources/assets/roses_mod/textures/block/cyan_rose_bush_bottom.png create mode 100644 src/main/resources/assets/roses_mod/textures/block/cyan_rose_bush_top.png create mode 100644 src/main/resources/data/minecraft/tags/blocks/tall_flowers.json create mode 100644 src/main/resources/data/minecraft/tags/items/tall_flowers.json create mode 100644 src/main/resources/data/roses_mod/loot_tables/blocks/cyan_rose_bush.json diff --git a/src/main/java/xyz/limepot/roses_mod/RosesMod.java b/src/main/java/xyz/limepot/roses_mod/RosesMod.java index d413753..79a4598 100644 --- a/src/main/java/xyz/limepot/roses_mod/RosesMod.java +++ b/src/main/java/xyz/limepot/roses_mod/RosesMod.java @@ -34,6 +34,8 @@ public class RosesMod implements ModInitializer { //Cyan Rose public static final Block CYAN_ROSE = new FlowerBlock(StatusEffects.NAUSEA, 8, QuiltBlockSettings.copyOf(Blocks.POPPY).nonOpaque()); public static final Block POTTED_CYAN = new FlowerPotBlock(CYAN_ROSE, QuiltBlockSettings.copyOf(Blocks.POTTED_POPPY)); + //Cyan Rose Bush + public static final Block CYAN_ROSE_BUSH = new TallPlantBlock(QuiltBlockSettings.copyOf(Blocks.LARGE_FERN)); @Override @@ -52,7 +54,9 @@ public class RosesMod implements ModInitializer { Registry.register(Registries.ITEM, new Identifier(MOD_ID, "cyan_rose"), new BlockItem(CYAN_ROSE, new QuiltItemSettings())); //POTTED CYAN ROSE Registry.register(Registries.BLOCK, new Identifier(MOD_ID, "potted_cyan"), POTTED_CYAN); - + //CYAN ROSE BUSH + Registry.register(Registries.BLOCK, new Identifier(MOD_ID, "cyan_rose_bush"), CYAN_ROSE_BUSH); + Registry.register(Registries.ITEM, new Identifier(MOD_ID, "cyan_rose_bush"), new BlockItem(CYAN_ROSE_BUSH, new QuiltItemSettings())); //CREATIVE TABS ItemGroupEvents.modifyEntriesEvent(ItemGroups.NATURAL).register(content -> { @@ -61,6 +65,9 @@ public class RosesMod implements ModInitializer { ItemGroupEvents.modifyEntriesEvent(ItemGroups.NATURAL).register(content -> { content.addAfter(Items.BLUE_ORCHID, CYAN_ROSE); }); + ItemGroupEvents.modifyEntriesEvent(ItemGroups.NATURAL).register(content -> { + content.addAfter(Items.ROSE_BUSH, CYAN_ROSE_BUSH); + }); //LOOT TABLES @@ -73,6 +80,7 @@ public class RosesMod implements ModInitializer { }); + //INIT LOGGER.info("Hello Quilt world from {}!", mod.metadata().name()); } diff --git a/src/main/java/xyz/limepot/roses_mod/RosesModClient.java b/src/main/java/xyz/limepot/roses_mod/RosesModClient.java index e6f6ae8..626a1b7 100644 --- a/src/main/java/xyz/limepot/roses_mod/RosesModClient.java +++ b/src/main/java/xyz/limepot/roses_mod/RosesModClient.java @@ -15,5 +15,8 @@ public class RosesModClient implements ClientModInitializer { //CYAN ROSE BlockRenderLayerMap.INSTANCE.putBlocks(RenderLayer.getCutout(), RosesMod.POTTED_CYAN); BlockRenderLayerMap.INSTANCE.putBlocks(RenderLayer.getCutout(), RosesMod.CYAN_ROSE); + + //CYAN ROSE BUSH + BlockRenderLayerMap.INSTANCE.putBlocks(RenderLayer.getCutout(), RosesMod.CYAN_ROSE_BUSH); } } diff --git a/src/main/resources/assets/roses_mod/blockstates/cyan_rose_bush.json b/src/main/resources/assets/roses_mod/blockstates/cyan_rose_bush.json new file mode 100644 index 0000000..eaf06c4 --- /dev/null +++ b/src/main/resources/assets/roses_mod/blockstates/cyan_rose_bush.json @@ -0,0 +1,10 @@ +{ + "variants": { + "half=lower": { + "model": "roses_mod:block/cyan_rose_bush_bottom" + }, + "half=upper": { + "model": "roses_mod:block/cyan_rose_bush_top" + } + } +} diff --git a/src/main/resources/assets/roses_mod/lang/en_us.json b/src/main/resources/assets/roses_mod/lang/en_us.json index 08f6134..3c022ca 100644 --- a/src/main/resources/assets/roses_mod/lang/en_us.json +++ b/src/main/resources/assets/roses_mod/lang/en_us.json @@ -2,5 +2,6 @@ "block.roses_mod.rose_flower": "Rose", "block.roses_mod.potted_rose": "Potted Rose", "block.roses_mod.cyan_rose": "Cyan Rose", - "block.roses_mod.potted_cyan": "Potted Cyan Rose" + "block.roses_mod.potted_cyan": "Potted Cyan Rose", + "block.roses_mod.cyan_rose_bush": "Cyan Rose Bush" } diff --git a/src/main/resources/assets/roses_mod/models/block/cyan_rose_bush_bottom.json b/src/main/resources/assets/roses_mod/models/block/cyan_rose_bush_bottom.json new file mode 100644 index 0000000..95d7c86 --- /dev/null +++ b/src/main/resources/assets/roses_mod/models/block/cyan_rose_bush_bottom.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "roses_mod:block/cyan_rose_bush_bottom" + } +} diff --git a/src/main/resources/assets/roses_mod/models/block/cyan_rose_bush_top.json b/src/main/resources/assets/roses_mod/models/block/cyan_rose_bush_top.json new file mode 100644 index 0000000..24e8cb0 --- /dev/null +++ b/src/main/resources/assets/roses_mod/models/block/cyan_rose_bush_top.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "roses_mod:block/cyan_rose_bush_top" + } +} diff --git a/src/main/resources/assets/roses_mod/models/item/cyan_rose_bush.json b/src/main/resources/assets/roses_mod/models/item/cyan_rose_bush.json new file mode 100644 index 0000000..423fb79 --- /dev/null +++ b/src/main/resources/assets/roses_mod/models/item/cyan_rose_bush.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "roses_mod:block/cyan_rose_bush_top" + } +} diff --git a/src/main/resources/assets/roses_mod/textures/block/cyan_rose_bush_bottom.png b/src/main/resources/assets/roses_mod/textures/block/cyan_rose_bush_bottom.png new file mode 100644 index 0000000000000000000000000000000000000000..882a660bb3e08bb8ee18ab4fc359fd2dbe0123e3 GIT binary patch literal 6255 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/roses_mod/textures/block/cyan_rose_bush_top.png b/src/main/resources/assets/roses_mod/textures/block/cyan_rose_bush_top.png new file mode 100644 index 0000000000000000000000000000000000000000..cfe9caace8c1ee8d02304238510b49d79ae43146 GIT binary patch literal 5841 zcmeHKdpMNa8XvipNCQX673v=3-_ruCHIy&8T)gXFtz*dY*IsYv%c8zHhDH`&;k(Tkm?;w^Ci5 z?N`gG$-!W-)f5LCH|SqMbS;;Gezm3+0T@iWINHNU;08p(xjYVo84AJ$QCtuX3YiQT zO!%61&#==1Q+f9QRr42 z?sBAO#gu&eO`3`%*ot>a`<_cW+#EnDV)Av9imqk&$hVIkURf`+!TY{ zr3p-IJP7#tgt$v2CCg_uXamHJyB2F)qE@aiH66n zpa2)$`72DWVwQ}C@ADP)8yZ-Jd|$ItGjI2@{^doEu6BAW;-l&Z<1sC(q>HRMfla8f zXQBVZX6Cu1NUT-sD;W|@hBpQ(c}pY!(NW1MO&7ru{hv1GY;i7-PLOz!X0?sAd2jj! z!CtKH7TDQLsWgG^n2nVECfM(o{ARwyGUa8)DmQ=BU8eq|mS8~~ig7Wr9!Zj-m|hmVXXArkPS+qmq=}x8)jw>)xmlcDs3Y zg@z^+s~Y;@h?kCEWF(L6KaZEUFL*EGv1gle*n0 zud2T!aoeNW4w}o(`ZwlVsiKn)A=T=>MroFDCD=!Z|)Cx zjjnlRX?w?MJU+GGyWgU)o1t2&N8K!U#(j;|G|&*jxP9qC9P?46QX^~8CC#p~cj#{A z^!Upmor)o~;=Fi|rwhh2hPIrDBSVrymq$t%E6jL9)bm zI`m_|l+74szotki^NbHE<_203YN*TGZ_A)lu3XBsAk6u! zONkAEV}wmRbjODqm?&Yz-BIV@d9Su=>ZkX8cVk)u%0IA&3uk^%FkW;$8&X-l+RLOv zBBipnKS;hJ{R?BEiXQt@0imQe4{94C2R8}Z zAGhCpKh~ndG|MQC%Q$v9sj7>7*36SJ_+i$NZ`nFK>pg!rRbHMk*^w5DwtbYn-@o^d zZfCUOykFPk?0JU?v+PqU2hL1}wZEELFVD*JZSQ$e#Fmxo?8!RtA$IiL4a(Czw-H9U z)y0PHqjG=DqC%{$4%wSdKX|jO#CR@0nm9Ort9^D%_RiI@1)0)BpJHlyTLlazk;JsN zcBNQbf2!9|l|CMqNp`s5s+{EFzCGPT<4^eTp~AZ04cWs!=Un&66?z5VZyG(lr=$1> zN?4e3z)JZALodyM#^Y&RIZYAEhNw5-gS4I3c;JUbz|&nuhB2wc`7 zXlpG#Ohq+rk_jBLUM}GXN8vA7=uw!$?jCZu`=e&z(a6D*#DevXGH-2$rOv6Ze}B3 z;tvn}xw}(m7gxQeW@7j68@aWTt1Rz>))Bgv$U+~ff%fsd*Vj6b9gSmm%J~PoWZ~N{ zZ5xEi{(McCTG>M$(0rcX*GSHPHxE1ij@QV)c4i~Au?m^c2I}MFNTP9AD1gqPf+!)2 z3vIA4n7O5p3(!J90h|g3G1+9q%lbwHoJl7myopX2C$2RZ%yfw6f$q`H9<=BXnkgM& zX(4AWBtZl$PyoP%tWY+eBqSrmyd>ye)Qm>J#SlRV8R6sP3b*F)KsW(KKw*%!LS_UG zVIc=M=g}D?HygW;6wnhH5iAgJNoaIrWF#sQkK*ux&{$JbQ#1yL#^I0<0?ChJ3jiUK z&DRl8EOFR?d>W6*6)-t$xQG*=a>4~<1On=ZfAWvTb#nSl&*pzr0n!641h{A{3WH{` z&|g~c1-20o$w!C&)`IT=y@#OPKt3m&M+0pmK(;{VOA0#evpqMQ7b*^iPD6vCAPa)> zp;5744QWqta{X)}k|2o5;)<;xvA;qJn2f)~`pP#^k2st!9f8b0^L~Z?6uTGEDECEX-VlYNXERlvm5==~p5CwFH18D??kujDCP_bW7xbT=z zRsx}4dL^QwLsSd~6@t_0NP;nyiX@mC;gJB{1cwCh43L4RVd->JBQX`7MzZ7ZSO7Gg zOcoFXqPgrKafe87l9elkjKHCm92d8^h5`ZxWI#qZGTGt6zn~sW7U(VjL~3Gu%)M^$55ttDZ%05ML_~+OCj)q2#_xJ6XIIxq6Gu&AP}k^ zAJg?yJM(W+!NeFxFvgkUkRV8evI)xokW>>K6^S958WR{MAb>G8{hFQ6VF)4t9%vN= z=?G~BrKeacxW0Iz48BH327{tmfCNKgu#iZf1S5PD4E-@+w5Vo$ir5_eADWnp0bdju z$Zn|(Dqc`6M1L-ZA2kz|o&V$K<6Qh7M}Vlm5Asd=ewXXJT;HU?H-W!r*LS(TNr7(y zf6uP}nOt&z9j8Dx^cEBe9hUSHkJvy5Eg9-|dmGrI=v#30OcvC#g6rVRhrw1Vi7p9P z?r{~UQC2{4vXy-*v0R#D)RnX14s@K(q1ae?n6y?)o)YbA-A`( z2^osVwyZrSP|&`dpRdv1U*6%lHcftO?jvNPJ44o6@`rs}k4o)W=G0WELhb8Vb#at5 zzBqWM<%s;%7jGvTJ~Y%PE~>tx+DJd8!-z2NEwvS-@e%12m-`Cq8gws(__B`rRdD0^F7uA^ zn$wwZt8mbH!Dl?;5Zr3hgjod5u6Si(avOfP=l)BhzLaAxWP+ZOW#>9(&10%=-&`nx zLER_vXH}}zBasg-R6;&&yNgkq&a`Uxec$`O`RNTM)tDr1l-&VUVBP78CqKsa!U}wM zQ)a4WXP@TmY$FX$<;CQp_Ng@&y}P;=89g;rtD|9$$a0`kn)eJVkl&X{0Hrwey^9G~XI@?ri-IeffT0bts literal 0 HcmV?d00001 diff --git a/src/main/resources/data/minecraft/tags/blocks/tall_flowers.json b/src/main/resources/data/minecraft/tags/blocks/tall_flowers.json new file mode 100644 index 0000000..ad83bf8 --- /dev/null +++ b/src/main/resources/data/minecraft/tags/blocks/tall_flowers.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "roses_mod:cyan_rose_bush" + ] +} diff --git a/src/main/resources/data/minecraft/tags/items/tall_flowers.json b/src/main/resources/data/minecraft/tags/items/tall_flowers.json new file mode 100644 index 0000000..ad83bf8 --- /dev/null +++ b/src/main/resources/data/minecraft/tags/items/tall_flowers.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "roses_mod:cyan_rose_bush" + ] +} diff --git a/src/main/resources/data/roses_mod/loot_tables/blocks/cyan_rose_bush.json b/src/main/resources/data/roses_mod/loot_tables/blocks/cyan_rose_bush.json new file mode 100644 index 0000000..9e19db2 --- /dev/null +++ b/src/main/resources/data/roses_mod/loot_tables/blocks/cyan_rose_bush.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 2, + "entries": [ + { + "type": "minecraft:item", + "name": "roses_mod:cyan_rose" + } + ] + } + ] +}