From 4272f2219222b4418b474cfbda42c769c93c6ccd Mon Sep 17 00:00:00 2001 From: maple! Date: Sat, 22 Jun 2024 19:28:05 +0200 Subject: [PATCH] tweaks and textures --- .../resources/assets/rounded/lang/en_us.json | 2 + .../resources/assets/rounded/lang/pl_pl.json | 4 +- .../assets/rounded/models/block/trough.json | 2 +- .../rounded/textures/block/luster_cluster.png | Bin 0 -> 317 bytes .../textures/block/lustershroom_block.png | Bin 268 -> 232 bytes .../rounded/textures/block/trough_feed.png | Bin 0 -> 195 bytes .../rounded/textures/block/trough_inside.png | Bin 0 -> 166 bytes .../rounded/textures/block/trough_side.png | Bin 0 -> 366 bytes .../rounded/textures/block/trough_top.png | Bin 0 -> 285 bytes .../rounded/blocks/RegisterBlocks.java | 42 +++++++++++++----- .../rounded/compat/ExtravaganzaCompat.java | 2 +- .../recipes/decorations/luster_cluster.json | 2 +- .../data/rounded/recipe/luster_cluster.json | 6 +-- .../resources/data/rounded/recipe/trough.json | 4 ++ 14 files changed, 45 insertions(+), 19 deletions(-) create mode 100644 src/client/resources/assets/rounded/textures/block/luster_cluster.png create mode 100644 src/client/resources/assets/rounded/textures/block/trough_feed.png create mode 100644 src/client/resources/assets/rounded/textures/block/trough_inside.png create mode 100644 src/client/resources/assets/rounded/textures/block/trough_side.png create mode 100644 src/client/resources/assets/rounded/textures/block/trough_top.png diff --git a/src/client/resources/assets/rounded/lang/en_us.json b/src/client/resources/assets/rounded/lang/en_us.json index 5a45ba5..1400769 100644 --- a/src/client/resources/assets/rounded/lang/en_us.json +++ b/src/client/resources/assets/rounded/lang/en_us.json @@ -23,6 +23,8 @@ "tag.item.rounded.trough_feed": "Trough Feed", "tag.item.rounded.treated_planks": "Treated Planks", "tag.item.c.grain": "Grain", + "tag.item.c.mushrooms": "Mushrooms", + "tag.item.c.mushroom_caps": "Mushroom Caps", "block.rounded.compat.treated_hevea_brasiliensis_planks": "Treated Hevea Brasiliensis Planks" } diff --git a/src/client/resources/assets/rounded/lang/pl_pl.json b/src/client/resources/assets/rounded/lang/pl_pl.json index d10bd76..d35e7ae 100644 --- a/src/client/resources/assets/rounded/lang/pl_pl.json +++ b/src/client/resources/assets/rounded/lang/pl_pl.json @@ -22,5 +22,7 @@ "tag.worldgen.biome.rounded.has_more_lustershrooms": "Ma więcej lśniącogrzybów", "tag.item.rounded.trough_feed": "Pokarm w korycie", "tag.item.rounded.treated_planks": "Impregnowane deski", - "tag.item.c.grain": "Zboże" + "tag.item.c.grain": "Zboże", + "tag.item.c.mushrooms": "Grzyby", + "tag.item.c.mushroom_caps": "Kapelusze grzybów" } diff --git a/src/client/resources/assets/rounded/models/block/trough.json b/src/client/resources/assets/rounded/models/block/trough.json index 53f1046..4be09af 100644 --- a/src/client/resources/assets/rounded/models/block/trough.json +++ b/src/client/resources/assets/rounded/models/block/trough.json @@ -3,7 +3,7 @@ "textures": { "particle": "rounded:block/trough_side", "top": "rounded:block/trough_top", - "bottom": "minecraft:block/smooth_stone", + "bottom": "minecraft:block/stonecutter_bottom", "side": "rounded:block/trough_side", "inside": "rounded:block/trough_inside" }, diff --git a/src/client/resources/assets/rounded/textures/block/luster_cluster.png b/src/client/resources/assets/rounded/textures/block/luster_cluster.png new file mode 100644 index 0000000000000000000000000000000000000000..92990d1ce614377c9926aa6b725ac3b032a6d2cd GIT binary patch literal 317 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~vjCqES0F87 zR4C_ABWc)P9z#PNGZu9g>YLTl&7aV8bc~#`})u;!LyI#II zU+MD?s8gsU$S;`TKRSpz*k%Wmo$l%47$PxM)xS}UMUiFA*3Qru|LecGEx(s+l6GmD zUdy?aRc!Ma^dpfelVnt1%RD1X&R#;F|2X1hDAnnBhMPc-lK}*~B>6+*_g!KOXPw*?Qn~w2FyoiI)G8kMegfp1M0% z{6gmK$F(J|j$ZNnqRgl{IVCjyw2iXYxj3i!{~x((+-l;8-(>Bp#Juumdv2p@;K?1_ m1;x@%8)K(l)%g}a{TzF_HPem-y*Xb%Zu4~Yb6Mw<&;$UEhhKvL diff --git a/src/client/resources/assets/rounded/textures/block/trough_feed.png b/src/client/resources/assets/rounded/textures/block/trough_feed.png new file mode 100644 index 0000000000000000000000000000000000000000..a465dbcc81069dbf6e913f98651e40163757e26d GIT binary patch literal 195 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~{s5m4*Rz{A z_AV7z)5|fXR-n63fHB{5HBc(a)5S4FVrp)GAm0H44ky+<|7Wt_O1)|HcV$cawqL);3uJHP(;FjR-jYk~Mvu0aKN;qBH;&EAj+6ikBQ_XKWO4bKe%}h3OEmCgT reteyvLG{dPxg)EK?Ecw*U&p~@wTtu> zE}UR#b1+~$?IE!J!KV8gs{Pvym!zf$eeo-ls{7utv2fr2qNR+voJ{L4ec+o7G?2m5 L)z4*}Q$iB}|K~T{ literal 0 HcmV?d00001 diff --git a/src/client/resources/assets/rounded/textures/block/trough_side.png b/src/client/resources/assets/rounded/textures/block/trough_side.png new file mode 100644 index 0000000000000000000000000000000000000000..43407f682849e0466abdb5693d92a7eb5dfe345d GIT binary patch literal 366 zcmV-!0g?WRP)Px$C`m*?R49?%Qaww=KoEVAOxVjt8DgQwfxW1OwS|p^rT^f-#y@21|FE{W?(WJ9 z1hn*na4cLVSqKLfBWvyye}GfXyf^da&9c#SI>lzxbsh37%eJT(Kv|Yu*AWo_V@#mE z_W(pBNfH1=v{)>5lp`WzjCQY9tG;TIBt)cgA`;K%^P(t5qY(h-8~|pns!B@{(J^Z+ zGh1t;yPH#m4sxr>`%<=$J|16R9uFu5&~}Xz&(=8ct*Zx|u{8jc)tJnR*ok-WY|VgD zSO8#aT2~J_*QT~>066hlep%A(hk5$8Y=Wh}t3XAM_v6W|xVkuL+O>-9@9pBZXxjCw zTYhio%l{M(W6{&YZO{%zU!FhC&yGTq;zQ0Svtr|hKb|#!(LeZ0pGk M07*qoM6N<$fPx#*GWV{R49>^l0gc@APhzSNG*aE-1ls~pO-0Jwm0aei+~2C+04QjDYIyuw=yvy z-+W*5Jg1ZZIOhNWC}E){>s1F}-}jm_#?*7p82~f)eXq3!u&!&DQWBAAn(#yjftl4~ z-4$!Ca?YLS*-|Yc-g{O0S{k(0MD(8|04k+)-OLTfn2)4(h)Dfdb3=@gnbp { + content.addAfter(Registries.BLOCK.get(Identifier.of("minecraft", "red_mushroom")), LUSTERSHROON_PLANT_ITEM); + }); register_block("lustershroom_block", LUSTERSHROOM_BLOCK, LUSTERSHROON_BLOCK_ITEM); + ItemGroupEvents.modifyEntriesEvent(ItemGroups.NATURAL).register(content -> { + content.addAfter(Registries.BLOCK.get(Identifier.of("minecraft", "red_mushroom_block")), LUSTERSHROON_BLOCK_ITEM); + }); register_block("luster_cluster", LUSTER_CLUSTER, LUSTER_CLUSTER_ITEM); + ItemGroupEvents.modifyEntriesEvent(ItemGroups.FUNCTIONAL).register(content -> { + content.add(LUSTER_CLUSTER_ITEM); + }); register_block("trough", TROUGH, TROUGH_ITEM); + ItemGroupEvents.modifyEntriesEvent(ItemGroups.FUNCTIONAL).register(content -> { + content.addAfter(Registries.BLOCK.get(Identifier.of("minecraft", "composter")), TROUGH_ITEM); + }); BiomeModifications.addFeature( BiomeSelectors.tag(TagKey.of(RegistryKeys.BIOME, Identifier.of(MOD_ID, "has_lustershrooms"))), @@ -163,9 +178,12 @@ public static void initBlocks() { ); } - public static void register_treated_plank(String name, Block block, Item item) { + public static void register_treated_plank(String name, Block block, Item item, String source_mod, String plank_type) { register_block(name, block, item); LandPathNodeTypesRegistry.register(block, PathNodeType.DAMAGE_OTHER, PathNodeType.DAMAGE_OTHER); + ItemGroupEvents.modifyEntriesEvent(ItemGroups.BUILDING_BLOCKS).register(content -> { + content.addAfter(Registries.BLOCK.get(Identifier.of(source_mod, plank_type + "_planks")), item); + }); } private static void register_block(String name, Block block, Item item) { diff --git a/src/main/java/com/lumiscosity/rounded/compat/ExtravaganzaCompat.java b/src/main/java/com/lumiscosity/rounded/compat/ExtravaganzaCompat.java index d92072c..6d4e250 100644 --- a/src/main/java/com/lumiscosity/rounded/compat/ExtravaganzaCompat.java +++ b/src/main/java/com/lumiscosity/rounded/compat/ExtravaganzaCompat.java @@ -16,7 +16,7 @@ public class ExtravaganzaCompat { public static final Item TREATED_HEVEA_BRASILIENSIS_PLANKS_ITEM = new BlockItem(TREATED_HEVEA_BRASILIENSIS_PLANKS, new Item.Settings()); public static void register() { - register_treated_plank("compat/treated_hevea_brasiliensis_planks", TREATED_HEVEA_BRASILIENSIS_PLANKS, TREATED_HEVEA_BRASILIENSIS_PLANKS_ITEM); + register_treated_plank("compat/treated_hevea_brasiliensis_planks", TREATED_HEVEA_BRASILIENSIS_PLANKS, TREATED_HEVEA_BRASILIENSIS_PLANKS_ITEM, "extravaganza", "hevea_brasiliensis"); } } diff --git a/src/main/resources/data/rounded/advancement/recipes/decorations/luster_cluster.json b/src/main/resources/data/rounded/advancement/recipes/decorations/luster_cluster.json index 9884f94..fc2888a 100644 --- a/src/main/resources/data/rounded/advancement/recipes/decorations/luster_cluster.json +++ b/src/main/resources/data/rounded/advancement/recipes/decorations/luster_cluster.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "items": "minecraft:lapis_block" + "items": "minecraft:lapis_lazuli" } ] }, diff --git a/src/main/resources/data/rounded/recipe/luster_cluster.json b/src/main/resources/data/rounded/recipe/luster_cluster.json index d349365..b7eff64 100644 --- a/src/main/resources/data/rounded/recipe/luster_cluster.json +++ b/src/main/resources/data/rounded/recipe/luster_cluster.json @@ -6,13 +6,13 @@ "item": "rounded:lustershroom_block" }, "X": { - "item": "minecraft:lapis_block" + "item": "minecraft:lapis_lazuli" } }, "pattern": [ + "X#X", "###", - "#X#", - "###" + "X#X" ], "result": { "count": 1, diff --git a/src/main/resources/data/rounded/recipe/trough.json b/src/main/resources/data/rounded/recipe/trough.json index d2cc1e7..0b6fe7e 100644 --- a/src/main/resources/data/rounded/recipe/trough.json +++ b/src/main/resources/data/rounded/recipe/trough.json @@ -7,9 +7,13 @@ }, "O": { "item": "minecraft:smooth_stone" + }, + "X": { + "item": "minecraft:smooth_stone_slab" } }, "pattern": [ + "X X",, "# #", "OOO" ],