From e15c3ec175ede9a96e25e9537c43daec994a182a Mon Sep 17 00:00:00 2001 From: Hugman Date: Mon, 15 Apr 2024 19:35:29 +0200 Subject: [PATCH 1/3] Add two paintings --- .../java/fr/hugman/promenade/Promenade.java | 3 +++ .../painting/PromenadePaintingVariantKeys.java | 16 ++++++++++++++++ .../painting/PromenadePaintingVariants.java | 12 ++++++++++++ .../promenade/textures/painting/nurture.png | Bin 0 -> 1521 bytes .../promenade/textures/painting/radical.png | Bin 0 -> 1421 bytes .../tags/painting_variant/placeable.json | 7 +++++++ 6 files changed, 38 insertions(+) create mode 100644 src/main/java/fr/hugman/promenade/entity/decoration/painting/PromenadePaintingVariantKeys.java create mode 100644 src/main/java/fr/hugman/promenade/entity/decoration/painting/PromenadePaintingVariants.java create mode 100644 src/main/resources/assets/promenade/textures/painting/nurture.png create mode 100644 src/main/resources/assets/promenade/textures/painting/radical.png create mode 100644 src/main/resources/data/minecraft/tags/painting_variant/placeable.json diff --git a/src/main/java/fr/hugman/promenade/Promenade.java b/src/main/java/fr/hugman/promenade/Promenade.java index c1f16403..ce0f8e48 100644 --- a/src/main/java/fr/hugman/promenade/Promenade.java +++ b/src/main/java/fr/hugman/promenade/Promenade.java @@ -7,6 +7,7 @@ import fr.hugman.promenade.entity.PromenadeEntityTypes; import fr.hugman.promenade.entity.ai.brain.sensor.PromenadeSensorTypes; import fr.hugman.promenade.entity.data.PromenadeTrackedData; +import fr.hugman.promenade.entity.decoration.painting.PromenadePaintingVariants; import fr.hugman.promenade.item.PromenadeItems; import fr.hugman.promenade.registry.PromenadeRegistries; import fr.hugman.promenade.sound.PromenadeSoundEvents; @@ -50,6 +51,8 @@ public void onInitialize() { PromenadeBiomes.appendWorldGen(); PromenadePlacedFeatures.appendWorldGen(); PromenadeEntityTypes.appendWorldGen(); + + PromenadePaintingVariants.register(); } public static Identifier id(String path) { diff --git a/src/main/java/fr/hugman/promenade/entity/decoration/painting/PromenadePaintingVariantKeys.java b/src/main/java/fr/hugman/promenade/entity/decoration/painting/PromenadePaintingVariantKeys.java new file mode 100644 index 00000000..3eb87385 --- /dev/null +++ b/src/main/java/fr/hugman/promenade/entity/decoration/painting/PromenadePaintingVariantKeys.java @@ -0,0 +1,16 @@ +package fr.hugman.promenade.entity.decoration.painting; + +import fr.hugman.promenade.Promenade; +import net.minecraft.entity.decoration.painting.PaintingVariant; +import net.minecraft.registry.RegistryKey; +import net.minecraft.registry.RegistryKeys; + +public class PromenadePaintingVariantKeys { + public static final RegistryKey RADICAL = of("radical"); + public static final RegistryKey NURTURE = of("nurture"); + + + private static RegistryKey of(String path) { + return RegistryKey.of(RegistryKeys.PAINTING_VARIANT, Promenade.id(path)); + } +} diff --git a/src/main/java/fr/hugman/promenade/entity/decoration/painting/PromenadePaintingVariants.java b/src/main/java/fr/hugman/promenade/entity/decoration/painting/PromenadePaintingVariants.java new file mode 100644 index 00000000..ee621cb6 --- /dev/null +++ b/src/main/java/fr/hugman/promenade/entity/decoration/painting/PromenadePaintingVariants.java @@ -0,0 +1,12 @@ +package fr.hugman.promenade.entity.decoration.painting; + +import net.minecraft.entity.decoration.painting.PaintingVariant; +import net.minecraft.registry.Registries; +import net.minecraft.registry.Registry; + +public class PromenadePaintingVariants { + public static void register() { + Registry.register(Registries.PAINTING_VARIANT, PromenadePaintingVariantKeys.RADICAL, new PaintingVariant(32, 32)); + Registry.register(Registries.PAINTING_VARIANT, PromenadePaintingVariantKeys.NURTURE, new PaintingVariant(32, 48)); + } +} diff --git a/src/main/resources/assets/promenade/textures/painting/nurture.png b/src/main/resources/assets/promenade/textures/painting/nurture.png new file mode 100644 index 0000000000000000000000000000000000000000..bf9a6da10e7cdddb4a50c7551fedd87bb51069b6 GIT binary patch literal 1521 zcmVPx$EKp2TMH?3rAsiPX9T+De8#^KsD>oV}IU6lI94|c_Fg_hLEG0WKDMu<8PcIx% zG9E%WFIF}pXFVfjJS1p6BQilA7kUIVLm)LpAvsASI!z-wOC&l>Bt1_hK2at@S1ChS zDMeZm%@wmDB^i%3= z+yDRsb4f%&R5*<#Rqa;WMiAYW)PQM2X@vqQ+CA1ZX4X5_O6!$G5+87E;*d1Z4}u{Z zCB*joze7hb`k~{qS9f-1?j4Kk%MWK~=dqms z9#*yW2;f}s0nj{;k}p<4TrS8zyG%KBtbU@ z_{Eq&lq3BmW*|qI!}a}oy|zZ1prl+%mjyCJ%ASdnL)l2QtM%tbqhh*%OISM2lTt>+ zfRU_oQb1o2D{>`~w9B$S0wR;;>ZO z19{YzFy}->+ANJTjsXC&ms<}sAfpOp3+*)(mX={zD0%?UA)?7q6+RC}X>Sem3WG~D z1{grr9D*lRQ7FH*qTRm|)}kfH5dwIyJufER z?oLTaU>N{aI~47tBq&`Oyw880^q+LQ+zXpui7{4+QYaj^-+?kdxA4of|D?Y#DpmHK zxK1nLWGMpx423|WdODr-8IU_)F#s_wN(!2E)<~*Mf4bmj`eJtnODf)pPeFtC==caz z+L_!=7q_=}i-p_WX%)r{6?$w2USeGgyWPq3wvD?*2&E?jH!ND+GdwrbP;}7k?(Oxb z4-j^mbv6Slf;Ptnb2=+nXKP>8NLMC;Ii_nu|K; z*|ZE;qRO+)IEs@v+Df*Pr;FP=uCvbsaC9loSc--+we@T}?j+j>o6*xro1@=nVVb~z zM_a~8C*G3LcGTHg^e5Bl@!lRDk;!K~tOr}haeUO_TPDeb^Y`Bzzd446GFH_1(Uw&l zb&{>0I`PhgkEd_;oEx(B%CnZCwPhF>zUA{c?sk8F@n=SE5UA_{d-M9ymW>A4kWZnz zvGH3rG{hd4A!r6X+Oi5Y?;jeYJ87$RYLYBG9T`85Jup*KPCGTt3QE@sW21r#9XPl{15K znWj7~{Oa5N{TkkikBS=Us~!!joSR!pnS+CZ3AlW$=M2a()5=>Kf*KG6wk}IM)y?Pi z%EDY+m=rO9W1IB~+feCvh&~v^F9fQbi*tpx2Eqaw-dUcQ-&-fKVboCXW@7 zI*aV2$7P&5y2_^1b*XzqN3D9~;i_}4E<^Q@-J2mSz=jUjED>R`|i`0eO@Y&2`oqVwYI4BPWH}jIHxr}&Zq#_ zwO;<4zykpc1+ZkmAmELF9|Z_xz*B)p1ws%IgCKwgm|(zK2mx#;c!z*59S95{1_M46 z{MkUFLLdXkbf7SS$^cRb1cd;d6~OWoqpWw@uaLTKPIXw3@3yAI9VN!O%00I1Bw_Z@ z@CetNE%oEY2Lg@*emo#>fWUf1>3V|Dm zm569!F+Ns;OH80|m11`#c_%9{>HA5F{WwJ)RbJ?qUxXBw2x6r13ENW@N!t@rccjZB zG7lyx4)96}#&VXZc*MZ?$XWZFL7mG5Gkd*kW` z+)lwW8u^PLs{0HMgXgta6U&yKUrF*N_OBl8Ix@kW4qfl zI}79YHH|40^%G-?{D!0QyKg1(gAP?>D}nx0*K7MMKJG*IN4fLq-`-CLXQ#`b&GckX z{;>dsi=*kp@hlJh)5QLLqvK^uOJ$vl*E5p_vUujB<=Eo^No7Ol8U9Q6YTk4u`VO2r zoc1apbHp^AU&3gtS5D+T888@>D%oE1I<_VPTc_e**bs4GbqbDz!J)k!XN&tc*lqlQ zNFuu2K!xA|V2`LfAvWqrYWr%cD{&hc2y zWhuk+!tQYk%W1;=e zj7RU9VtfT_@UgCigO0oh6K#JDpS<9*{L&?=DJP21ZS%Gv?PqTP>j0jc_ene9rJk%@*_iVppF9=m{j!40 zbrGP~SKltX;rabC)Y0K#X`qXpS Date: Tue, 16 Apr 2024 00:02:24 +0200 Subject: [PATCH 2/3] Add translations for paintings --- src/main/resources/assets/promenade/lang/en_us.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/resources/assets/promenade/lang/en_us.json b/src/main/resources/assets/promenade/lang/en_us.json index a19d4271..b7b7dc0f 100644 --- a/src/main/resources/assets/promenade/lang/en_us.json +++ b/src/main/resources/assets/promenade/lang/en_us.json @@ -203,5 +203,9 @@ "text.autoconfig.promenade.option.animals.capybaras_weight": "Spawning weight of Capybaras", "text.autoconfig.promenade.option.animals.ducks_weight": "Spawning weight of Ducks", "text.autoconfig.promenade.option.monsters.lush_creepers_weight": "Spawning weight of Lush Creepers", - "text.autoconfig.promenade.option.monsters.sunkens_weight": "Spawning weight of Sunkens" + "text.autoconfig.promenade.option.monsters.sunkens_weight": "Spawning weight of Sunkens", + "painting.promenade.radical.title": "Radical", + "painting.promenade.radical.author": "Hugman", + "painting.promenade.nurture.title": "Nurture", + "painting.promenade.nurture.author": "Hugman" } \ No newline at end of file From cf313d3726e6013501b08e315804cbd4595cdded Mon Sep 17 00:00:00 2001 From: Hugman Date: Mon, 6 May 2024 20:35:45 +0200 Subject: [PATCH 3/3] Update paintings --- .../PromenadePaintingVariantKeys.java | 2 +- .../painting/PromenadePaintingVariants.java | 4 ++-- .../assets/promenade/lang/en_us.json | 4 ++-- .../promenade/textures/painting/nurture.png | Bin 1521 -> 2108 bytes .../painting/{radical.png => optimism.png} | Bin .../tags/painting_variant/placeable.json | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) rename src/main/resources/assets/promenade/textures/painting/{radical.png => optimism.png} (100%) diff --git a/src/main/java/fr/hugman/promenade/entity/decoration/painting/PromenadePaintingVariantKeys.java b/src/main/java/fr/hugman/promenade/entity/decoration/painting/PromenadePaintingVariantKeys.java index 3eb87385..fa6b205a 100644 --- a/src/main/java/fr/hugman/promenade/entity/decoration/painting/PromenadePaintingVariantKeys.java +++ b/src/main/java/fr/hugman/promenade/entity/decoration/painting/PromenadePaintingVariantKeys.java @@ -6,7 +6,7 @@ import net.minecraft.registry.RegistryKeys; public class PromenadePaintingVariantKeys { - public static final RegistryKey RADICAL = of("radical"); + public static final RegistryKey OPTIMISM = of("optimism"); public static final RegistryKey NURTURE = of("nurture"); diff --git a/src/main/java/fr/hugman/promenade/entity/decoration/painting/PromenadePaintingVariants.java b/src/main/java/fr/hugman/promenade/entity/decoration/painting/PromenadePaintingVariants.java index ee621cb6..0efcc035 100644 --- a/src/main/java/fr/hugman/promenade/entity/decoration/painting/PromenadePaintingVariants.java +++ b/src/main/java/fr/hugman/promenade/entity/decoration/painting/PromenadePaintingVariants.java @@ -6,7 +6,7 @@ public class PromenadePaintingVariants { public static void register() { - Registry.register(Registries.PAINTING_VARIANT, PromenadePaintingVariantKeys.RADICAL, new PaintingVariant(32, 32)); - Registry.register(Registries.PAINTING_VARIANT, PromenadePaintingVariantKeys.NURTURE, new PaintingVariant(32, 48)); + Registry.register(Registries.PAINTING_VARIANT, PromenadePaintingVariantKeys.OPTIMISM, new PaintingVariant(32, 32)); + Registry.register(Registries.PAINTING_VARIANT, PromenadePaintingVariantKeys.NURTURE, new PaintingVariant(32, 32)); } } diff --git a/src/main/resources/assets/promenade/lang/en_us.json b/src/main/resources/assets/promenade/lang/en_us.json index b7b7dc0f..7d24fb07 100644 --- a/src/main/resources/assets/promenade/lang/en_us.json +++ b/src/main/resources/assets/promenade/lang/en_us.json @@ -204,8 +204,8 @@ "text.autoconfig.promenade.option.animals.ducks_weight": "Spawning weight of Ducks", "text.autoconfig.promenade.option.monsters.lush_creepers_weight": "Spawning weight of Lush Creepers", "text.autoconfig.promenade.option.monsters.sunkens_weight": "Spawning weight of Sunkens", - "painting.promenade.radical.title": "Radical", - "painting.promenade.radical.author": "Hugman", + "painting.promenade.optimism.title": "Optimism", + "painting.promenade.optimism.author": "Hugman", "painting.promenade.nurture.title": "Nurture", "painting.promenade.nurture.author": "Hugman" } \ No newline at end of file diff --git a/src/main/resources/assets/promenade/textures/painting/nurture.png b/src/main/resources/assets/promenade/textures/painting/nurture.png index bf9a6da10e7cdddb4a50c7551fedd87bb51069b6..1e108d30e52d57a03b071e020d781508bd6c4a49 100644 GIT binary patch literal 2108 zcmd^A`#Tc~172U{k=zR6x(j##sPhB|yj%)0acyw`;MUE<}&Dr1g%G8ywN0n=qjP z5lAq_%PGpoS@69xH_(w6=qT`a;RQSKLY(;!X93KG?B~w$S;zez$n^*E{M~qg?wk-; zZU`_sXdM><WMB#6h|W;I16hIxZT>#R7R)H$DLrg@(7 zgSRk))l9I830AX%Rh$qN7ph``b2yM}4m6hwQS(A`dC)vQT)_y-U=mfVO?m-X!vkyi zp&C9!%ZKI*VA^PKfdH-%gzAMby%1U$11l0i3?gW8EVM)fGm0T)@o=3GQ4j+!j0w|= z;DsV&VJu27MCoHOg<^PdY*=wD!XQQ(#BifHY-?PYVKc%Qk2J=k4Pvx09#Im9*cOK@ zi$j#ghn2=7%QmA*HsiK!MwUvD+a%~x38qAX+9tu2NhsMYS}r#!i%Hk;82Nmbme1A- zxCO!jB|Sqg+$F(Vl1ckgDOG9IhAhTWjR0nnAa^7nO;XhM1oRFmW``7Il44AW*quqJ z-AUNpGE}(?Q=W`7$p|JHZkG(dI~iwAMpq{CSSOT$;C6ROf9_GjR$6@+R9 zt~w*UCO!N>MtF5*WOYVFjgnNYjHu0wJdjDOQVxuauK}EExNmg~_;cQ}4USvxity)E{&mtdGlMksV_1TQNY;vQT+Mp&k=1?26 zsfTkY*4!v-9{ETPxjCEMluK#Oqc-Q!t(vH2Eu%$8J(^2t&5vr+(OR|iW4fsJeA;mx z^JoF(-+J0{J+G~h)vjlD=%`(KYDXcxQ_two(>sgk-9?O3MXatO#>rx4kAd4^;G8IC z_ZT=mC7j;UHy<+hT>ts;%b~%=_ah7MKYW^Dr$?79_X1EL62t<&{(r;a(EEtxU6^9i zC}P|`uR68nuGquuVnM`f690&|_^A^w-3*YPdimva&!Z=fAT-&7-$z>sek3jU+|tmk zlpfyDIo=f)R1SiTRox)Je5`7c+TUNRqOHC#)nyXDh02sy+kfpFK>jsh7+hEyEE?J9 zx+XL@nFTxQtJ9-DdfzD11UDE@0> zy<|UgY2od(`nLSjNJEO<<)YO)hGu@ayED)3+0&;hr<4gL{)=)$Nu2OE!f%yxdoj6&#RH)hVH zmD;Z9$R56etR+)zOPbJntaCOz=sG;eA}wqC^N~-IW7n-j>u;|eOg``+E$&}kaYifYk;vDf*-*P;}ZCLdgrpFvYH2Vf}t}2$mM|FGhFP>^>_|ldw8pt z!I)_4E+zf+=wtZsFx6*QtDm&Y^-T-r{^YOW3JANJ{$e$+0~any1zT;)if}2 zpF6Q$b_dljVmLxq)bu?5voI#JziLvde>AEezdZKi9ri=u&*26e`AFf}vjGjx?0X}? zt-}aOd|UU)JAsP?*VzxX7mJO4XA)PyU%%Y zQ~mmGG(EVC22&+7caJQF-YGRQ?<|M8Ri-g3plV5 zGXJ>~bSr3e>x)4f@>JT*d1G?Y%l_z9l*i{m@?Q+PD^D~T8FBa+ud#7U-}&?>z;`gn a1=}{FeCq5H%_DI6`2lRYfYw8moBjuMG7(Au delta 1516 zcmVPx$EKp2TMH?3rAsiPX z9T+De8#^KsD>oV}IU6lI94|c_Fg_hLEG0WKDMu<8PcIx%G9E%WFIF}pXFVfjJS1p6 zBQilA7kUIVLm)LpAvsASI!z-wOC&l>Bt1_hK2at@S1ChSDSt&;D@R-_M_nvQUM*`u zD04(9en}{KN-auZElguCO=K@lW-w7|GE;0bRBba=ZZubMHCb~uT6H&DcQ{^pIbVD_ zV0}Abemsdc8IeF8r&k-OR~x8U8>w9$s$n0LM<9z*FMv@pnp`)eM|BcyUArgbN$cPOWMDWqgQt!_lN zdQefAEoOy3RH-a$j6$k_FY>o0`qMa>y1Ksj^wZ_#^z`&o>TKKq00eVML_t(IjU`p> zR@+7p-ImmVX+vp+0x8-()--0;JJw3;l|&LBaBSj`G=I+fRU_oQb1o2D{>`~ zw9B$S0wR;;>ZO19{YzFy}->+ANJT zjsXC&ms<}sAfpOp3+*)(mX={zD0%?UA)?7q6@NYtMrm&i^a_JZGzJ(z)*ON-RZ%Z1 zk&0o12+OprQ3h$w#D%ubj7WQGXh^atGNT4d#h+78kB|X`qih&t$TFS-*C^45on@8j z_Qv@K@i%cQ^5lF74lLG4N_2O2cSA*KNmt@R)z+dV#}NW}usts(-R@3FNMIQNRXY^z zq<o6*xro1@=nVVb~zM_a~8C*G3L zcGTHg^e5Bl@!lRDk;!K~tOr}haeUO_TPDeb^Y`Bzzd446GFH_1(Uw&lb&{>0I`Phg zkEd_;oEx(B%CnZCwPhF>zUA{c?tgZFfAMEVZV;&K0ekcM(Uy${*^p16yRq?GHZ;T@ zmmz2dJle7#;|FLg{m}gpO_LbzqjwZe#r2~tM+Qd?I>>WX8%3c(I%+u>&|?Jh$Gls3 ze9riGw-D8<@O`y%49Fq%>>|*rT^SWCFV}7J)?7ZyQ}K~^2B$XO2bD8}a(|hoJT3g{ z+x`6--inWk8tJPZ4Xd1+TS}ROgMtaTe5~gT$T8E(TN;8I5Cpa^OFPxg=k?0MTwItG zF@R&6^$Oci>3E1f7{o6Gs+@~+g|-I50vg^~o|xZTC$Z$>sVG`N%|)>>NM&BB((we? zmF&~~nmsueb3RlaDODx9f@QJJv&=DZ(#X6=|A?=F29}qTced0%)giT{RWL(x=o@n> zz7i@!xznN2Mk#<^IrIZfVURN~U5cxdlk?g6`T6{m