From 7a250c257fb34ff49b6b7761aa141bfcb34a0488 Mon Sep 17 00:00:00 2001 From: Motschen Date: Fri, 9 Oct 2020 20:40:04 +0200 Subject: [PATCH] Decorative 3.0.0 - QoL Update --- .gitignore | 1 - build.gradle | 3 + build/loom-cache/midnight-hats-1.0.2.jar | Bin 0 -> 40008 bytes gradle.properties | 3 +- .../motschen/decorative/DecorativeClient.java | 13 + .../motschen/decorative/DecorativeMain.java | 86 +++--- .../decorative/block/AcaciaChoppingLog.java | 42 +++ .../decorative/block/BirchChoppingLog.java | 42 +++ .../motschen/decorative/block/BirdBath.java | 6 - .../motschen/decorative/block/CeilingFan.java | 29 +- .../decorative/block/ChristmasLights.java | 2 +- .../decorative/block/DarkOakChoppingLog.java | 42 +++ .../motschen/decorative/block/DoubleLamp.java | 9 +- .../decorative/block/JungleChoppingLog.java | 42 +++ .../motschen/decorative/block/Lamp.java | 16 +- .../{LogWithAxe.java => OakChoppingLog.java} | 14 +- .../decorative/block/OldTelevision.java | 17 +- .../motschen/decorative/block/PoolWall.java | 2 +- .../decorative/block/Springboard.java | 2 +- .../decorative/block/SpruceChoppingLog.java | 42 +++ .../motschen/decorative/block/Television.java | 19 +- .../AcaciaChoppingLogBlockEntity.java | 61 +++++ .../BirchChoppingLogBlockEntity.java | 61 +++++ .../blockentity/CeilingFanBlockEntity.java | 50 ++++ .../DarkOakChoppingLogBlockEntity.java | 61 +++++ .../JungleChoppingLogBlockEntity.java | 61 +++++ .../OakChoppingLogBlockEntity.java | 61 +++++ .../SpruceChoppingLogBlockEntity.java | 61 +++++ .../AcaciaChoppingLogBlockEntityRenderer.java | 52 ++++ .../BirchChoppingLogBlockEntityRenderer.java | 52 ++++ .../block/render/CeilingFanRenderer.java | 58 ++++ ...DarkOakChoppingLogBlockEntityRenderer.java | 52 ++++ .../JungleChoppingLogBlockEntityRenderer.java | 52 ++++ .../OakChoppingLogBlockEntityRenderer.java | 51 ++++ .../SpruceChoppingLogBlockEntityRenderer.java | 52 ++++ .../blockstates/CeilingFanStage.java | 24 ++ .../decorative/{ => blockstates}/Part.java | 2 +- .../{ => blockstates}/PoolShape.java | 2 +- .../decorative/{ => blockstates}/Program.java | 2 +- .../motschen/decorative/init/BathTires.java | 68 ++--- .../decorative/init/BlockEntities.java | 22 +- .../motschen/decorative/init/DoubleLamps.java | 64 ++--- .../motschen/decorative/init/Lamps.java | 64 ++--- .../decorative/init/LogsWithAxes.java | 38 +-- .../motschen/decorative/init/Pool.java | 16 +- .../motschen/decorative/init/Signs.java | 56 ++-- .../mixin/DefaultBiomeFeaturesMixin.java | 18 -- .../GenerationSettingsAccessorMixin.java | 19 ++ .../sound/DecorativeSoundEvents.java | 13 + .../decorative/world/OreFeatureInjector.java | 44 +++ .../decorative/{ => world}/OreFeatures.java | 4 +- .../blockstates/acacia_log_with_axe.json | 5 +- .../blockstates/birch_log_with_axe.json | 5 +- .../decorative/blockstates/ceilingfan.json | 3 +- .../blockstates/dark_oak_log_with_axe.json | 5 +- .../blockstates/jungle_log_with_axe.json | 5 +- .../blockstates/oak_log_with_axe.json | 5 +- .../decorative/blockstates/pennant_chain.json | 8 + .../blockstates/spruce_log_with_axe.json | 5 +- .../decorative/models/block/ceilingfan.json | 81 +----- .../models/block/ceilingfan_activated.json | 257 ------------------ .../models/block/pennant_chain.json | 246 +++++++++++++++++ .../decorative/models/item/ceilingfan.json | 88 +++++- .../resources/assets/decorative/sounds.json | 10 + .../sounds/block/ceiling_fan_ambient.ogg | Bin 0 -> 25506 bytes .../decorative/textures/block/ceilingfan.png | Bin 179 -> 176 bytes .../textures/block/ceilingfan.png.mcmeta | 5 - .../textures/block/ceilingfannormal.png | Bin 139 -> 0 bytes src/main/resources/decorative.mixins.json | 2 +- 69 files changed, 1788 insertions(+), 615 deletions(-) create mode 100644 build/loom-cache/midnight-hats-1.0.2.jar create mode 100644 src/main/java/eu/midnightdust/motschen/decorative/block/AcaciaChoppingLog.java create mode 100644 src/main/java/eu/midnightdust/motschen/decorative/block/BirchChoppingLog.java create mode 100644 src/main/java/eu/midnightdust/motschen/decorative/block/DarkOakChoppingLog.java create mode 100644 src/main/java/eu/midnightdust/motschen/decorative/block/JungleChoppingLog.java rename src/main/java/eu/midnightdust/motschen/decorative/block/{LogWithAxe.java => OakChoppingLog.java} (70%) create mode 100644 src/main/java/eu/midnightdust/motschen/decorative/block/SpruceChoppingLog.java create mode 100644 src/main/java/eu/midnightdust/motschen/decorative/block/blockentity/AcaciaChoppingLogBlockEntity.java create mode 100644 src/main/java/eu/midnightdust/motschen/decorative/block/blockentity/BirchChoppingLogBlockEntity.java create mode 100644 src/main/java/eu/midnightdust/motschen/decorative/block/blockentity/CeilingFanBlockEntity.java create mode 100644 src/main/java/eu/midnightdust/motschen/decorative/block/blockentity/DarkOakChoppingLogBlockEntity.java create mode 100644 src/main/java/eu/midnightdust/motschen/decorative/block/blockentity/JungleChoppingLogBlockEntity.java create mode 100644 src/main/java/eu/midnightdust/motschen/decorative/block/blockentity/OakChoppingLogBlockEntity.java create mode 100644 src/main/java/eu/midnightdust/motschen/decorative/block/blockentity/SpruceChoppingLogBlockEntity.java create mode 100644 src/main/java/eu/midnightdust/motschen/decorative/block/render/AcaciaChoppingLogBlockEntityRenderer.java create mode 100644 src/main/java/eu/midnightdust/motschen/decorative/block/render/BirchChoppingLogBlockEntityRenderer.java create mode 100644 src/main/java/eu/midnightdust/motschen/decorative/block/render/CeilingFanRenderer.java create mode 100644 src/main/java/eu/midnightdust/motschen/decorative/block/render/DarkOakChoppingLogBlockEntityRenderer.java create mode 100644 src/main/java/eu/midnightdust/motschen/decorative/block/render/JungleChoppingLogBlockEntityRenderer.java create mode 100644 src/main/java/eu/midnightdust/motschen/decorative/block/render/OakChoppingLogBlockEntityRenderer.java create mode 100644 src/main/java/eu/midnightdust/motschen/decorative/block/render/SpruceChoppingLogBlockEntityRenderer.java create mode 100644 src/main/java/eu/midnightdust/motschen/decorative/blockstates/CeilingFanStage.java rename src/main/java/eu/midnightdust/motschen/decorative/{ => blockstates}/Part.java (86%) rename src/main/java/eu/midnightdust/motschen/decorative/{ => blockstates}/PoolShape.java (87%) rename src/main/java/eu/midnightdust/motschen/decorative/{ => blockstates}/Program.java (88%) delete mode 100644 src/main/java/eu/midnightdust/motschen/decorative/mixin/DefaultBiomeFeaturesMixin.java create mode 100644 src/main/java/eu/midnightdust/motschen/decorative/mixin/GenerationSettingsAccessorMixin.java create mode 100644 src/main/java/eu/midnightdust/motschen/decorative/sound/DecorativeSoundEvents.java create mode 100644 src/main/java/eu/midnightdust/motschen/decorative/world/OreFeatureInjector.java rename src/main/java/eu/midnightdust/motschen/decorative/{ => world}/OreFeatures.java (87%) create mode 100644 src/main/resources/assets/decorative/blockstates/pennant_chain.json delete mode 100644 src/main/resources/assets/decorative/models/block/ceilingfan_activated.json create mode 100644 src/main/resources/assets/decorative/models/block/pennant_chain.json create mode 100644 src/main/resources/assets/decorative/sounds.json create mode 100644 src/main/resources/assets/decorative/sounds/block/ceiling_fan_ambient.ogg delete mode 100644 src/main/resources/assets/decorative/textures/block/ceilingfan.png.mcmeta delete mode 100644 src/main/resources/assets/decorative/textures/block/ceilingfannormal.png diff --git a/.gitignore b/.gitignore index 9563893..d6cf9c1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,6 @@ # gradle .gradle/ -build/ out/ classes/ diff --git a/build.gradle b/build.gradle index 9d8a652..c8a7337 100644 --- a/build.gradle +++ b/build.gradle @@ -30,6 +30,9 @@ dependencies { modCompile("vazkii.patchouli:Patchouli:${project.patchouli_version}") // PSA: Some older mods, compiled on Loom 0.2.1, might have outdated Maven POMs. // You may need to force-disable transitiveness on them. + + modImplementation "eu.midnightdust:midnight-hats:${midnighthats_version}" + include "eu.midnightdust:midnight-hats:${midnighthats_version}" } processResources { diff --git a/build/loom-cache/midnight-hats-1.0.2.jar b/build/loom-cache/midnight-hats-1.0.2.jar new file mode 100644 index 0000000000000000000000000000000000000000..1668bd6eb30fad30ee391ca309b43bf5959ef50c GIT binary patch literal 40008 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%0AwE5Q| zC>;)d5l9pQzb_*51GnCCdsca(B-O>iL_RKE2q?c&n0vu*D!74KgyUKbgUZ@i10mF) z+>BYXJvvCn{6ps!9!#vk^>#cJc$?!kqZPK}lErL#JrN0EQ?s&iNv*OOl~}5(s-LU8 zBGI7?euiR3CC>%VYu81XVUK0KB)^7k9#_jj=_)V!Yv(sv z_V@6>oU{G7YXBJu2Llnf%k(BQrTh`XZZjJY&N>1OwTQcSW@a|7|2y-0?N?1OuOA@` z62QEWM4N;{SR36P7d{_5zA6xaE()p87+GN5UsX{rZ~DX>>>za=r4KR*+@*XK`B%#K zibV8!ygmh$GNZ6_GtZ}?-o#!`FqFLm7Scbgrj-$%PwqN!{mzwr8arQke4VBS(lNR`)|-f9BrDAOki;dh=+-6tP0Gc0fe-eZoCwSNO?>-B*YRm ztlRE*7XnG*$kKVDUN5f~!4A<^yf6zPs1p2bR+tE#lxZ_iu)b4_+I5)?2HZ+Sk+W_~ z4tv#1@@f1(IB0!|ZxLDY0+|K^Ydjjo!``0nluX{ZgQ0!Qeh-Gx0M;Eszkw(<-h7C1 z{wDtx*!{VHoi2bO+2SJmfhNP5oM_0xgcH#5boMkV1RJn8;n_M2yiiz;2zlk#r>sD6 zg~E-fj_RLh6n^54VmS6tEtcchqA!Hv^!VQQZpg8@?GbFIcPfA?f7~NJl`MKaOk>dc zveUgKh;>=xRt%@gzXfrfI6Q%CCMXZ)8X3(k`qXOeHUOMmWonG$yaDVi@dlp|g684Y z*mC!NX}ECK&4s`okV~7ujy>@STM_*sqX;H+8=Okv9~QEKO^oZQ)g9k94 zArbB1D06)&(n?@xQb#JGAuQRY=Dq8i<>(w%1E&uRXfGVU*fBm%K9VZ>qZ05bKdj_H zhoH0d^@y+B3I6P1m#|Yhf5s_4n zPX+;!5RnzG6x0v+??R$*0YMmo20IL7mVt#Pvy+sN^Z&9c|I9g=T+IQZwdWMwovDIFz)@j@%Hhu!R0E-dxUK@ zwZ86Crk6zUijO_bJ+yn)Nap$XuiVDH`(GeC~-U7{Q{}s0Mp~p>n z;_KvPHU`WyjyP&%@y>lfWpLC81PrgvOeM)MVw1Iv@78u7EXH?OOO%DMMuE&P+;I~H z>oS_Sxn0}F8m3}QUIp`L%Ph3Mj+T}ypR9A1oslv7eZ&%GAxsxRPbTqNT!3oTFheTC zia0UYgc1#V&g#{9y9g%Gl4(yxPIJy~ zyl!0Ph}BA?quj;dWS7X!bXpfn9xcGerd>|yrixKE8Q7T1g7vDR>}kz{?q#~M5l`tw z&vRjE{o^T{#bCG!*;-I-K}u`-C>1g8rlC8m7JR{qf8kEV`hbWh+a@DDog)?(|8vHe zFTY}MOAUX8UQvJl`SYeJp7nxNHWCDEqDXQ2_wH^j0}~U;*!cKxsYr0907U<@~%LiK<(G`hHEreYZpy#JjF-XgKYn0EqPMEzI zZ?+!k9LzC|CIiYFcGQFf$#Ln9nv2Ql;Z**VGF7Xm5AQFjq(s!8v!nJhGsmDlo$>h% zP)O26spbuM3HpZ=@aeAWb8n-*(bx)Vc%6#E1l(@rK6GsBw#TagjeViQ;+K*vv9Cw&DY}N+0w(m_3HW)KMP`$)DFfFYXY(%i2ij zaCS;Thq}b~cZ6hAoD8x>%lBdoY+KP$>`~hB=bL{|d=+j{X`RB_4C;1T@t;N{M~QMp zM9A_U57Yb{h~)WjY6C`2hG&KNDbTY)`<&hUO*noZ0un-$ZSTgBe*ECt^#uG*TwuZSNbyb(#*ClI zAR-ee4n4(T+J?=#=%g+}(fQ%`@4^dA1xtvNw8M0pmY=lAN^%xy9)b(?-UW&2601Ft z{DcV0(&TGlHIQt3-vJIi8TF~tZ@p8+StukTgaI+P(aLBShqhv(%_dFU%#QDZeF+ zo#8E2q(8t#eZL*Uk*K7ar=4=HQP)o1+aR*Qnj%CH`(7v;M1pTVYP_WlHfda3gB2!{ zugE_7K#rDny);Vg_-pBe&Gi&>Y0773;HOR+?TFp@=+ z0uVnpj%}1iUvXmLGgR>L>wFdphEj$+qGw^v0) zrh4AqIvw+7TH8+357@DfiUU%%<=py0tlSOPfjSf7_# zkapmZ`Xsi4H2wEvJ77X?*&TW&HLAq}5CrzVIdF7OZWD4C5aKQ1iR*&tgmMhv*R?u4 zg;bX>lOjHh-G?s}m?# zj3=Sjs;wCNf+5m~jAKo)hH4HkrIC-1t|WOpji2$2dX>fTZ#TUM4Hre=a<#k~2|su) zPUK+lABLKr5DRt*w4=xCgXZP~P}jS7cxZkuvS@r;J-$j(rY|$}`zvfX4nE2~yyPi*#;04*YwEQ<_0Mcz+uTHR?r#7PQE)+pgfjx#~t|20(#? z#U+trzcc$K@;5Xf35yWMm?T94^w*>^lI7{8_O)LxH9$6V+^mj|L6$neS&SLlg+6Mk zav~L26gT#4F2k|s7ZZ5h_Zkd)LT@sD9uP^uH_Zk0sW;=3X{;L%sHAkqx}+B1hb!~g z2^ndgK9(o3L_3Ni)sVJ)}-+@748#DDBH9<`ZFw9YbQ`*LA z4?}|8I5?|}@!rjfWe@}>0-r@p+aZeY0q@cc1#`;M zOfd*{s@jlq>+2xP?BWs%xL_AkgNRpi>X;Jh1_26yQwI?{fTBe%@-0)Pk3;)4`aUO- zWWpg^#B7{ViAfm5VadARhB;;GkUHNIYZ-9*ASco@6%jqr)k5^#a#Gn_d(e)i+CDCg z10R!yYI;|xCRmBZJH+;FXC{kHmO6w*?)Ls{#r5p;)GKU1YXj=>?E!PD3_%`ZW~ANm zN3-T`nt}@6+tZ0$+rSY^Ol>Z6a_wkWdejua(3h3VS6apK0eR?*RDVO8vt4>-7@Q_7 z;b*xLGn;ScRjZ-861Mm5<5i0{q)khF|MtXKVNv$z!8cz?QrAf`f_ms&6iPLXlu~fP z+z8n+_W1zOmzI{6Wv4Y?F}mb;8JRHx(lecXyKbTWNV`NJW-M$S2+|?NHT$g|yS|O| z4ht^nOAu}Avye5GslnbQt9|-U(vNB>vMH2mq|Y-tEl*ey<=C49)G7xH=e?&2bzX%W zP`_EnM_As*l8BWS6%`@OOh9_^J^=(4mJgdOc^G(&u$7?`EWP^4dzOW*sW4&q(4*(Q z+S<<+ALO!qZig*1OoaQw&QDLR;J`p!ha5KN($YM!M9{rK`hct0!~zD&DiVR(ERb{% zqAFoR3xy50sN-u-vu`022Fff^V%F?es5>4G^J9|cfWJ~tiN)Zb!fhlk%(kwWwG zE4&O5Aumr36fqU3SXl@SNSZrxghz`KE7COX-k8LlB7XncJxSrX^hBZi@w~vNMb|ST zdK>Nivi!F6x>6F1cVjn71RAD`ClNK}GVriA!=i&onB2hV z>Gth-*d29R8J=1;CK7g&9!U+N?cM|YS=1{ zhcxGWRzhEu$vv~OFloOw9vhpRtFmID%$i3sH#fN}#GYJAA&2yz9}6Q{qjh0Bc< zmHSLraB+4@YDx+#9kkKiSvKLOijY(dQXEO$ICMQ|P~d{$_7%G$U^K~31G>eRrC)V6 zSDi-~=vtl+Y!?1y9H<`n_sxRGs<`;?OtuvuU*xrtG6C1D1a z>^$p1`s@)t*9jgzx+6Kx^40Yv{h1;eXVP1Wql3sVhQIy#H(PZHkqf?n4h8|Gh!A$C z42kd}m4@x7Y&jpHy5Ds9Zr!V?m`5XAg{BQeh!aDuvbKa8k|QMiEeN)UF?frgR~L%jB{SZVbpmL7=qdq) zIU{E#9Kbkiu?tcFrP=L{ z3r@t4Znt}L2gB*}Bth7vhNv5(b=NUAuL$s2i1{8iq~RiSD9AQHsbAaW3ho4S zKhI+Uc+;21u?t6#u%P%b*QT8Az78U)kO0nX$$M;yEQKWS`0Bj2G~tJn{-2n}D5W|S z#eg;2Dc)y#xt+$WLUYJBGx9zdQT!q{!b$e)Td2n|P`&Q$Ob}qr$gg;uQDOIay{L(rCQX z0FEy|UY$wpkPzT0_&wMB#L|(zwK=if3`&@6kk=p~2u>kCvdDTd>c5(lsiok@ruN_3 z(ISs3e98NT6*L1fW;X*xP_M3m)J(5W%q=L48Pp1#7d)A}MTiGN4>22yIvx$t9mW=K z3yB0BRk3?3t{~_bRk0%ZZbV~3lm-fBWEBXhJqxBtTORZr=7xm7u1*__-2}LVIs&WDWuS_8MI~rUDDeqk9M_YqtH%yp*P&RDOOFoS zl28I>-Stplz1&*K+SI^0GuK8&JY*L?w4L(?`c1XOrEEUaA;KK60%31K3k&l&L+BmL zW~7w((J-YH2i!!rAF+5#(vC*N+KUBB@9Mz;7^fnjsU|ru474EKuenl%z>$Fl;6huH zo9D7H+nY5;cj2X_p8E&!1XPFMr}x@PO{Wx0SOr(f%q^UPG4 zv>~^LiGN~pX`aC=t4(ze>m#bp&z2b%+jrs>bhgg1^ESOz2`+3Uwo)Mza7B z_cXLFNFfEUwYvaU&!>l-OOqbIpI>ez6Yx48Cz!1V*>+{Wtkjup;0zV|81nMG*vH*b zQ?^)al|r+Ud)m(pcl!W*zP0Peyf1*To-DXLC}<+HJ9DQTOXkcHb$JlTd>lK|e(W#p zE*=eZzRroo;JP10iOFT6=*BvbJ!5icaJihitywwjMq2RRNDyCR-q9UEeqn|0?cse{ z*6o*V^_tcWYBLz|XvET_Hi<-u{hhz6dR(DPt9}BX4Km5xK$|V`F*G{*JDy4JWBw`fj~ zL*%d8cu4_U!Ka%%F^$sVMlwpLuKWn%Losx3CAtTp_fovrof91o9A7gf;sHdkJdisM$G@2np(Nu(21Bo$D-+bVEGvm&~H-z$dHw zqGgqsX#!bUStZ-s+fV%=aH&$Zby{6$c`2_zxa%O~@smt{X|UxIzPw^2%3qF1s@&Eb zo;AHcJm7oJx >h8~Z*ZZDs9X8qSIf4Z}42-5e}m_w%ml#f?`If|Zw@H1!B^c4#- z>y$>T*7=P&VrY>UO3?}D7qwq#KfCg**d8ZbFHbLph{|eq3p;sxx8J_rNOi&+xs3BO z^b1i>9TEm6Ay^(*X>^CP_MR$-2T&t~@PM($EN*UsEnN_(B}^V99xrw})w6tD9L*Fb zvvWljrE~A3dB4~+({nhy4+Ug>Fvot6@)jfowQ3P;M;Hm0-Q-EzUz*l-kWFi5CL${~ zBh%5hFeU>TWSd&l{k;pSdWNcVTfKfz&{qaukE)6s0W3wr8ADOrOq4Fs>1^|S-PF?R z$=hZ&k)`vPp4o3A(a-(ZxHFppY zmr)$O+1)bcyj!rOqw!Tuj&zfEuvdp%3Wz8Isupw7CdK^Sl}!@(7)VioP8?!s-vjy` z9O#uLt3})8{c|zs^D>%RM{sh?>A=%EIkkR8D+0YL*cln!oyWg7etU~)2HUk5!idtN z4pG{PpYL1Z#8N7StuZ&Er)}|U(6W{Iz;n$+V)`}ZY5yCey{Q^L^RksBkvtdeKs?(G z5?EAaSsBy#mo8{g23I>>I%9wPhSt{fOfC)7taTee*JKC+*hT=CaUTC$iFY7y;j^WK z?pSA#hoW6W5zZ<%Ea;GeFEQnhgu=m`hxejKiA7)%%z%R)YRG1#Pzncj%?eB?5q=86 zO@@UrT%eAU9)CA0t$-?^y!JRaUIQ#srJof_GszprmMitp6YNH-r#%MOXOuvJAffa2P1OLY&@wIOu?Ana-Fd(!>Z;@+10ai`XUW zuT(k_6EDbqvDuVmOmcLm5YoZG3Qp|?cgrFCT^3?Q4G+_0gUFQwnrp@xLUj-VUa~RB z)IX#Gb_~7Etwjs0Upi0$Hork6cY}EbaS482y#lVpRYwN=g~em*7N$9bguhn=J9Ier z;9&)DD_Q;0z}!xJ@f=J~Gk0ixu};0GoHmWM;v1+TVnG0ieSJocObDYWpy#^aBZTe|TdziVv@YiULCc9)|CGM*O3u_&jVb^A#O0h>ks~nK zU#wcyfg=e}kM4qfKHpm{1=>CZJy@k~2lkv2m5V7SBZ=x5KkeiZ5{v~?_fw-0rU~zqjPQ+a^`NADViHDs)9V8M zQ1|M zM9tyP?NpL5q;Y9Z7N{r((u~qg63acQa4y10V_(gr(opoTqCt@K+htIO*8cjxAmIf( z!NJB@sWA7KBtlFBa=SD12Za*!6F`+N67_)|NUA$8!XQBhyN>GQT!6Nk2O=d7q9HG) z8ZUFE;6gG$zIGPqj!Gyc7Z*r-IKS6Mp#$ocxFeC^Mt}oqn7?WVw$5z`p$kr@xeBcU_J^u?gT!N`~Qh;54|SNhYctC@wgB94yeF`6!rvmt0PJ2U6`FU=8A!k=K#AEpUQ%Q z)52H6Z{C6sqo0OTM^BhB(xBd`F@h}P-q`5_M&yyZ0U&VK-4`aaq980x`1hfX)!I*-R5MQ6y_T)?P#1o) zrYJ*`Fr!_WYEmD7A2h^*31hyM&=R&W7q#3vwY!_>unvK>KdawlY={H|Im+a6gV(_{rwPVfWa85(O znIwrYb3AllAj){R^BHN7tE`*ZxUySfzHx|Sa9eW%0e@rByzG7?Cd7n_ghZ}xa5~m! zZ|SCigBln|BU!h`6~e8l)w1P z+5#{PjP9m@#FyR0cvM3{k>ay~!3{oUm z0gy>{S%?LFrfxztCv`(GrFFYQNurealUV)IVs1Pr%Iq=I13s}V&c>nTj@q5&0PmN3 z78%*`4CRK^^pX|a0+_8gvmFb2LiC{iK#T%YW=))*;jurgcn2QnNd*o31pXZ?))UTve8#wAfs7D9btHlVCgfT8-12C5 z5)vYYa6A};0_@PBs0`u0)6p-@>S}h;H3+(92H7YlO$G}1 zo(#iZr^ZR!+g`XzA0UYeM`*%cf_7}NGc<<7_L@Wf#hpUrF5~^U3AQcMglswDf%lpa zKV(+kf1!9L)e~YOs^j!2>wPRa+T>w)dauUY2_-`S&A0RotomG@q8jtU3&E5JDkYvG(xT4h6R~n1pC|g z0j$VT6nl4Qlb|N0)q?Tv?!58dj8R(@6ZeQ4KJJE`q7Rc5+kFAdvMm^4DABBbtCDi@ zg1I@f^2w80X~%Rw;_vJ=?!AL8q8^;CHnYrY+@&ER61T{e48rq~EORIKAAB#3%5NWD zyDzR2nKDQWXoDd%t_ufS5eg5ODByZ*NsBA|!AQ%ufW!kO9vl$;Ze4-`36Wq?bzr&y zd=wgJ;yC01;fo*~8ca^F+;bN@XdfUt{p<$gqhi9nQ;f10=dJ z!Vc4KEu|ui*Mf_@o!Z$$yEaF7xbB||JA~Mf1$Xj{LCv9hIAbGwQYl?#{3Z|Z<6gK>M&}lw*l%i?00hT=8+7-Dm9SIr z%`mn;P$xc?`ppsJo3TI=3^}I0==1_?odE>{N}wzRRphBgUk%mz)mmhDbtWM$2m;2MVQafcUTM~tvyM#YO}rcf((8kCpSB%09hP)&eM-h7HGke z6;774qr{|Po~NkANjrW9(7b~rK4?S`1VE5P3G5QPafjwk0TXKu9ytj1g+WM?tw3M6 z4_r_RyA}9ezK$7B6QpHGb_5(NoQ2yFf4+q4=K+MefA60h@QrPYoKl$CGwZYv-&8pPpwBWyZe5l5cAX)2 zkG?;hDs1~PNDZ*KzjTV@utuhmYGweiX0XMF{Q|OmkL>n@}*?2(+n`R7-2dr zx)DC_T&1F*Id8g@HfB2ez3-YgV*HE?$sDSqlcXVHeQy*%n}oh)a#o&82>Z1TQ1C3a zE8^?FeN`dB3&C_FMM`JIjq3MH+7d5vP7LfM4L~6e88!)=sozgwZT(t^(0N&m42 za^e=gX{sL1NRM`}PP%srfg%qXGC+%sS=ts*?wM93A&1ocA#jBmxTF;zT)qR7gzjRJ z0DBS#$WiZukB_ErIGR(Yx84~s>ia4V%YKaeI#sTmpF1F z_i@==E%SH|*^rUdqCg&R{F;xK0RUsyxKb~u{^TYa_ZhuHW`aVuSMRUPm<6I=`O|Ay zbqMo(Gmb8u=BOaJ__%e=N~^Kt#)ojfyhM-1r~zcU3L)8x7r$ zRgkdM4Av#QjwHNyQc7>Tz&yUA^>2y9ZSk}wB5K2H{F)nSpNE)-nUdXvC(C1Wkt2x! zp(y&w!se^Bu{roMev4q85AeR}hv$n>4&^(3czOA04T@$uq-`X9kd5sZ4_-HhFGvWY zL|!IZg$Vwm-~;liM$6&=Xv+W3C&4_1gbpmi`YwKlN( z=S4UEb`1K@a_$EsY!3rc@WXq=w1j|oU$>^(8rtt}0WglV8T@)NiAw#iZx=-h^_!cU zyC`(YZ5QY5tWdorL8ZhU%arh1uC93HDiUc&X_1u`CAhy^#-r5FU;vZl8scd@wW5Kh zE1hk#vc9D|Zb``Tk1%35qV_=jqg^7(sz|kzJ9jWV((tL&wdmqW`5O2GkfG7MQ2J-? z*aJ6v4+d`w#<6Y*dNqz_Y)9>uNNz8tlnTYa1Nzayim+Oq858*i_hLtxvU6HN|2RnJ zUgCH5c_teO|GzzKj`n%`{=LSLjDW0!sECp>os8&zTNeSz{jdLx__Mr`86A<9qNSUH zm!hQ_ADyUEWSC{z+}qy!>tBv)eL>D~K4(ZKNPivmZ%8qAc69pRR`EwEkI#w!Cl&uu__+`viLz{!Bl$m+8~%3omfe`;#f4*{uO zex%@yM)T>Snu_J)rASib)kwC!NJVZmbWM*9W~o{-8L~Cy=PER`?m)gS0y5d@yfA!H zhSa8;v6X=i-?k25_HN$Z|F5;L4$Csz-c~7T>F(}sP`bMt>F(|ZY3c6n?w0Nb>F#bM zKb$%KM*YS)GuIrrUN+A^?|tuF``LS~d!-M45%tXv)WX;TAJR@ox>pCjXM`b(R|9n= zsVZwjW|b+2XNNKDH22C+G60wJOU7EUY^Rp(^W*nE4oM%DMNOuS(#B|o4 zvu!T-W;Hv`K`njDKx(ao)w>7(d)kIVblIN+TPB#^F108yX>qVX+ zka+W61+K5Y&T}0w&@R@OFJ4?ffBsk|f9^=qzv{^6E)+G_)X}xVr}-P*_#*Q6$@g;^ zA~_)bELNmiyBj&m?YNlE-S*PEvsjLb;)5^=_ul#up@@;iA*m(j1G%^$`pt{CVCA5% zFTL7g^z8*2Q_7d$sV~1+d1Z$}PqS)`Vt_Ji^06~!#3$qnocNdOvJ{w?{6puk)WF~) zOxBpFaHJbi!y#KROC%Q*SQJRiw9t9;OU(}O?B&v@o{B{=>z1uEXKvAra#{f}0arc< z#ZaceAWxFyo*ijd+E?@lI%QASmBNx*k|rV)rv6-yI}U5yKm~HdZKwb}!#aa2C-xm= zPdxI;C7>U<79&y3Bfh|AhR2a=p{AVrCVUXgxn$bCs_xD!D@2sr~DZ|V{2~|KRir98YhV>^gcUi45tx(Kgu$YM26Y%<#l`ny2%?vIxA>K(8W?< zMSoO25LBOC2g=402o)3+!iC|j^RmdUHKMPb%do;7D*4>8RR3ATf0rlvxpT38)w$Z= zVub#BUHG{tzdiqYIC1`WM4oTh&!dZ9SM#gLko0pfx31N5@ZEo3E51?qxhz)rVvjb3 z@TlI@8`B*?^PW!}{k6}u2zv3fk*bdg9s-MyDS?=@GF^!Tt7YGP5+o6DpsT8zkV9Gfuu)*YcVO*?Q7?Gcl>@e zzHl#r)Z)|I>@3Ozr*i3wXMq&=ImL;g0;w^GAR?Qh{LKbJ>QU*kvX%m=Ji5pcu~drJ zHbW_7gZdQ{`an+SXMpaD;{%W2NLDiN=b~b{biNB+HkwXG0_%s}{;*>&_!{YE>la)! z89AuZ;1d_#yxxTV7(2TcA)nLo*^`N(f^(VBhNqSgC=|Myo*4!#+m8w?$x7#VOC%7o z22p$X(*{``+Jl)*8`&G?ye`Tcz&Sru<k99C7O9dvVRUgjA>Wmq{94Od;`M{j~ zGr~s@h6OhXC5?%YO~a1y;>%=P&&VelzgKU2=&6-*iiKCC_o)TC*UO^-h+srEljd!^ zA0tsjpX>{E+fty+$?6sHH$IhdE~~HWOwwXV2M}eNr0Nd!qcDgt1e)|drmx<&g6F^o zuLh&#uIf`*0Gz*#LK`M|jf)@K0T#MaMjl`Z!~sdV^#Z>FNloxI`zY3Qc|5VJp@KsCLrqaT?N?ZtI((J#1tQ?loh+yLm zlOZrVfKFGtmYNB7L2@0^wwYITHIx>|lG@Hn3^5Peh^0n+WDG8R?b^Lg)BsM$p12&Y zsw*dt-l}oBvj!3~Q&wW_EINzKLFZ5}!&&S!LqArTx)Ddcrp^GGH9M~>>v`SnHD>9l zZ8P|Cb9a@{#~f#dhIhG?fUqDl5$UL;W!?kCK08WL>~nDkAT=EdY|B-T!@$=EaF@sB+| zASN>v8sCm5lZ*7Kap$%U)dHV}#O+lL0Gl3>o+hsLtihArmz-sKW;De{3sQ&Qyjw=b zskj<#u^k!ZL~<)y!Mn-h^-QHThU+@J(q4~34S?qvGk712p@JIJxt3kdi(e3GxZdtS zpFoTt;;Dt?Mz}&5Kh@8!ZB9NP_K^eIggi%?bD!#@z^7gVjJ*nAUmJEjQZ%S3&lu8U zhO}_{HeOD<9(=|eU>0NXN@X3ADdHx&?Ibzsumu7YjOnI3aV8e>PP0vfv;!%)i55A# z^0Gfe4{@@KR^j$+Dnq#?FQFmHoa*XWLnqms>NGouHh78@&a01 zmG&)bCYpXx>);1s2c1}_aF_=$`wPka!W-0#-b8`bPZT7x*7F0iSejqe!@~#tWHJp%gj4~+Ld0D_R z%#XZLr0IMES*q*rq@z6Gbsgc7WWMy<>uCNSOp^0EbLV|eUCDTU3=GG_2 z$`;H*2~4yo!j&)dQOhi_^RmnLGFNH$zN!E2!TN zmRy|2sw(r~!@_j&(idPQy6|#GWW%wMp@U8+@JW8>DnV+qgdJV3l0U>k+3Jgcw7?bX z>xN3E&M?Zah7>8OYfmexxC?BEAL%(*Rp`$9#7I#gn7q%M?hkf6%ygP7ANK{ho1p}d zj%Ef*eawXUk@-@t=MApKs;Re${REhBn#;|LbksS9y;=f4%z+P2ua`=kX$DuA^)6FGfqU z{GzoCAN-T4^*ntaBtDWMxU_P*FC*W$%LQK6a+hFswxBT#@4lGTysBVi!osMR26o_b z%iT(F%SplDXWC2v8FdVoDFyv|kfe5^WKH(Q>lz`RwX`9f>x0?KR_kH&k(7&Efp-f4 zZ@Tp%FqGR{vxw+!wfY4S&-~tHqdGnXn&C@7R=TjKqsq)?#ngDyKtK&*CJq_^WAqsW zBsILhfiq-CO@;Ppz#B^sR9Q_Cw0LjF$O^A(P@wnTzcbCm+TkL@Nl7fqnSvk2CAvi_{TT!H;`L}5 z7wi|c@nBg-7OaC~P{|#Pa>d|O7hsT^KJR&mhWeg>fZ>9uUV|PSx1%zf)@aoQ*OL`} z!z$axR0|*Z1?VTXkz|ba%KK3%6ezkuvt2h146G$$w%LxdQmg(2Hh-{8f1XQW`|Xwh z5pOn3aTZ;N+U8?dL28lefKL_y(U)Y}x}m8HU5Z$F zmOB;-Au%7t3EHOGEbyknoSLm6kp*+LZ&rodTyv z-X)9C=}H+A84YF96Xz zBniX9-Rjv@qB%&yzs>~{v7}%cVA+_S^+`yPv1Zj!>GwPACmTpa3q^6I$wc)T3}tuAj%WON z^L%X%71iZk#xA;Hsya{Qu`@l{T{L30ErzL!=6P^YCeN;{3uX2|u}!_n{z+`o>yJ{L zprmgJbdpyBZ7;rb^0$fv6ls4PU>w26sgJ^mr7a33?${L6)}hbwiAop4hvLw~2_adh z+^h?r*E>&IrDi?ndUpQOrY!0Kn=?mt?Ss2 zoM?~yY=u2IHCXn>o07;%Qe@j-XVg{rxo;oK17mRumzEfvl$;`{`;H{6JcKoge z?%)O7d;TXl!u2OA#VGY!%(~h_Q^?tpD~62*)NBU$z$#L&C{0>4oIrtm&K{q}GDnLb z_0k;(QNh?^))TF+0sty`J`DJdvjj~?eoG*QVvC#)TH+NmGu588b8~3f-E-XywoNkX zfuRw>&0)H#K5j@egU_M%`c*G{=;*VT?L*wMyqES@zWaG~ERx;o2zgq!s*#TIuw`USlh7~X&yiRdGW_h-A$0^R^ zshBSAAe`{2uXp4`+6gEkXAmp-b7bkgl)8w4CzRC4P(_4kn5AMuNxE%tGPe%i075_y zVaE3t0>^JnRh5tZrfD4d+5mO@EP)2MZF-T8h|6m}fS;YPtvW5g ze$d4L8y*E7TU7X@ZJ!fhLrk9rG%WFs;+2c-!u%@S=#m;;L+=VFxmm-~DleLya9L*j z%OhAgjTdWb(2)E1;mZV5y@<5utL-gse3z0%3F9}_542Evk{+ijVE)o|7cBWJsKVbPY zX9Qp_%37Sm-EjcO+DYzpE6OJP_TXN`jd?quc>3m{z|O7CWL1GwrFYEy$rdQ9jYeS9a6S29L#*M3;sPA4t%| zH40by%y90E)X_Ac(p{R0e9tHxx1tisj=!F_Ta+~)W!L0V&VSbvVkVSzj*0nAsXguU zg(7(_cJ$b%2O6)S2MK0*$n6tYvcg!U4}s~%WORNJEs|k~P(tuI!ryYEdn~@?rG+Sa+%| zMI*b&&hjCfQosnDq8ha@Nt2FXNMs@7VpET`Kqva_?HcKzFm7lY-)pj4B7DcY*Ob7x zrUIU+@rkWSpMEXD!w@On>e&Xz z^E0b2Z8Vt_TL_t1kq1d6Q5RJSlUAhF^T2@~tiU?c1ws)@R2!8O32H88Iey%&#Plr^ z&6|XVp!CO=%byrqiOK^HT}&>YJZk8wzI2k#JuIiIEm0hYvrUioAu`URHf&V93fqS8o)(Fk(G5{CGu7emwep%-a%2Xk=cA9KXI|BB>!#S&X$&7iQUt+LXdW*l~VQcwh=Hkt9 z1A}n`ba%pbwGM5wMr8vk#*A&Vg8dfo&UXdLOCJ>U#$aL?{`2umIZ`zyHLQ}c87Q}~ z&69*U+E?g%agGLDG`lQ=C)O`3nZ>Y06Y%=Fv$us{>n~mjg{ZRfNW(#APK`5lP>+d^ zIe2dXC*kjstJCj;rAAhJ>oGMxw54AmT0)*jV<)4N3dUcaagN0Iqj@%*g27|vp^;?O z*Px+j&36+-2$&5XXo zUZl8gw?~eNcMGMCeFV@u2&V?RGWX%zou7ug24+<#N8eHAqgjDduq@{;927z!tcJ;O zh!Uo2U*r?(fOKkZVtTFGpflx(L?(~nU>QHdML=GP5~B~HaFT#9OfNMkcy$Y~?~qwJ zKy-`hDrW3pY)ryhKzsEz$`a_7RM&vJa!(J31=(hvqDcj9yhxyjUmmK-f8R#^rM;pJ zqoU8;2~BF^gY`@%S{YtpByyku{Y; zlY@6Nd+pU}CgSgz@yjJ&lf4 zdnb69*zL0LspoW|5nRY%EiJz9sD3-;Jn8v!@Nj;t;Rf*WleORL(k|%gi1fqQV(DU| zu7Lu%5F{hNQ(89x_Txf5+h*yt29V&@>9y%k3GEd9G!A33*F_Fe3WZaPyjFyXDn^ab z!utA1wKY~EEPmnQFEQ&-C~M`D-b$txLa57poZl?ydt;=cNy)J)^Q=qpOUq&H))6FH;oeY_1QU&#p71i4bARJb`T6L)ku?_C1=pgKgciXW$9O@`C zb@bjQR*FF1QTxCEVP1f>NnQ8Rt~@@dcnD)!6{?aP4(pABYGJ6WsUZlNuO?13V#^Q`4t%DU6>624!}?Ky)kwv|>=4q#oo=7kT!CXLVnYhvuUUZ};1SddpL zq#Z0$Q^d`EmYHVv&1jZ0D@ML!&DCO>tCcAbkq$Khf0W%end*QPsZ<{?>KmY*L-7#a zozvu+&R8v_CDwA4C{!+x!dKvAsN$I#C+)_otS~<#r8$eLSDuq<&C${17%$R_hm}BM zO%xlVf$+sM<}R{SW4Ky(3`#WO+Lomrv(qkLhv2(TD5o2$Ow67tzJe6araP|}XNy;T z>poWue4`q(Qt<>Q{(AeZysyO)61?2Nq`HZ+(Wz1{sGwkie0oi7&yagSzohIk49@9z z!YDLPYxA7Lu$UTxH=|=fdLnQqWP~AC>DWPo+(Vvdt#9h&MV(e332S7_^y9~jWpM?U ztK8Hikz9C}U?8gG!dZ?~`IG#^B||%z3;mkAd~9hNpAz-aRK*JO1pU}vJH%@fyB3`7 z8m6p|r62@ALRl^s0Y_4JQ(ECzQue?dVqo*c=qDM`Z0`&sb`-Y>KWJjE#Mj~40?&Xq z75tf>&m6L%p?qQkSb8)n3SY4dFf}ARd*STXP zW2o#^U`SqP#VATN!$ewawo!^efLDNRcHU*oU`t97sJabm3SOGpF}@IZ7_bG*cnn}I z;dSpCg<|2cRSkIzE_7`#U%8ps{Pmb9>^SL|pA(^?%Cn$h_n1`dek@^v+O--r9YpxlWc_lm*Zq@D zU66AqxB3`K^958uUyoTRbVJxFC&cBX8U0m+$vC}dx1kYT#fA*qm!fu@jZ;r@)KC73 zk&xhHJ|H?~uc7;_M2tHOEnbJ|c>7+$C}A3M5Ej<%zD}>4HP;$Qe@s4y0o01Lb%9MR zSQj$+tk$y)+0Ug!E~H5kp`MV%L}ZwI&`CG<(gmj#UGtE&;q{7$0Mg4mX(UM2mx-b7 zKtS*qtoyubAE9}*iB=+II*wM4R#UVOQe*YpC(2%#LlnML^V{Mye}lu-N0#QVzFx+W zRV;Blo8Lq&nf?G=H)EJNFvg8!bhda7{dFbo2HY380env1@_d^1Yv+$&zIFVTgy?_$ z*1`I#b^mv?-@PXI%xny89KT(NihWIn^fwOJzP)MuTxQF;OTclxaRv9)+Vscu^2qZL zBgN6gitWwk7o4YzuuEJoGcGWj%)l2GK1r_k-mLq^x5sdoS`NdHRrIKzw>7wV+fC}6?tIiXw(p*eu z^O%;@g%VFJJPa7_M>8%GK)D659kn;yi_%ue`4ui$$^*^FNsP{dT{g-x+jD2lA=Jc_ zRG6q!BGo^PDMN)YR3B~y1HvH{l_4tf)_5BGO#)TMi1HsSjw`3|m*Lv<*&@puRXSYB zN)wwpdUD3Ro~#fLy1M7hS8bP+5D<352Guf6xCSrjpu{Z1?7{9h+;JPP9-PuMX7x*nDu~=4qTa)oR2NszrQ9=Nb zL_V6eDkc6J?E0Q=HVih7dUg@F!V+I2TrUoxw~U};&3y=3s8KZ5D;-Zl%u%iw-uF5b zX`pI6-kwC?+j;zERqJ{=$ltlglWgBg0Ej3(=&VL~l1z)|Ho{9pxIO_5)&>rC-)yR~ ztAJkU0mnk@Fx9ggSSWxnP6L1#T49%sXNghk;sr(isXyNGs3or*p5Cr$6@VFbDCJ;y zbit|xN5p@j(hIb#M?PAc{N56PAS#5+{dq9}d2M^uHVFHi zEWroluP#c6e>Gjdx>Nn1XUxBtoXPSa+VDLHkNl?D>(pl`pn!}?obPdbrr*O;yKT zVy*d-%dzwE5ZY7y1FDDjO>P?$LOc-L{@j;7YBZp97Lty(rXs>Y8QMVy+Cmoq?zBg* zCVVl021jd)HLnV8faq7yLnO94ww^H{iN>?$Y5ebJnz-hhH`HXeJiv&W4@h?PFc7MA z*pIbj=_Sd^OikqgKs^&8-hzb2j*w}jv8;b_ltIj9$QPxk`oggcLKPRUm@SfaC41d_ zaM%bL3D z+H4<*>zNk>_ht{Vjp}RmT14nrI}9uowt1p5$M%wzeip!K^mtOzqvj)%9Ooi)1Jy?2 zvh*xu-x_VGUfh{GB#}_cxX{q6Ydc+e$Sx%Tagx->%YI2ajLhPM%o=0=9zar+>m(5^ zx&+v~Pl%oc7UNLJ(^DZsUD0|4RS2FT#m=-MyW?_Uhp+ZAl;V2(5sPQeeA+rH6RfwN z^`F>a^V)_X84U7!prmb-Zs^JpA~?6Q5S$*PJbOSDHPx|CN~Z@CwG?O0>PoLP(c_+s z%d0l$mXDNL=I}7|KSLo%&3e}WDwoIRRndt$@+H+$aZ@4H%NsbCu%IIZg${Y(kG-Vp z5+xdM+(zhACp&Y6{d{l=#^;|W#=OT1&)-68;lT+!_es{CdQS3N+C^`!WPYPw%&krHC?yx-sVJxCz$P?QIxqbx7a3Q^UJACS(`JH8@<+vy<5 zF=WnPIQkq*>r#)fns~0SdvRMrOokiwgk+Q2Z5U!k7ywK^4UMWQcv=&AJ5QCA&`=F}oU1bugp1NDDZeVSkh`WH@%X(g zreq)_yNI+5?&$1o+F>kFQBG&$$&sxC(Gri<5YO~FOG6f{rCq>v#aRJ2O%iTUMBJz@ zzZXma>+NX;}7YJ_VIkh2aeN z1RQCxp|MDho478U5e>;l;_er_(qt#SP5XF}E%r(vqitQYh`A_?*vU!TNU||%`Nx5T zu+2=8aSxxb1|Qpjz*9IU7Q9q~xwSsU&}Ru3-?_ee&LKi?h^-jm22Q;YOzin4cBfiF z)~pZqT!%3i(VPoYwLR)_g@v(V8bMB2{@q89FlcGRF8Domo8C76cuN))7S>fLEN1-C zxUofsV@F4Uc*h#?b9}6Y^UNDXjJIB4M5nJAjqKbbFrLG~0aCR(ty>fv66icL&naU@ zca@93l#I4S+(5idY|A}miOJ&w>T5%CfKfJ?Z9@Vopy&aYh1D2eyx?<*$LcqcM-opJ z%BVO`qafskn0vkqe+AVdOy|nOPK_zzZO>kj>@Z_aU?Ep~SR$pMBJ8i8 z7oR zkq1b$WA%lwWKCpe*vUGe>b;L8SaSq@K&sKI+`Z_^Ng|t{&BVjjdnZbg3lz6-PO16g z({+!NSB>;Hyz*aKw)eei?XIM%aVojbcELBK21qoLBfzQLs&A6phN}yfJZyATzvKYz zy_U;yF+Eg;IRR1AjjZ!kfQxHC1cVrR;Z4X83sghy|z6fwe%uWGe!ejg}HA z-Z`@8ci2Q`Yp&^ga9Sa}%oX3DpYh4(Ou$CZFR#h_jCk=%U;KOH7F(zrbTB+Z;iE9`R}7gbc9}p zt(AXXsHqQ2Vt*GRw)`(Dha!rH1!SE;ni-QEp1ow^OeOER&^n+g{pK@H4`$ zz-?X|Vj9A0H$gH-L3UcF#WHknE`+#W-V?}!aLgPRAWupaHA+~^0jtxu-Hn3Zd#_MS zIi|+RMQxO4#Xeo5%p_Dm#Ho!nAS3_*FBExdS)*qI1Oo`>@Q>&Fp3a6G+GwI-I7C62 z`TNt~b%?V*hyJz#l)hI$Z)R+m{!|~T4#aXn?iR8vc_el0H0U3@J_Z^3C?9GkQ}&+A@sr z9#1^Ms41Posw%9(@V1E!lfzfrVcz|>vm`l7ZbH=Ol#|+T{%VuL@~chCPiIO0+|lyq zSBY=WUmYz~1P~qx)l!r^kogxX`)4Kxk`;d{C>tYA$D@Y7e=`y{SJvWc#D z`vPV=#w%oqC2LKxv!k-fZQF%N{AJuW->oHKLM^j9hI^}na_pcR9t}RLZyehnyU^YC zv_76Oy`Z_5!Y*L)lG7fekBK?#;$MWKG`8bVG>O|%J_){09xuABDw%~8Nu3ztTO6kV z;$E5K#ffCHO)L~^)-lv&Q!FsJyya#_6%HGzNe#-)fb;!yvwJ#Wnwyy~D?N;)myc`F zD<;5|+x9WhnW)sbFriIKKd3^!DpGW;^`(qWJ`+HI{uW z%)Y1GwYor>q>D8`ufexS)Ds=`;YoqixK_*sYcH+_a6c68m%Dis;&?Z~i!<9-p8R*N3NDeA7v>;yw&KP7ij4LApjy85P!c#-z=u6?IIOsx8XwT`$` zP1N8e5IO$axVFb;G?HgO%N+^EDq*!Q$3X{6C?wSv;VkmhL}_OASOHl)yj9rHpV=vo z#C;-Hc~w`a0jxF6_-|-bug3Gqjur;JZf+2)v`pcKBc#f^t`F@QdE(cbU+qWEBQn>0#`dVfj>b5<{q7YoSQg@rFa? z!po}Eh~%upc(T+Ik5dv&%pUGdU6oMZz^mnJc7el5G(_{_@@n*EwN#`l>27x}i zSppPtlv!pnc*0~@?YR@Zae8*M?BnS|eM_)=KjAz;UA$H~M0<~3s(?8PlxR=6?9CjADO)v7h6RT<|bE3vA)$*9G&72 z%Ml@axV%3GR9Is~-jb+qSTBqmTzff<-5M^lD9@5LB&X|^`$g9>P}i;WTm*zqmx-+0 zg7v|@g$6fiPWSFg-w%rPCOzy~z8g*jGl)QDv)qO} zJ!JRPf;3z(R%BDM&l?NWVL-l^RpMZXV7s|o#Am4elyUMF?p}6$VFVC!G3Sy-Xcr}i zPkr)|uzi0D!TE3_uzsU`bbfe$O_z%H#<#75ZNQd@hf9PE5t2=@%7|$&Ct2ex zoza{;e%RT=egZ$0^ehLPc^h>q!wjKH%NNh}i?UFm>Nq*iRW0z{HB?1YEum9##rk5| z)b;QTs=QDtqt5n;s`rxYC3k-Xm_2>A?%VUPbzB~YTk%fV z`H!$Cs{<6TgLZOv(({@imVseWF6Gb{IE8C4b1w@`)Y~^9U3!n_J7<|r!(AO-(uwN> zd=YcG0Mg-SvLq=BC^TO`WwH#RIuMJJxS3+hv$0w5jNXO32Zau~b@pepklECSOHJ?J z*04`|NCwc}WFBe}$t>oxe!QAo%J)(0(Eu$}rP^c!EPmiOIn1U~Q~bTK@ZD`&-o z;G5z2>a*OUW5L39#eUHD*m3hj&iim6So>j>!X-Qgf!&*GbwJeAk4f7)#^7+JCA4&f z1eY{B_f!t#i>(V}q4@ChsjW-oqsXqxO^pok{tZ;NnShgD#G2r8_J(EFvDBVrmOhE2 z3T;D6q?F+`TGjmE&Ph9YOBmKDxRNB&ZedvQJ8CB_LA}d*&l1n0m%43qqjW2ao#&0d zQ-{oMy`J2*I#2TNOAk@P6P@D5J5*Gj{ZbSoT;H{LBQ0}2Qs|UiG~1w+HhD(jweIzT z)<+xUuW}`@d>Y5nD&2JkaXYSByaAY3H#%P?XJ^GZc|`kqf}qq2x&QL{^Z@xUT`ie^ zWt@Na+56^2_rJ8wjy7;TC{H1#O%+WZmM;W6aNa;+A@@}jb=W1no&^R%LsRjK^NFZ# zs)!XN6HrDGonRD8q&FR>-xV7fjmfb`i+uf>!gopR_)dJJYUrJ7>G5T0llt;tiOZW} z%kzS3`SbZNpr(^j2r*~}h6L&C!Ppj}L|$_#b1}o`ahRZL z`x<*hf?7cDm*QcUFyI}RcI>eI$c&#AYxm=5v#Cws$?&7bf)ORU7W=cdj;3>~M3p7- z8@T3T#Yp;+`pZg)wN0F)33AQ^&8wW5!U{rJ! z?3rPMFd=#x8o^LY85hvboNp@pGs=6_{WgJo1^lo0>Zb*t9zVagxwa^B9!)4XK*{QA zEMlrJba!W-ekX#y7slJsJe_F$o_cP|w3#_ng{Wh6v=Q+7D!XSAKYmM{wsM!3H3dp+ zCRp5xUu}%TziH{})*C{_w6F4L%cQz%ws(_)H+JJ&wT6M)Ymbc2@o_1)$#G{ziBYT*q>nUKZ>{C^qEEo)3H?Q870y6p93o{UoYYV76 zJig$uReP8cBFaQjCt^1UmjaEytBls{;-&<}S1nmemWkNdWU$SN$jS(7yb}n^x6EvQ zEDL@!m-O08R$dcG!3M4)W(`wLU~!{=sfxCHU}Z>Wo73FEht|%VnX$9XDka*rAKwr{ z+aAb_%Lmr&r4Tn0XwO7Lx`C5jDl3IH^c?9JKmla-I_c)omDW~^jc|AI=N=$uq0Z?& z&n((vz1}OzE=l~82(F+}HYywVK-+T$XcUw{k#Tkp0Pzd$QCfz~kSz#?^%n@81%LxvmOSB zV;AT{`UYz$Hez>!1>3xiteX#@CrNL&uI{V&bLem3&x`<4S`IAkWJ_C} z+76A2`MymJsi%Tslv zEmCqb`brns-B?)47@Tv_ZUWq-!5#Ok+pTU~f26>|B_g0_5Xzyyb9oEQpMD3El;7rm zI`#$XVmyE0qIJf)0w0yZxIQ>+b-k(9O-mEmPsgPnqC-N)FiqKJ^39Z9GHn6_t?Ly#PVwkuB+_E`(Mi(DfTcgaT0_KL`T18Qh|mT564w zr<{Zw*&!4)oF7DJLax|a17vn{5cP=&oQQ=8c6QVClQ0XE4v;x?utkO)yJpbA9#YZj zVxL9E$+U?Q98%n)@5f;zlxypX14odqZy!3Ifus>(|Mra>H5f65)?#SUHN+P-sD#l=%Y(qS0PV^CL+eo8!gX5@rkctu?Xopl=Y_LcToZpAl_m{L;2Oe5R ztNG=M+4VWz=&g)ouEUe+kIu?}0i37trsS&gFaQTDt^p}#dYlJ$ORVfW@{NFEW7&S`~_A*EJ2iDoxrEUcpqnxPKk^;ZzQQR zi6|Hsm}FdsP^qk!jVm6BYqcoVClM8h4g7aIpXP<_Y2Ph+zv`V}joqnS2dY{A52sDR+aXIr~O7&g?g*(Je?w{Mpnp&FxrL?v4G5RAYXI%=909r z^sl2!0CI0z`sKb!2d{F9=S=NEa!7$|;LTG_qk@e9Y!L0m8Aaemc;y=K(VDWovw*Eg zj%o#E+?eolNda|BaOp<`_E!Hs?h2R^zwYE}_WGk@C3zWjyeVcQQllhC7gNfSf%;Wh z(i@uoSB*s>9IfyDsP@`s@@3;ik`OOFg@rDeM%LN%S6e^a@fWn(L%m}UihT8?xB~a; zNp?lt)1C4J#?zgo4ELlINFK;d{Jq%9GHB8oA)V%#og1T0ly`r>kxAOVJOx5*2)sz* zD4#ii&ISf9=3pgBmqw>zXzO@gQkCEZv#j*`{cq7PIh4EvH_zuKui(F)m%Mx~e)qol zmIM1aQ1-VU&=(Z{`R`lte=-MhvOq6D4t|QmfAQAn;x|bF#kW&S<;gEk{!{*p5ko-W zYW)mC@qFtH@&kt1Gmxkd51+UU-){(qKOu}RFkXH|___QZ;cH~CHdoSE-t%`IK7YPS zCH(Ot@_d=~O)*64zW-`~L_5 z;fK2D{DJU8%lz-~Fn_=s{1u*!uEW<5=l@|v@qPg2czzA}PgDL_(ft`C4^$FyenI7r#C`vw3BK1n zLiqtVTi_?t`J+tKzrg%n)d>Cv%niX8ztC3t6S$wXl)gQGZ)|_o{Q&p@&Q9pXSAXN* z4DH`n8T!MN|NQN5e)#sm-@pBv?fH*@(sM=r7f?UibSmNBD)Ix=AI9x}f%oIsi2W7b z?}AGIu#Vph+1KX$UYqB~^%6kj7j^uK`KQ84|ANN%Dl()$_NwS#(D*;+r$1zY{)EKO z3N7EB|7zf3{XimL{1+tt2-Eu0LH!Ns=koj2=(i2^cLDR9KOmz?{8!}f1H^uDg8L5} z<@*8heNZ^T57e6Fe?jfJSAL4$|A+YBw(dXAceEeyZ4`fj|1A*xAEJI=>+fR)f3)9g ze~tR>DE)_!iGN7s?^Rz$;}_Nc7O40qsNb&6e=dI>kKc!nF#gc!?Y~0(V-=`;QXlW#uU{}A>2@%X)?DC-X$!esK7 zsQ=ZM`(Kdy-Z6yu2U1(+zaaIe9;^R?!uQu-EI&{Pa`**>zvqwgFF1XF{=@tOCt{CZ eaQa)%UNi=LefodELA8|t literal 0 HcmV?d00001 diff --git a/gradle.properties b/gradle.properties index 0d096c5..304d987 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,7 +8,7 @@ org.gradle.jvmargs=-Xmx1G loader_version=0.9.1+build.205 # Mod Properties - mod_version = 2.0.1 + mod_version = 3.0.0 maven_group = eu.midnightdust.motschen archives_base_name = decorative @@ -16,3 +16,4 @@ org.gradle.jvmargs=-Xmx1G # currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api fabric_version=0.17.2+build.396-1.16 patchouli_version=1.16-40-FABRIC + midnighthats_version=1.0.2 diff --git a/src/main/java/eu/midnightdust/motschen/decorative/DecorativeClient.java b/src/main/java/eu/midnightdust/motschen/decorative/DecorativeClient.java index 659c7af..9f9d6cf 100644 --- a/src/main/java/eu/midnightdust/motschen/decorative/DecorativeClient.java +++ b/src/main/java/eu/midnightdust/motschen/decorative/DecorativeClient.java @@ -1,11 +1,14 @@ package eu.midnightdust.motschen.decorative; +import eu.midnightdust.motschen.decorative.block.render.*; import eu.midnightdust.motschen.decorative.entity.client.renderer.*; import eu.midnightdust.motschen.decorative.init.BathTires; +import eu.midnightdust.motschen.decorative.init.BlockEntities; import eu.midnightdust.motschen.decorative.init.Pool; import eu.midnightdust.motschen.decorative.init.Signs; import net.fabricmc.api.ClientModInitializer; import net.fabricmc.fabric.api.blockrenderlayer.v1.BlockRenderLayerMap; +import net.fabricmc.fabric.api.client.rendereregistry.v1.BlockEntityRendererRegistry; import net.fabricmc.fabric.api.client.rendereregistry.v1.EntityRendererRegistry; import net.fabricmc.fabric.api.client.rendering.v1.ColorProviderRegistry; import net.minecraft.block.Block; @@ -17,6 +20,7 @@ public class DecorativeClient implements ClientModInitializer { @Override public void onInitializeClient() { + EntityRendererRegistry.INSTANCE.register(Pool.BEACH_BALL, (dispatcher, context) -> new BeachBallRenderer(dispatcher)); EntityRendererRegistry.INSTANCE.register(BathTires.WHITE_BATH_TIRE, (dispatcher, context) -> new WhiteBathTireRenderer(dispatcher)); @@ -62,6 +66,15 @@ public class DecorativeClient implements ClientModInitializer { BlockRenderLayerMap.INSTANCE.putBlocks(RenderLayer.getCutout(),DecorativeMain.SlidingDoor); BlockRenderLayerMap.INSTANCE.putBlocks(RenderLayer.getTranslucent(),DecorativeMain.BirdBath); + BlockEntityRendererRegistry.INSTANCE.register(BlockEntities.CeilingFanBlockEntity, CeilingFanRenderer::new); + + BlockEntityRendererRegistry.INSTANCE.register(BlockEntities.OakChoppingLogBlockEntity, OakChoppingLogBlockEntityRenderer::new); + BlockEntityRendererRegistry.INSTANCE.register(BlockEntities.SpruceChoppingLogBlockEntity, SpruceChoppingLogBlockEntityRenderer::new); + BlockEntityRendererRegistry.INSTANCE.register(BlockEntities.BirchChoppingLogBlockEntity, BirchChoppingLogBlockEntityRenderer::new); + BlockEntityRendererRegistry.INSTANCE.register(BlockEntities.AcaciaChoppingLogBlockEntity, AcaciaChoppingLogBlockEntityRenderer::new); + BlockEntityRendererRegistry.INSTANCE.register(BlockEntities.JungleChoppingLogBlockEntity, JungleChoppingLogBlockEntityRenderer::new); + BlockEntityRendererRegistry.INSTANCE.register(BlockEntities.DarkOakChoppingLogBlockEntity, DarkOakChoppingLogBlockEntityRenderer::new); + } public void registerBlockColor(Block block, Block templateBlock) { ColorProviderRegistry.BLOCK.register((type, pos, world, layer) -> { diff --git a/src/main/java/eu/midnightdust/motschen/decorative/DecorativeMain.java b/src/main/java/eu/midnightdust/motschen/decorative/DecorativeMain.java index 188b164..5e9b168 100644 --- a/src/main/java/eu/midnightdust/motschen/decorative/DecorativeMain.java +++ b/src/main/java/eu/midnightdust/motschen/decorative/DecorativeMain.java @@ -1,7 +1,13 @@ package eu.midnightdust.motschen.decorative; import eu.midnightdust.motschen.decorative.block.*; +import eu.midnightdust.motschen.decorative.blockstates.CeilingFanStage; +import eu.midnightdust.motschen.decorative.blockstates.Part; +import eu.midnightdust.motschen.decorative.blockstates.PoolShape; +import eu.midnightdust.motschen.decorative.blockstates.Program; import eu.midnightdust.motschen.decorative.init.*; +import eu.midnightdust.motschen.decorative.world.OreFeatureInjector; +import eu.midnightdust.motschen.decorative.world.OreFeatures; import net.fabricmc.api.ModInitializer; import net.fabricmc.fabric.api.client.itemgroup.FabricItemGroupBuilder; import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; @@ -12,18 +18,17 @@ import net.minecraft.state.property.EnumProperty; import net.minecraft.util.Identifier; import net.minecraft.util.registry.Registry; -import java.util.Locale; - public class DecorativeMain implements ModInitializer { public static final String MOD_ID = "decorative"; public static final ItemGroup IndoorGroup = FabricItemGroupBuilder.build(new Identifier(MOD_ID, "indoor"), () -> new ItemStack(DecorativeMain.Television)); public static final ItemGroup TrafficGroup = FabricItemGroupBuilder.build(new Identifier(MOD_ID, "traffic"), () -> new ItemStack(DecorativeMain.TrafficCone)); - public static final ItemGroup GardenGroup = FabricItemGroupBuilder.build(new Identifier(MOD_ID, "garden"), () -> new ItemStack(LogsWithAxes.OakLogWithAxe)); + public static final ItemGroup GardenGroup = FabricItemGroupBuilder.build(new Identifier(MOD_ID, "garden"), () -> new ItemStack(LogsWithAxes.OakChoppingLog)); public static final ItemGroup PoolGroup = FabricItemGroupBuilder.build(new Identifier(MOD_ID, "pool"), () -> new ItemStack(Pool.BEACH_BALL_ITEM)); public static final EnumProperty PROGRAM = EnumProperty.of("program", Program.class); public static final EnumProperty POOL_SHAPE = EnumProperty.of("shape", PoolShape.class); public static final EnumProperty PART = EnumProperty.of("part", Part.class); + public static final EnumProperty STAGE = EnumProperty.of("stage", CeilingFanStage.class); public static Block RockyAsphalt = new Block(FabricBlockSettings.copyOf(Blocks.COAL_ORE)); public static Block Road = new Block(FabricBlockSettings.copyOf(Blocks.STONE)); public static Block RoadWhiteShort = new RotatableBlock(); @@ -47,52 +52,53 @@ public class DecorativeMain implements ModInitializer { public void onInitialize() { BlockEntities.init(); // Traffic // - Registry.register(Registry.BLOCK, new Identifier("decorative","rocky_asphalt"), RockyAsphalt); - Registry.register(Registry.ITEM, new Identifier("decorative","rocky_asphalt"), new BlockItem(RockyAsphalt, new Item.Settings().group(DecorativeMain.TrafficGroup))); - Registry.register(Registry.BLOCK, new Identifier("decorative","road"), Road); - Registry.register(Registry.ITEM, new Identifier("decorative","road"), new BlockItem(Road, new Item.Settings().group(DecorativeMain.TrafficGroup))); - Registry.register(Registry.BLOCK, new Identifier("decorative","road_white_short"), RoadWhiteShort); - Registry.register(Registry.ITEM, new Identifier("decorative","road_white_short"), new BlockItem(RoadWhiteShort, new Item.Settings().group(DecorativeMain.TrafficGroup))); - Registry.register(Registry.BLOCK, new Identifier("decorative","road_white_long"), RoadWhiteLong); - Registry.register(Registry.ITEM, new Identifier("decorative","road_white_long"), new BlockItem(RoadWhiteLong, new Item.Settings().group(DecorativeMain.TrafficGroup))); - Registry.register(Registry.BLOCK, new Identifier("decorative","traffic_cone"), TrafficCone); - Registry.register(Registry.ITEM, new Identifier("decorative","traffic_cone"), new BlockItem(TrafficCone, new Item.Settings().group(DecorativeMain.TrafficGroup))); - Registry.register(Registry.BLOCK, new Identifier("decorative","fire_hydrant"), FireHydrant); - Registry.register(Registry.ITEM, new Identifier("decorative","fire_hydrant"), new BlockItem(FireHydrant, new Item.Settings().group(DecorativeMain.TrafficGroup))); - Registry.register(Registry.BLOCK, new Identifier("decorative","guardrail"), Guardrail); - Registry.register(Registry.ITEM, new Identifier("decorative","guardrail"), new BlockItem(Guardrail, new Item.Settings().group(DecorativeMain.TrafficGroup))); - Registry.register(Registry.BLOCK, new Identifier("decorative","sign_post"), SignPost); - Registry.register(Registry.ITEM, new Identifier("decorative","sign_post"), new BlockItem(SignPost, new Item.Settings().group(DecorativeMain.TrafficGroup))); + Registry.register(Registry.BLOCK, new Identifier(MOD_ID,"rocky_asphalt"), RockyAsphalt); + Registry.register(Registry.ITEM, new Identifier(MOD_ID,"rocky_asphalt"), new BlockItem(RockyAsphalt, new Item.Settings().group(DecorativeMain.TrafficGroup))); + Registry.register(Registry.BLOCK, new Identifier(MOD_ID,"road"), Road); + Registry.register(Registry.ITEM, new Identifier(MOD_ID,"road"), new BlockItem(Road, new Item.Settings().group(DecorativeMain.TrafficGroup))); + Registry.register(Registry.BLOCK, new Identifier(MOD_ID,"road_white_short"), RoadWhiteShort); + Registry.register(Registry.ITEM, new Identifier(MOD_ID,"road_white_short"), new BlockItem(RoadWhiteShort, new Item.Settings().group(DecorativeMain.TrafficGroup))); + Registry.register(Registry.BLOCK, new Identifier(MOD_ID,"road_white_long"), RoadWhiteLong); + Registry.register(Registry.ITEM, new Identifier(MOD_ID,"road_white_long"), new BlockItem(RoadWhiteLong, new Item.Settings().group(DecorativeMain.TrafficGroup))); + Registry.register(Registry.BLOCK, new Identifier(MOD_ID,"traffic_cone"), TrafficCone); + Registry.register(Registry.ITEM, new Identifier(MOD_ID,"traffic_cone"), new BlockItem(TrafficCone, new Item.Settings().group(DecorativeMain.TrafficGroup))); + Registry.register(Registry.BLOCK, new Identifier(MOD_ID,"fire_hydrant"), FireHydrant); + Registry.register(Registry.ITEM, new Identifier(MOD_ID,"fire_hydrant"), new BlockItem(FireHydrant, new Item.Settings().group(DecorativeMain.TrafficGroup))); + Registry.register(Registry.BLOCK, new Identifier(MOD_ID,"guardrail"), Guardrail); + Registry.register(Registry.ITEM, new Identifier(MOD_ID,"guardrail"), new BlockItem(Guardrail, new Item.Settings().group(DecorativeMain.TrafficGroup))); + Registry.register(Registry.BLOCK, new Identifier(MOD_ID,"sign_post"), SignPost); + Registry.register(Registry.ITEM, new Identifier(MOD_ID,"sign_post"), new BlockItem(SignPost, new Item.Settings().group(DecorativeMain.TrafficGroup))); Signs.init(); //Garden// - Registry.register(Registry.BLOCK, new Identifier("decorative","bird_bath"), BirdBath); - Registry.register(Registry.ITEM, new Identifier("decorative","bird_bath"), new BlockItem(BirdBath, new Item.Settings().group(DecorativeMain.GardenGroup))); - Registry.register(Registry.BLOCK, new Identifier("decorative","water_pump"), WaterPump); - Registry.register(Registry.ITEM, new Identifier("decorative","water_pump"), new BlockItem(WaterPump, new Item.Settings().group(DecorativeMain.GardenGroup))); + Registry.register(Registry.BLOCK, new Identifier(MOD_ID,"bird_bath"), BirdBath); + Registry.register(Registry.ITEM, new Identifier(MOD_ID,"bird_bath"), new BlockItem(BirdBath, new Item.Settings().group(DecorativeMain.GardenGroup))); + Registry.register(Registry.BLOCK, new Identifier(MOD_ID,"water_pump"), WaterPump); + Registry.register(Registry.ITEM, new Identifier(MOD_ID,"water_pump"), new BlockItem(WaterPump, new Item.Settings().group(DecorativeMain.GardenGroup))); LogsWithAxes.init(); Pool.init(); - + //Furniture// - Registry.register(Registry.BLOCK, new Identifier("decorative","kitchen_tiles"), KitchenTiles); - Registry.register(Registry.ITEM, new Identifier("decorative","kitchen_tiles"), new BlockItem(KitchenTiles, new Item.Settings().group(DecorativeMain.IndoorGroup))); - Registry.register(Registry.BLOCK, new Identifier("decorative","television"), Television); - Registry.register(Registry.ITEM, new Identifier("decorative","television"), new BlockItem(Television, new Item.Settings().group(DecorativeMain.IndoorGroup))); - Registry.register(Registry.BLOCK, new Identifier("decorative","old_television"), OldTelevision); - Registry.register(Registry.ITEM, new Identifier("decorative","old_television"), new BlockItem(OldTelevision, new Item.Settings().group(DecorativeMain.IndoorGroup))); - Registry.register(Registry.BLOCK, new Identifier("decorative","ceilingfan"), CeilingFan); - Registry.register(Registry.ITEM, new Identifier("decorative","ceilingfan"), new BlockItem(CeilingFan, new Item.Settings().group(DecorativeMain.IndoorGroup))); - Registry.register(Registry.BLOCK, new Identifier("decorative","shower_head"), ShowerHead); - Registry.register(Registry.ITEM, new Identifier("decorative","shower_head"), new BlockItem(ShowerHead, new Item.Settings().group(DecorativeMain.IndoorGroup))); - Registry.register(Registry.BLOCK, new Identifier("decorative","sliding_door"), SlidingDoor); - Registry.register(Registry.ITEM, new Identifier("decorative","sliding_door"), new BlockItem(SlidingDoor, new Item.Settings().group(DecorativeMain.IndoorGroup))); - Registry.register(Registry.BLOCK, new Identifier("decorative","christmas_tree"), ChristmasTree); - Registry.register(Registry.ITEM, new Identifier("decorative","christmas_tree"), new BlockItem(ChristmasTree, new Item.Settings().group(DecorativeMain.IndoorGroup))); - Registry.register(Registry.BLOCK, new Identifier("decorative","christmas_lights"), ChristmasLights); - Registry.register(Registry.ITEM, new Identifier("decorative","christmas_lights"), new BlockItem(ChristmasLights, new Item.Settings().group(DecorativeMain.IndoorGroup))); + Registry.register(Registry.BLOCK, new Identifier(MOD_ID,"kitchen_tiles"), KitchenTiles); + Registry.register(Registry.ITEM, new Identifier(MOD_ID,"kitchen_tiles"), new BlockItem(KitchenTiles, new Item.Settings().group(DecorativeMain.IndoorGroup))); + Registry.register(Registry.BLOCK, new Identifier(MOD_ID,"television"), Television); + Registry.register(Registry.ITEM, new Identifier(MOD_ID,"television"), new BlockItem(Television, new Item.Settings().group(DecorativeMain.IndoorGroup))); + Registry.register(Registry.BLOCK, new Identifier(MOD_ID,"old_television"), OldTelevision); + Registry.register(Registry.ITEM, new Identifier(MOD_ID,"old_television"), new BlockItem(OldTelevision, new Item.Settings().group(DecorativeMain.IndoorGroup))); + Registry.register(Registry.BLOCK, new Identifier(MOD_ID,"ceilingfan"), CeilingFan); + Registry.register(Registry.ITEM, new Identifier(MOD_ID,"ceilingfan"), new BlockItem(CeilingFan, new Item.Settings().group(DecorativeMain.IndoorGroup))); + Registry.register(Registry.BLOCK, new Identifier(MOD_ID,"shower_head"), ShowerHead); + Registry.register(Registry.ITEM, new Identifier(MOD_ID,"shower_head"), new BlockItem(ShowerHead, new Item.Settings().group(DecorativeMain.IndoorGroup))); + Registry.register(Registry.BLOCK, new Identifier(MOD_ID,"sliding_door"), SlidingDoor); + Registry.register(Registry.ITEM, new Identifier(MOD_ID,"sliding_door"), new BlockItem(SlidingDoor, new Item.Settings().group(DecorativeMain.IndoorGroup))); + Registry.register(Registry.BLOCK, new Identifier(MOD_ID,"christmas_tree"), ChristmasTree); + Registry.register(Registry.ITEM, new Identifier(MOD_ID,"christmas_tree"), new BlockItem(ChristmasTree, new Item.Settings().group(DecorativeMain.IndoorGroup))); + Registry.register(Registry.BLOCK, new Identifier(MOD_ID,"christmas_lights"), ChristmasLights); + Registry.register(Registry.ITEM, new Identifier(MOD_ID,"christmas_lights"), new BlockItem(ChristmasLights, new Item.Settings().group(DecorativeMain.IndoorGroup))); Lamps.init(); DoubleLamps.init(); OreFeatures.init(); + OreFeatureInjector.init(); } } diff --git a/src/main/java/eu/midnightdust/motschen/decorative/block/AcaciaChoppingLog.java b/src/main/java/eu/midnightdust/motschen/decorative/block/AcaciaChoppingLog.java new file mode 100644 index 0000000..5d18ff9 --- /dev/null +++ b/src/main/java/eu/midnightdust/motschen/decorative/block/AcaciaChoppingLog.java @@ -0,0 +1,42 @@ +package eu.midnightdust.motschen.decorative.block; + +import eu.midnightdust.motschen.decorative.block.blockentity.AcaciaChoppingLogBlockEntity; +import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; +import net.minecraft.block.*; +import net.minecraft.block.entity.BlockEntity; +import net.minecraft.item.ItemPlacementContext; +import net.minecraft.sound.BlockSoundGroup; +import net.minecraft.state.StateManager; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Direction; +import net.minecraft.world.BlockView; +import net.minecraft.world.WorldView; + +public class AcaciaChoppingLog extends HorizontalFacingBlock implements BlockEntityProvider { + + public AcaciaChoppingLog() { + super(FabricBlockSettings.copy(Blocks.OAK_PLANKS).nonOpaque().sounds(BlockSoundGroup.WOOD)); + this.setDefaultState(this.stateManager.getDefaultState().with(FACING, Direction.NORTH)); + } + + @Override + public BlockState getPlacementState(ItemPlacementContext itemPlacementContext) { + return super.getPlacementState(itemPlacementContext) + .with(FACING, itemPlacementContext.getPlayerFacing().getOpposite()); + } + + @Override + protected void appendProperties(StateManager.Builder builder) { + builder.add(FACING); + } + + public boolean canPlaceAt(BlockState state, WorldView worldView, BlockPos pos) { + return !worldView.isAir(pos.down()); + } + + @Override + public BlockEntity createBlockEntity(BlockView view) { + return new AcaciaChoppingLogBlockEntity(); + } + +} diff --git a/src/main/java/eu/midnightdust/motschen/decorative/block/BirchChoppingLog.java b/src/main/java/eu/midnightdust/motschen/decorative/block/BirchChoppingLog.java new file mode 100644 index 0000000..23479bf --- /dev/null +++ b/src/main/java/eu/midnightdust/motschen/decorative/block/BirchChoppingLog.java @@ -0,0 +1,42 @@ +package eu.midnightdust.motschen.decorative.block; + +import eu.midnightdust.motschen.decorative.block.blockentity.BirchChoppingLogBlockEntity; +import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; +import net.minecraft.block.*; +import net.minecraft.block.entity.BlockEntity; +import net.minecraft.item.ItemPlacementContext; +import net.minecraft.sound.BlockSoundGroup; +import net.minecraft.state.StateManager; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Direction; +import net.minecraft.world.BlockView; +import net.minecraft.world.WorldView; + +public class BirchChoppingLog extends HorizontalFacingBlock implements BlockEntityProvider { + + public BirchChoppingLog() { + super(FabricBlockSettings.copy(Blocks.OAK_PLANKS).nonOpaque().sounds(BlockSoundGroup.WOOD)); + this.setDefaultState(this.stateManager.getDefaultState().with(FACING, Direction.NORTH)); + } + + @Override + public BlockState getPlacementState(ItemPlacementContext itemPlacementContext) { + return super.getPlacementState(itemPlacementContext) + .with(FACING, itemPlacementContext.getPlayerFacing().getOpposite()); + } + + @Override + protected void appendProperties(StateManager.Builder builder) { + builder.add(FACING); + } + + public boolean canPlaceAt(BlockState state, WorldView worldView, BlockPos pos) { + return !worldView.isAir(pos.down()); + } + + @Override + public BlockEntity createBlockEntity(BlockView view) { + return new BirchChoppingLogBlockEntity(); + } + +} diff --git a/src/main/java/eu/midnightdust/motschen/decorative/block/BirdBath.java b/src/main/java/eu/midnightdust/motschen/decorative/block/BirdBath.java index c107b44..8f0b293 100644 --- a/src/main/java/eu/midnightdust/motschen/decorative/block/BirdBath.java +++ b/src/main/java/eu/midnightdust/motschen/decorative/block/BirdBath.java @@ -15,7 +15,6 @@ public class BirdBath extends CauldronBlock { public BirdBath() { super(FabricBlockSettings.copy(Blocks.CAULDRON).nonOpaque().sounds(BlockSoundGroup.STONE)); - this.setDefaultState(this.stateManager.getDefaultState().with(LEVEL, 0)); } @Override @@ -24,11 +23,6 @@ public class BirdBath extends CauldronBlock { .with(LEVEL, 0); } - @Override - protected void appendProperties(StateManager.Builder builder) { - builder.add(LEVEL); - } - @Override public VoxelShape getOutlineShape(BlockState state, BlockView view, BlockPos pos, ShapeContext context) { return SHAPE; diff --git a/src/main/java/eu/midnightdust/motschen/decorative/block/CeilingFan.java b/src/main/java/eu/midnightdust/motschen/decorative/block/CeilingFan.java index 80df747..164f1b8 100644 --- a/src/main/java/eu/midnightdust/motschen/decorative/block/CeilingFan.java +++ b/src/main/java/eu/midnightdust/motschen/decorative/block/CeilingFan.java @@ -1,13 +1,18 @@ package eu.midnightdust.motschen.decorative.block; +import eu.midnightdust.motschen.decorative.blockstates.CeilingFanStage; +import eu.midnightdust.motschen.decorative.DecorativeMain; +import eu.midnightdust.motschen.decorative.block.blockentity.CeilingFanBlockEntity; import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; import net.minecraft.block.*; +import net.minecraft.block.entity.BlockEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemPlacementContext; import net.minecraft.sound.BlockSoundGroup; import net.minecraft.sound.SoundCategory; import net.minecraft.sound.SoundEvents; import net.minecraft.state.StateManager; +import net.minecraft.state.property.EnumProperty; import net.minecraft.util.ActionResult; import net.minecraft.util.Hand; import net.minecraft.util.hit.BlockHitResult; @@ -17,28 +22,38 @@ import net.minecraft.world.BlockView; import net.minecraft.world.World; import net.minecraft.world.WorldView; -public class CeilingFan extends RedstoneLampBlock { +public class CeilingFan extends Block implements BlockEntityProvider { private static final VoxelShape SHAPE; + private static final EnumProperty STAGE = DecorativeMain.STAGE; public CeilingFan() { super(FabricBlockSettings.copy(Blocks.BLACK_CONCRETE).nonOpaque().sounds(BlockSoundGroup.STONE)); - this.setDefaultState(this.stateManager.getDefaultState().with(LIT, true)); + this.setDefaultState(this.stateManager.getDefaultState().with(STAGE, CeilingFanStage.OFF)); + } + + @Override + public BlockEntity createBlockEntity(BlockView view) { + return new CeilingFanBlockEntity(); } @Override public BlockState getPlacementState(ItemPlacementContext itemPlacementContext) { return super.getPlacementState(itemPlacementContext) - .with(LIT, false); + .with(STAGE, CeilingFanStage.OFF); } public ActionResult onUse(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockHitResult hit) { - world.setBlockState(pos, state.with(LIT, Boolean.valueOf(!state.get(LIT)))); - world.playSound(player, pos, SoundEvents.BLOCK_STONE_BUTTON_CLICK_ON, SoundCategory.BLOCKS, 0.2f, 0.5f); - return ActionResult.SUCCESS; + if (state.get(STAGE) == CeilingFanStage.OFF) {world.setBlockState(pos, state.with(STAGE, CeilingFanStage.LEVEL_1));} + if (state.get(STAGE) == CeilingFanStage.LEVEL_1) {world.setBlockState(pos, state.with(STAGE, CeilingFanStage.LEVEL_2));} + if (state.get(STAGE) == CeilingFanStage.LEVEL_2) {world.setBlockState(pos, state.with(STAGE, CeilingFanStage.LEVEL_3));} + if (state.get(STAGE) == CeilingFanStage.LEVEL_3) {world.setBlockState(pos, state.with(STAGE, CeilingFanStage.OFF));} + + world.playSound(player, pos, SoundEvents.BLOCK_STONE_BUTTON_CLICK_ON, SoundCategory.BLOCKS, 0.2f, 0.5f); + return ActionResult.SUCCESS; } @Override protected void appendProperties(StateManager.Builder builder) { - builder.add(LIT); + builder.add(STAGE); } @Override public VoxelShape getOutlineShape(BlockState state, BlockView view, BlockPos pos, ShapeContext context) { diff --git a/src/main/java/eu/midnightdust/motschen/decorative/block/ChristmasLights.java b/src/main/java/eu/midnightdust/motschen/decorative/block/ChristmasLights.java index 23f1118..f8d1f6b 100644 --- a/src/main/java/eu/midnightdust/motschen/decorative/block/ChristmasLights.java +++ b/src/main/java/eu/midnightdust/motschen/decorative/block/ChristmasLights.java @@ -26,7 +26,7 @@ public class ChristmasLights extends HorizontalFacingBlock { private static final VoxelShape EAST_SHAPE; private static final VoxelShape SOUTH_SHAPE; private static final VoxelShape WEST_SHAPE; - public static final BooleanProperty LIT = RedstoneTorchBlock.LIT; + public static final BooleanProperty LIT = RedstoneLampBlock.LIT; public ChristmasLights() { super(FabricBlockSettings.copy(Blocks.REDSTONE_LAMP).nonOpaque().sounds(BlockSoundGroup.STONE)); diff --git a/src/main/java/eu/midnightdust/motschen/decorative/block/DarkOakChoppingLog.java b/src/main/java/eu/midnightdust/motschen/decorative/block/DarkOakChoppingLog.java new file mode 100644 index 0000000..5f045d4 --- /dev/null +++ b/src/main/java/eu/midnightdust/motschen/decorative/block/DarkOakChoppingLog.java @@ -0,0 +1,42 @@ +package eu.midnightdust.motschen.decorative.block; + +import eu.midnightdust.motschen.decorative.block.blockentity.DarkOakChoppingLogBlockEntity; +import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; +import net.minecraft.block.*; +import net.minecraft.block.entity.BlockEntity; +import net.minecraft.item.ItemPlacementContext; +import net.minecraft.sound.BlockSoundGroup; +import net.minecraft.state.StateManager; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Direction; +import net.minecraft.world.BlockView; +import net.minecraft.world.WorldView; + +public class DarkOakChoppingLog extends HorizontalFacingBlock implements BlockEntityProvider { + + public DarkOakChoppingLog() { + super(FabricBlockSettings.copy(Blocks.OAK_PLANKS).nonOpaque().sounds(BlockSoundGroup.WOOD)); + this.setDefaultState(this.stateManager.getDefaultState().with(FACING, Direction.NORTH)); + } + + @Override + public BlockState getPlacementState(ItemPlacementContext itemPlacementContext) { + return super.getPlacementState(itemPlacementContext) + .with(FACING, itemPlacementContext.getPlayerFacing().getOpposite()); + } + + @Override + protected void appendProperties(StateManager.Builder builder) { + builder.add(FACING); + } + + public boolean canPlaceAt(BlockState state, WorldView worldView, BlockPos pos) { + return !worldView.isAir(pos.down()); + } + + @Override + public BlockEntity createBlockEntity(BlockView view) { + return new DarkOakChoppingLogBlockEntity(); + } + +} diff --git a/src/main/java/eu/midnightdust/motschen/decorative/block/DoubleLamp.java b/src/main/java/eu/midnightdust/motschen/decorative/block/DoubleLamp.java index 5cc2a91..6f700f7 100644 --- a/src/main/java/eu/midnightdust/motschen/decorative/block/DoubleLamp.java +++ b/src/main/java/eu/midnightdust/motschen/decorative/block/DoubleLamp.java @@ -1,6 +1,5 @@ package eu.midnightdust.motschen.decorative.block; -import blue.endless.jankson.annotation.Nullable; import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; import net.minecraft.block.*; import net.minecraft.block.enums.DoubleBlockHalf; @@ -8,6 +7,7 @@ import net.minecraft.entity.LivingEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemPlacementContext; import net.minecraft.item.ItemStack; +import net.minecraft.server.world.ServerWorld; import net.minecraft.sound.BlockSoundGroup; import net.minecraft.sound.SoundCategory; import net.minecraft.sound.SoundEvents; @@ -26,11 +26,13 @@ import net.minecraft.world.World; import net.minecraft.world.WorldAccess; import net.minecraft.world.WorldView; -public class DoubleLamp extends RedstoneLampBlock { +import java.util.Random; + +public class DoubleLamp extends Block { private static final VoxelShape SHAPE_TOP; private static final VoxelShape SHAPE_BOTTOM; - public static final BooleanProperty LIT = RedstoneTorchBlock.LIT; + public static final BooleanProperty LIT = RedstoneLampBlock.LIT; public static final EnumProperty HALF = Properties.DOUBLE_BLOCK_HALF; public DoubleLamp() { @@ -45,7 +47,6 @@ public class DoubleLamp extends RedstoneLampBlock { } @Override - @Nullable public BlockState getPlacementState(ItemPlacementContext arg) { return this.getDefaultState().with(LIT, arg.getWorld().isReceivingRedstonePower(arg.getBlockPos())); } diff --git a/src/main/java/eu/midnightdust/motschen/decorative/block/JungleChoppingLog.java b/src/main/java/eu/midnightdust/motschen/decorative/block/JungleChoppingLog.java new file mode 100644 index 0000000..7bdd30e --- /dev/null +++ b/src/main/java/eu/midnightdust/motschen/decorative/block/JungleChoppingLog.java @@ -0,0 +1,42 @@ +package eu.midnightdust.motschen.decorative.block; + +import eu.midnightdust.motschen.decorative.block.blockentity.JungleChoppingLogBlockEntity; +import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; +import net.minecraft.block.*; +import net.minecraft.block.entity.BlockEntity; +import net.minecraft.item.ItemPlacementContext; +import net.minecraft.sound.BlockSoundGroup; +import net.minecraft.state.StateManager; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Direction; +import net.minecraft.world.BlockView; +import net.minecraft.world.WorldView; + +public class JungleChoppingLog extends HorizontalFacingBlock implements BlockEntityProvider { + + public JungleChoppingLog() { + super(FabricBlockSettings.copy(Blocks.OAK_PLANKS).nonOpaque().sounds(BlockSoundGroup.WOOD)); + this.setDefaultState(this.stateManager.getDefaultState().with(FACING, Direction.NORTH)); + } + + @Override + public BlockState getPlacementState(ItemPlacementContext itemPlacementContext) { + return super.getPlacementState(itemPlacementContext) + .with(FACING, itemPlacementContext.getPlayerFacing().getOpposite()); + } + + @Override + protected void appendProperties(StateManager.Builder builder) { + builder.add(FACING); + } + + public boolean canPlaceAt(BlockState state, WorldView worldView, BlockPos pos) { + return !worldView.isAir(pos.down()); + } + + @Override + public BlockEntity createBlockEntity(BlockView view) { + return new JungleChoppingLogBlockEntity(); + } + +} diff --git a/src/main/java/eu/midnightdust/motschen/decorative/block/Lamp.java b/src/main/java/eu/midnightdust/motschen/decorative/block/Lamp.java index 6770590..d313f0f 100644 --- a/src/main/java/eu/midnightdust/motschen/decorative/block/Lamp.java +++ b/src/main/java/eu/midnightdust/motschen/decorative/block/Lamp.java @@ -2,10 +2,14 @@ package eu.midnightdust.motschen.decorative.block; import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; import net.minecraft.block.*; +import net.minecraft.block.enums.DoubleBlockHalf; import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.item.ItemPlacementContext; import net.minecraft.sound.BlockSoundGroup; import net.minecraft.sound.SoundCategory; import net.minecraft.sound.SoundEvents; +import net.minecraft.state.StateManager; +import net.minecraft.state.property.BooleanProperty; import net.minecraft.util.ActionResult; import net.minecraft.util.Hand; import net.minecraft.util.hit.BlockHitResult; @@ -14,11 +18,21 @@ import net.minecraft.util.shape.VoxelShape; import net.minecraft.world.BlockView; import net.minecraft.world.World; -public class Lamp extends RedstoneLampBlock { +public class Lamp extends Block { private static final VoxelShape SHAPE; + public static final BooleanProperty LIT = RedstoneLampBlock.LIT; public Lamp() { super(FabricBlockSettings.copy(Blocks.REDSTONE_LAMP).nonOpaque().sounds(BlockSoundGroup.STONE)); + this.setDefaultState(this.stateManager.getDefaultState().with(LIT, false)); + } + @Override + protected void appendProperties(StateManager.Builder arg) { + arg.add(LIT); + } + @Override + public BlockState getPlacementState(ItemPlacementContext arg) { + return this.getDefaultState().with(LIT, arg.getWorld().isReceivingRedstonePower(arg.getBlockPos())); } public ActionResult onUse(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockHitResult hit) { diff --git a/src/main/java/eu/midnightdust/motschen/decorative/block/LogWithAxe.java b/src/main/java/eu/midnightdust/motschen/decorative/block/OakChoppingLog.java similarity index 70% rename from src/main/java/eu/midnightdust/motschen/decorative/block/LogWithAxe.java rename to src/main/java/eu/midnightdust/motschen/decorative/block/OakChoppingLog.java index 0b61a5e..41874e1 100644 --- a/src/main/java/eu/midnightdust/motschen/decorative/block/LogWithAxe.java +++ b/src/main/java/eu/midnightdust/motschen/decorative/block/OakChoppingLog.java @@ -1,18 +1,21 @@ package eu.midnightdust.motschen.decorative.block; +import eu.midnightdust.motschen.decorative.block.blockentity.OakChoppingLogBlockEntity; import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; import net.minecraft.block.*; +import net.minecraft.block.entity.BlockEntity; import net.minecraft.item.ItemPlacementContext; import net.minecraft.sound.BlockSoundGroup; import net.minecraft.state.StateManager; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; +import net.minecraft.world.BlockView; import net.minecraft.world.WorldView; -public class LogWithAxe extends HorizontalFacingBlock { +public class OakChoppingLog extends HorizontalFacingBlock implements BlockEntityProvider { - public LogWithAxe() { - super(FabricBlockSettings.copy(Blocks.OAK_PLANKS).nonOpaque().sounds(BlockSoundGroup.STONE)); + public OakChoppingLog() { + super(FabricBlockSettings.copy(Blocks.OAK_PLANKS).nonOpaque().sounds(BlockSoundGroup.WOOD)); this.setDefaultState(this.stateManager.getDefaultState().with(FACING, Direction.NORTH)); } @@ -31,4 +34,9 @@ public class LogWithAxe extends HorizontalFacingBlock { return !worldView.isAir(pos.down()); } + @Override + public BlockEntity createBlockEntity(BlockView view) { + return new OakChoppingLogBlockEntity(); + } + } diff --git a/src/main/java/eu/midnightdust/motschen/decorative/block/OldTelevision.java b/src/main/java/eu/midnightdust/motschen/decorative/block/OldTelevision.java index 8d0f405..734e7db 100644 --- a/src/main/java/eu/midnightdust/motschen/decorative/block/OldTelevision.java +++ b/src/main/java/eu/midnightdust/motschen/decorative/block/OldTelevision.java @@ -1,7 +1,7 @@ package eu.midnightdust.motschen.decorative.block; import eu.midnightdust.motschen.decorative.DecorativeMain; -import eu.midnightdust.motschen.decorative.Program; +import eu.midnightdust.motschen.decorative.blockstates.Program; import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; import net.minecraft.block.*; import net.minecraft.entity.player.PlayerEntity; @@ -22,6 +22,8 @@ import net.minecraft.world.BlockView; import net.minecraft.world.World; import net.minecraft.world.WorldView; +import java.util.function.ToIntFunction; + public class OldTelevision extends HorizontalFacingBlock { private static final VoxelShape NORTH_SHAPE; @@ -31,7 +33,7 @@ public class OldTelevision extends HorizontalFacingBlock { private static final EnumProperty PROGRAM = DecorativeMain.PROGRAM; public OldTelevision() { - super(FabricBlockSettings.copy(Blocks.BLACK_CONCRETE).nonOpaque().sounds(BlockSoundGroup.STONE)); + super(FabricBlockSettings.copy(Blocks.BLACK_CONCRETE).nonOpaque().sounds(BlockSoundGroup.STONE).lightLevel(createLightLevelFromBlockState(15))); this.setDefaultState(this.stateManager.getDefaultState().with(FACING, Direction.NORTH).with(PROGRAM, Program.OFF)); } @@ -102,4 +104,15 @@ public class OldTelevision extends HorizontalFacingBlock { return !worldView.isAir(pos.down()); } + private static ToIntFunction createLightLevelFromBlockState(int litLevel) { + return (blockState) -> { + if (blockState.get(PROGRAM) == Program.OFF) { + return 0; + } + else { + return 11; + } + }; + } + } diff --git a/src/main/java/eu/midnightdust/motschen/decorative/block/PoolWall.java b/src/main/java/eu/midnightdust/motschen/decorative/block/PoolWall.java index f6d1f2e..bc19f8f 100644 --- a/src/main/java/eu/midnightdust/motschen/decorative/block/PoolWall.java +++ b/src/main/java/eu/midnightdust/motschen/decorative/block/PoolWall.java @@ -1,7 +1,7 @@ package eu.midnightdust.motschen.decorative.block; import eu.midnightdust.motschen.decorative.DecorativeMain; -import eu.midnightdust.motschen.decorative.PoolShape; +import eu.midnightdust.motschen.decorative.blockstates.PoolShape; import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; import net.minecraft.block.*; import net.minecraft.fluid.FluidState; diff --git a/src/main/java/eu/midnightdust/motschen/decorative/block/Springboard.java b/src/main/java/eu/midnightdust/motschen/decorative/block/Springboard.java index da1b425..fa4784d 100644 --- a/src/main/java/eu/midnightdust/motschen/decorative/block/Springboard.java +++ b/src/main/java/eu/midnightdust/motschen/decorative/block/Springboard.java @@ -1,7 +1,7 @@ package eu.midnightdust.motschen.decorative.block; import eu.midnightdust.motschen.decorative.DecorativeMain; -import eu.midnightdust.motschen.decorative.Part; +import eu.midnightdust.motschen.decorative.blockstates.Part; import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; import net.minecraft.block.*; import net.minecraft.entity.LivingEntity; diff --git a/src/main/java/eu/midnightdust/motschen/decorative/block/SpruceChoppingLog.java b/src/main/java/eu/midnightdust/motschen/decorative/block/SpruceChoppingLog.java new file mode 100644 index 0000000..7e5d20c --- /dev/null +++ b/src/main/java/eu/midnightdust/motschen/decorative/block/SpruceChoppingLog.java @@ -0,0 +1,42 @@ +package eu.midnightdust.motschen.decorative.block; + +import eu.midnightdust.motschen.decorative.block.blockentity.SpruceChoppingLogBlockEntity; +import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; +import net.minecraft.block.*; +import net.minecraft.block.entity.BlockEntity; +import net.minecraft.item.ItemPlacementContext; +import net.minecraft.sound.BlockSoundGroup; +import net.minecraft.state.StateManager; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Direction; +import net.minecraft.world.BlockView; +import net.minecraft.world.WorldView; + +public class SpruceChoppingLog extends HorizontalFacingBlock implements BlockEntityProvider { + + public SpruceChoppingLog() { + super(FabricBlockSettings.copy(Blocks.OAK_PLANKS).nonOpaque().sounds(BlockSoundGroup.WOOD)); + this.setDefaultState(this.stateManager.getDefaultState().with(FACING, Direction.NORTH)); + } + + @Override + public BlockState getPlacementState(ItemPlacementContext itemPlacementContext) { + return super.getPlacementState(itemPlacementContext) + .with(FACING, itemPlacementContext.getPlayerFacing().getOpposite()); + } + + @Override + protected void appendProperties(StateManager.Builder builder) { + builder.add(FACING); + } + + public boolean canPlaceAt(BlockState state, WorldView worldView, BlockPos pos) { + return !worldView.isAir(pos.down()); + } + + @Override + public BlockEntity createBlockEntity(BlockView view) { + return new SpruceChoppingLogBlockEntity(); + } + +} diff --git a/src/main/java/eu/midnightdust/motschen/decorative/block/Television.java b/src/main/java/eu/midnightdust/motschen/decorative/block/Television.java index bc5edd9..28047e9 100644 --- a/src/main/java/eu/midnightdust/motschen/decorative/block/Television.java +++ b/src/main/java/eu/midnightdust/motschen/decorative/block/Television.java @@ -1,7 +1,7 @@ package eu.midnightdust.motschen.decorative.block; import eu.midnightdust.motschen.decorative.DecorativeMain; -import eu.midnightdust.motschen.decorative.Program; +import eu.midnightdust.motschen.decorative.blockstates.Program; import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; import net.minecraft.block.*; import net.minecraft.entity.player.PlayerEntity; @@ -11,6 +11,7 @@ import net.minecraft.sound.SoundCategory; import net.minecraft.sound.SoundEvents; import net.minecraft.state.StateManager; import net.minecraft.state.property.EnumProperty; +import net.minecraft.state.property.Properties; import net.minecraft.util.ActionResult; import net.minecraft.util.Hand; import net.minecraft.util.hit.BlockHitResult; @@ -22,6 +23,8 @@ import net.minecraft.world.BlockView; import net.minecraft.world.World; import net.minecraft.world.WorldView; +import java.util.function.ToIntFunction; + public class Television extends HorizontalFacingBlock { private static final VoxelShape NORTH_SHAPE; @@ -31,7 +34,7 @@ public class Television extends HorizontalFacingBlock { private static final EnumProperty PROGRAM = DecorativeMain.PROGRAM; public Television() { - super(FabricBlockSettings.copy(Blocks.BLACK_CONCRETE).nonOpaque().sounds(BlockSoundGroup.STONE)); + super(FabricBlockSettings.copy(Blocks.BLACK_CONCRETE).nonOpaque().sounds(BlockSoundGroup.STONE).lightLevel(createLightLevelFromBlockState(15))); this.setDefaultState(this.stateManager.getDefaultState().with(FACING, Direction.NORTH).with(PROGRAM, Program.OFF)); } @@ -102,4 +105,16 @@ public class Television extends HorizontalFacingBlock { return !worldView.isAir(pos.down()); } + private static ToIntFunction createLightLevelFromBlockState(int litLevel) { + return (blockState) -> { + if (blockState.get(PROGRAM) == Program.OFF) { + return 0; + } + else { + return 11; + } + }; + } + + } diff --git a/src/main/java/eu/midnightdust/motschen/decorative/block/blockentity/AcaciaChoppingLogBlockEntity.java b/src/main/java/eu/midnightdust/motschen/decorative/block/blockentity/AcaciaChoppingLogBlockEntity.java new file mode 100644 index 0000000..8458c97 --- /dev/null +++ b/src/main/java/eu/midnightdust/motschen/decorative/block/blockentity/AcaciaChoppingLogBlockEntity.java @@ -0,0 +1,61 @@ +package eu.midnightdust.motschen.decorative.block.blockentity; + +import eu.midnightdust.motschen.decorative.init.BlockEntities; +import net.minecraft.block.BlockState; +import net.minecraft.block.HorizontalFacingBlock; +import net.minecraft.block.entity.BlockEntity; +import net.minecraft.util.Tickable; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Direction; + +public class AcaciaChoppingLogBlockEntity extends BlockEntity implements Tickable { + private int facing; + private double axe_x; + private double axe_z; + + public AcaciaChoppingLogBlockEntity() { + super(BlockEntities.AcaciaChoppingLogBlockEntity); + } + + @Override + public void tick() { + + BlockPos pos = this.pos; + BlockState state = this.world.getBlockState(pos); + + if (world != null && state.get(HorizontalFacingBlock.FACING) == Direction.EAST) { + facing = 180; + axe_x = 0.2D; + axe_z = 0.5D; + return; + } + if (world != null && state.get(HorizontalFacingBlock.FACING) == Direction.SOUTH) { + facing = 90; + axe_x = 0.5D; + axe_z = 0.2D; + return; + } + if (world != null && state.get(HorizontalFacingBlock.FACING) == Direction.WEST) { + facing = 0; + axe_x = 0.8D; + axe_z = 0.5D; + return; + } + else { + facing = 270; + axe_x = 0.5D; + axe_z = 0.8D; + return; + } + } + + public int getFacing() { + return facing; + } + public double getAxeX() { + return axe_x; + } + public double getAxeZ() { + return axe_z; + } +} diff --git a/src/main/java/eu/midnightdust/motschen/decorative/block/blockentity/BirchChoppingLogBlockEntity.java b/src/main/java/eu/midnightdust/motschen/decorative/block/blockentity/BirchChoppingLogBlockEntity.java new file mode 100644 index 0000000..5e7f09c --- /dev/null +++ b/src/main/java/eu/midnightdust/motschen/decorative/block/blockentity/BirchChoppingLogBlockEntity.java @@ -0,0 +1,61 @@ +package eu.midnightdust.motschen.decorative.block.blockentity; + +import eu.midnightdust.motschen.decorative.init.BlockEntities; +import net.minecraft.block.BlockState; +import net.minecraft.block.HorizontalFacingBlock; +import net.minecraft.block.entity.BlockEntity; +import net.minecraft.util.Tickable; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Direction; + +public class BirchChoppingLogBlockEntity extends BlockEntity implements Tickable { + private int facing; + private double axe_x; + private double axe_z; + + public BirchChoppingLogBlockEntity() { + super(BlockEntities.BirchChoppingLogBlockEntity); + } + + @Override + public void tick() { + + BlockPos pos = this.pos; + BlockState state = this.world.getBlockState(pos); + + if (world != null && state.get(HorizontalFacingBlock.FACING) == Direction.EAST) { + facing = 180; + axe_x = 0.2D; + axe_z = 0.5D; + return; + } + if (world != null && state.get(HorizontalFacingBlock.FACING) == Direction.SOUTH) { + facing = 90; + axe_x = 0.5D; + axe_z = 0.2D; + return; + } + if (world != null && state.get(HorizontalFacingBlock.FACING) == Direction.WEST) { + facing = 0; + axe_x = 0.8D; + axe_z = 0.5D; + return; + } + else { + facing = 270; + axe_x = 0.5D; + axe_z = 0.8D; + return; + } + } + + public int getFacing() { + return facing; + } + public double getAxeX() { + return axe_x; + } + public double getAxeZ() { + return axe_z; + } +} diff --git a/src/main/java/eu/midnightdust/motschen/decorative/block/blockentity/CeilingFanBlockEntity.java b/src/main/java/eu/midnightdust/motschen/decorative/block/blockentity/CeilingFanBlockEntity.java new file mode 100644 index 0000000..a966e8f --- /dev/null +++ b/src/main/java/eu/midnightdust/motschen/decorative/block/blockentity/CeilingFanBlockEntity.java @@ -0,0 +1,50 @@ +package eu.midnightdust.motschen.decorative.block.blockentity; + +import eu.midnightdust.motschen.decorative.blockstates.CeilingFanStage; +import eu.midnightdust.motschen.decorative.DecorativeMain; +import eu.midnightdust.motschen.decorative.init.BlockEntities; +import eu.midnightdust.motschen.decorative.sound.DecorativeSoundEvents; +import net.minecraft.block.BlockState; +import net.minecraft.block.entity.BlockEntity; +import net.minecraft.sound.SoundCategory; +import net.minecraft.util.Tickable; +import net.minecraft.util.math.BlockPos; + +public class CeilingFanBlockEntity extends BlockEntity implements Tickable { + private int rot; + + public CeilingFanBlockEntity() { + super(BlockEntities.CeilingFanBlockEntity); + } + + + + @Override + public void tick() { + + BlockPos pos = this.pos; + BlockState state = this.world.getBlockState(pos); + if (world != null && state.get(DecorativeMain.STAGE) == CeilingFanStage.LEVEL_1) { + world.playSound(null,pos, DecorativeSoundEvents.CEILINGFAN_AMBIENT, SoundCategory.BLOCKS, 0.1f, 1.0f); + rot = rot + 6; + return; + } + if (world != null && state.get(DecorativeMain.STAGE) == CeilingFanStage.LEVEL_2) { + world.playSound(null,pos, DecorativeSoundEvents.CEILINGFAN_AMBIENT, SoundCategory.BLOCKS, 0.2f, 1.0f); + rot = rot + 10; + return; + } + if (world != null && state.get(DecorativeMain.STAGE) == CeilingFanStage.LEVEL_3) { + world.playSound(null,pos, DecorativeSoundEvents.CEILINGFAN_AMBIENT, SoundCategory.BLOCKS, 0.3f, 1.0f); + rot = rot + 14; + return; + } + else { + rot = rot; + return; + } + } + public int getRot() { + return rot; + } +} diff --git a/src/main/java/eu/midnightdust/motschen/decorative/block/blockentity/DarkOakChoppingLogBlockEntity.java b/src/main/java/eu/midnightdust/motschen/decorative/block/blockentity/DarkOakChoppingLogBlockEntity.java new file mode 100644 index 0000000..e157fd3 --- /dev/null +++ b/src/main/java/eu/midnightdust/motschen/decorative/block/blockentity/DarkOakChoppingLogBlockEntity.java @@ -0,0 +1,61 @@ +package eu.midnightdust.motschen.decorative.block.blockentity; + +import eu.midnightdust.motschen.decorative.init.BlockEntities; +import net.minecraft.block.BlockState; +import net.minecraft.block.HorizontalFacingBlock; +import net.minecraft.block.entity.BlockEntity; +import net.minecraft.util.Tickable; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Direction; + +public class DarkOakChoppingLogBlockEntity extends BlockEntity implements Tickable { + private int facing; + private double axe_x; + private double axe_z; + + public DarkOakChoppingLogBlockEntity() { + super(BlockEntities.DarkOakChoppingLogBlockEntity); + } + + @Override + public void tick() { + + BlockPos pos = this.pos; + BlockState state = this.world.getBlockState(pos); + + if (world != null && state.get(HorizontalFacingBlock.FACING) == Direction.EAST) { + facing = 180; + axe_x = 0.2D; + axe_z = 0.5D; + return; + } + if (world != null && state.get(HorizontalFacingBlock.FACING) == Direction.SOUTH) { + facing = 90; + axe_x = 0.5D; + axe_z = 0.2D; + return; + } + if (world != null && state.get(HorizontalFacingBlock.FACING) == Direction.WEST) { + facing = 0; + axe_x = 0.8D; + axe_z = 0.5D; + return; + } + else { + facing = 270; + axe_x = 0.5D; + axe_z = 0.8D; + return; + } + } + + public int getFacing() { + return facing; + } + public double getAxeX() { + return axe_x; + } + public double getAxeZ() { + return axe_z; + } +} diff --git a/src/main/java/eu/midnightdust/motschen/decorative/block/blockentity/JungleChoppingLogBlockEntity.java b/src/main/java/eu/midnightdust/motschen/decorative/block/blockentity/JungleChoppingLogBlockEntity.java new file mode 100644 index 0000000..603c612 --- /dev/null +++ b/src/main/java/eu/midnightdust/motschen/decorative/block/blockentity/JungleChoppingLogBlockEntity.java @@ -0,0 +1,61 @@ +package eu.midnightdust.motschen.decorative.block.blockentity; + +import eu.midnightdust.motschen.decorative.init.BlockEntities; +import net.minecraft.block.BlockState; +import net.minecraft.block.HorizontalFacingBlock; +import net.minecraft.block.entity.BlockEntity; +import net.minecraft.util.Tickable; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Direction; + +public class JungleChoppingLogBlockEntity extends BlockEntity implements Tickable { + private int facing; + private double axe_x; + private double axe_z; + + public JungleChoppingLogBlockEntity() { + super(BlockEntities.JungleChoppingLogBlockEntity); + } + + @Override + public void tick() { + + BlockPos pos = this.pos; + BlockState state = this.world.getBlockState(pos); + + if (world != null && state.get(HorizontalFacingBlock.FACING) == Direction.EAST) { + facing = 180; + axe_x = 0.2D; + axe_z = 0.5D; + return; + } + if (world != null && state.get(HorizontalFacingBlock.FACING) == Direction.SOUTH) { + facing = 90; + axe_x = 0.5D; + axe_z = 0.2D; + return; + } + if (world != null && state.get(HorizontalFacingBlock.FACING) == Direction.WEST) { + facing = 0; + axe_x = 0.8D; + axe_z = 0.5D; + return; + } + else { + facing = 270; + axe_x = 0.5D; + axe_z = 0.8D; + return; + } + } + + public int getFacing() { + return facing; + } + public double getAxeX() { + return axe_x; + } + public double getAxeZ() { + return axe_z; + } +} diff --git a/src/main/java/eu/midnightdust/motschen/decorative/block/blockentity/OakChoppingLogBlockEntity.java b/src/main/java/eu/midnightdust/motschen/decorative/block/blockentity/OakChoppingLogBlockEntity.java new file mode 100644 index 0000000..ff37c58 --- /dev/null +++ b/src/main/java/eu/midnightdust/motschen/decorative/block/blockentity/OakChoppingLogBlockEntity.java @@ -0,0 +1,61 @@ +package eu.midnightdust.motschen.decorative.block.blockentity; + +import eu.midnightdust.motschen.decorative.init.BlockEntities; +import net.minecraft.block.BlockState; +import net.minecraft.block.HorizontalFacingBlock; +import net.minecraft.block.entity.BlockEntity; +import net.minecraft.util.Tickable; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Direction; + +public class OakChoppingLogBlockEntity extends BlockEntity implements Tickable { + private int facing; + private double axe_x; + private double axe_z; + + public OakChoppingLogBlockEntity() { + super(BlockEntities.OakChoppingLogBlockEntity); + } + + @Override + public void tick() { + + BlockPos pos = this.pos; + BlockState state = this.world.getBlockState(pos); + + if (world != null && state.get(HorizontalFacingBlock.FACING) == Direction.EAST) { + facing = 180; + axe_x = 0.2D; + axe_z = 0.5D; + return; + } + if (world != null && state.get(HorizontalFacingBlock.FACING) == Direction.SOUTH) { + facing = 90; + axe_x = 0.5D; + axe_z = 0.2D; + return; + } + if (world != null && state.get(HorizontalFacingBlock.FACING) == Direction.WEST) { + facing = 0; + axe_x = 0.8D; + axe_z = 0.5D; + return; + } + else { + facing = 270; + axe_x = 0.5D; + axe_z = 0.8D; + return; + } + } + + public int getFacing() { + return facing; + } + public double getAxeX() { + return axe_x; + } + public double getAxeZ() { + return axe_z; + } +} diff --git a/src/main/java/eu/midnightdust/motschen/decorative/block/blockentity/SpruceChoppingLogBlockEntity.java b/src/main/java/eu/midnightdust/motschen/decorative/block/blockentity/SpruceChoppingLogBlockEntity.java new file mode 100644 index 0000000..886bbb6 --- /dev/null +++ b/src/main/java/eu/midnightdust/motschen/decorative/block/blockentity/SpruceChoppingLogBlockEntity.java @@ -0,0 +1,61 @@ +package eu.midnightdust.motschen.decorative.block.blockentity; + +import eu.midnightdust.motschen.decorative.init.BlockEntities; +import net.minecraft.block.BlockState; +import net.minecraft.block.HorizontalFacingBlock; +import net.minecraft.block.entity.BlockEntity; +import net.minecraft.util.Tickable; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Direction; + +public class SpruceChoppingLogBlockEntity extends BlockEntity implements Tickable { + private int facing; + private double axe_x; + private double axe_z; + + public SpruceChoppingLogBlockEntity() { + super(BlockEntities.SpruceChoppingLogBlockEntity); + } + + @Override + public void tick() { + + BlockPos pos = this.pos; + BlockState state = this.world.getBlockState(pos); + + if (world != null && state.get(HorizontalFacingBlock.FACING) == Direction.EAST) { + facing = 180; + axe_x = 0.2D; + axe_z = 0.5D; + return; + } + if (world != null && state.get(HorizontalFacingBlock.FACING) == Direction.SOUTH) { + facing = 90; + axe_x = 0.5D; + axe_z = 0.2D; + return; + } + if (world != null && state.get(HorizontalFacingBlock.FACING) == Direction.WEST) { + facing = 0; + axe_x = 0.8D; + axe_z = 0.5D; + return; + } + else { + facing = 270; + axe_x = 0.5D; + axe_z = 0.8D; + return; + } + } + + public int getFacing() { + return facing; + } + public double getAxeX() { + return axe_x; + } + public double getAxeZ() { + return axe_z; + } +} diff --git a/src/main/java/eu/midnightdust/motschen/decorative/block/render/AcaciaChoppingLogBlockEntityRenderer.java b/src/main/java/eu/midnightdust/motschen/decorative/block/render/AcaciaChoppingLogBlockEntityRenderer.java new file mode 100644 index 0000000..d4fc94c --- /dev/null +++ b/src/main/java/eu/midnightdust/motschen/decorative/block/render/AcaciaChoppingLogBlockEntityRenderer.java @@ -0,0 +1,52 @@ +package eu.midnightdust.motschen.decorative.block.render; + +import eu.midnightdust.motschen.decorative.block.blockentity.AcaciaChoppingLogBlockEntity; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; +import net.minecraft.block.BlockState; +import net.minecraft.client.MinecraftClient; +import net.minecraft.client.render.VertexConsumerProvider; +import net.minecraft.client.render.WorldRenderer; +import net.minecraft.client.render.block.entity.BlockEntityRenderDispatcher; +import net.minecraft.client.render.block.entity.BlockEntityRenderer; +import net.minecraft.client.render.model.json.ModelTransformation; +import net.minecraft.client.util.math.MatrixStack; +import net.minecraft.client.util.math.Vector3f; +import net.minecraft.item.ItemStack; +import net.minecraft.item.Items; +import net.minecraft.util.math.BlockPos; + +@Environment(EnvType.CLIENT) +public class AcaciaChoppingLogBlockEntityRenderer extends BlockEntityRenderer { + + public AcaciaChoppingLogBlockEntityRenderer(BlockEntityRenderDispatcher blockEntityRenderDispatcher) { + super(blockEntityRenderDispatcher); + } + + @Override + public boolean rendersOutsideBoundingBox(AcaciaChoppingLogBlockEntity blockEntity) { + return true; + } + + + @Override + public void render(AcaciaChoppingLogBlockEntity blockEntity, float tickDelta, MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light, int overlay) { + BlockPos pos = blockEntity.getPos(); + BlockState state = blockEntity.getWorld().getBlockState(pos); + + matrices.push(); + int lightAbove = WorldRenderer.getLightmapCoordinates(blockEntity.getWorld(), blockEntity.getPos().up()); + + matrices.translate(blockEntity.getAxeX(), 1.5D, blockEntity.getAxeZ()); + matrices.scale(2.5f,2.5f,2.5f); + + matrices.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(blockEntity.getFacing())); + + matrices.multiply(Vector3f.POSITIVE_Z.getDegreesQuaternion(160)); + MinecraftClient.getInstance().getItemRenderer().renderItem(new ItemStack(Items.IRON_AXE), + ModelTransformation.Mode.GROUND, lightAbove, overlay, matrices, vertexConsumers); + + + matrices.pop(); + } +} diff --git a/src/main/java/eu/midnightdust/motschen/decorative/block/render/BirchChoppingLogBlockEntityRenderer.java b/src/main/java/eu/midnightdust/motschen/decorative/block/render/BirchChoppingLogBlockEntityRenderer.java new file mode 100644 index 0000000..f996252 --- /dev/null +++ b/src/main/java/eu/midnightdust/motschen/decorative/block/render/BirchChoppingLogBlockEntityRenderer.java @@ -0,0 +1,52 @@ +package eu.midnightdust.motschen.decorative.block.render; + +import eu.midnightdust.motschen.decorative.block.blockentity.BirchChoppingLogBlockEntity; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; +import net.minecraft.block.BlockState; +import net.minecraft.client.MinecraftClient; +import net.minecraft.client.render.VertexConsumerProvider; +import net.minecraft.client.render.WorldRenderer; +import net.minecraft.client.render.block.entity.BlockEntityRenderDispatcher; +import net.minecraft.client.render.block.entity.BlockEntityRenderer; +import net.minecraft.client.render.model.json.ModelTransformation; +import net.minecraft.client.util.math.MatrixStack; +import net.minecraft.client.util.math.Vector3f; +import net.minecraft.item.ItemStack; +import net.minecraft.item.Items; +import net.minecraft.util.math.BlockPos; + +@Environment(EnvType.CLIENT) +public class BirchChoppingLogBlockEntityRenderer extends BlockEntityRenderer { + + public BirchChoppingLogBlockEntityRenderer(BlockEntityRenderDispatcher blockEntityRenderDispatcher) { + super(blockEntityRenderDispatcher); + } + + @Override + public boolean rendersOutsideBoundingBox(BirchChoppingLogBlockEntity blockEntity) { + return true; + } + + + @Override + public void render(BirchChoppingLogBlockEntity blockEntity, float tickDelta, MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light, int overlay) { + BlockPos pos = blockEntity.getPos(); + BlockState state = blockEntity.getWorld().getBlockState(pos); + + matrices.push(); + int lightAbove = WorldRenderer.getLightmapCoordinates(blockEntity.getWorld(), blockEntity.getPos().up()); + + matrices.translate(blockEntity.getAxeX(), 1.5D, blockEntity.getAxeZ()); + matrices.scale(2.5f,2.5f,2.5f); + + matrices.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(blockEntity.getFacing())); + + matrices.multiply(Vector3f.POSITIVE_Z.getDegreesQuaternion(160)); + MinecraftClient.getInstance().getItemRenderer().renderItem(new ItemStack(Items.IRON_AXE), + ModelTransformation.Mode.GROUND, lightAbove, overlay, matrices, vertexConsumers); + + + matrices.pop(); + } +} diff --git a/src/main/java/eu/midnightdust/motschen/decorative/block/render/CeilingFanRenderer.java b/src/main/java/eu/midnightdust/motschen/decorative/block/render/CeilingFanRenderer.java new file mode 100644 index 0000000..96c49cb --- /dev/null +++ b/src/main/java/eu/midnightdust/motschen/decorative/block/render/CeilingFanRenderer.java @@ -0,0 +1,58 @@ +package eu.midnightdust.motschen.decorative.block.render; + +import eu.midnightdust.motschen.decorative.block.blockentity.CeilingFanBlockEntity; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; +import net.minecraft.block.DoorBlock; +import net.minecraft.client.model.ModelPart; +import net.minecraft.client.render.OverlayTexture; +import net.minecraft.client.render.RenderLayer; +import net.minecraft.client.render.VertexConsumer; +import net.minecraft.client.render.VertexConsumerProvider; +import net.minecraft.client.render.WorldRenderer; +import net.minecraft.client.render.block.entity.BlockEntityRenderDispatcher; +import net.minecraft.client.render.block.entity.BlockEntityRenderer; +import net.minecraft.client.util.math.MatrixStack; +import net.minecraft.client.util.math.Vector3f; +import net.minecraft.util.Identifier; + +@Environment(EnvType.CLIENT) +public class CeilingFanRenderer extends BlockEntityRenderer { + private static int rot; + private final ModelPart blades; + private final ModelPart point; + + public CeilingFanRenderer(BlockEntityRenderDispatcher blockEntityRenderDispatcher) { + super(blockEntityRenderDispatcher); + blades = new ModelPart(64, 64, 0, 0); + blades.setPivot(0.0F, 0.0F, 0.0F); + blades.addCuboid(-1.0F, 0.0F, 1.0F, 2.0F, 1.0F, 10.0F, 0.0F); + blades.addCuboid(-1.0F, 0.0F, -11.0F, 2.0F, 1.0F, 10.0F, 0.0F); + blades.addCuboid(1.0F, 0.0F, -1.0F, 10.0F, 1.0F, 2.0F, 0.0F); + blades.addCuboid(-11.0F, 0.0F, -1.0F, 10.0F, 1.0F, 2.0F, 0.0F); + point = new ModelPart(32, 32, 16, 0); + point.addCuboid(-1.0F, -1.0F, -1.0F, 2.0F, 2.0F, 2.0F, 0.0F); + blades.addChild(point); + } + + @Override + public boolean rendersOutsideBoundingBox(CeilingFanBlockEntity blockEntity) { + return true; + } + + + @Override + public void render(CeilingFanBlockEntity blockEntity, float tickDelta, MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light, int overlay) { + + matrices.push(); + int lightAtBlock = WorldRenderer.getLightmapCoordinates(blockEntity.getWorld(), blockEntity.getPos()); + VertexConsumer vertexConsumer = vertexConsumers.getBuffer(RenderLayer.getEntityCutoutNoCull(new Identifier("decorative:textures/block/ceilingfan.png"))); + matrices.translate(0.5,0.31,0.5); + + matrices.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(blockEntity.getRot())); + + + blades.render(matrices, vertexConsumer, lightAtBlock, OverlayTexture.DEFAULT_UV, 1.0F, 1.0F, 1.0F, 1.0F); + matrices.pop(); + } +} diff --git a/src/main/java/eu/midnightdust/motschen/decorative/block/render/DarkOakChoppingLogBlockEntityRenderer.java b/src/main/java/eu/midnightdust/motschen/decorative/block/render/DarkOakChoppingLogBlockEntityRenderer.java new file mode 100644 index 0000000..fac8214 --- /dev/null +++ b/src/main/java/eu/midnightdust/motschen/decorative/block/render/DarkOakChoppingLogBlockEntityRenderer.java @@ -0,0 +1,52 @@ +package eu.midnightdust.motschen.decorative.block.render; + +import eu.midnightdust.motschen.decorative.block.blockentity.DarkOakChoppingLogBlockEntity; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; +import net.minecraft.block.BlockState; +import net.minecraft.client.MinecraftClient; +import net.minecraft.client.render.VertexConsumerProvider; +import net.minecraft.client.render.WorldRenderer; +import net.minecraft.client.render.block.entity.BlockEntityRenderDispatcher; +import net.minecraft.client.render.block.entity.BlockEntityRenderer; +import net.minecraft.client.render.model.json.ModelTransformation; +import net.minecraft.client.util.math.MatrixStack; +import net.minecraft.client.util.math.Vector3f; +import net.minecraft.item.ItemStack; +import net.minecraft.item.Items; +import net.minecraft.util.math.BlockPos; + +@Environment(EnvType.CLIENT) +public class DarkOakChoppingLogBlockEntityRenderer extends BlockEntityRenderer { + + public DarkOakChoppingLogBlockEntityRenderer(BlockEntityRenderDispatcher blockEntityRenderDispatcher) { + super(blockEntityRenderDispatcher); + } + + @Override + public boolean rendersOutsideBoundingBox(DarkOakChoppingLogBlockEntity blockEntity) { + return true; + } + + + @Override + public void render(DarkOakChoppingLogBlockEntity blockEntity, float tickDelta, MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light, int overlay) { + BlockPos pos = blockEntity.getPos(); + BlockState state = blockEntity.getWorld().getBlockState(pos); + + matrices.push(); + int lightAbove = WorldRenderer.getLightmapCoordinates(blockEntity.getWorld(), blockEntity.getPos().up()); + + matrices.translate(blockEntity.getAxeX(), 1.5D, blockEntity.getAxeZ()); + matrices.scale(2.5f,2.5f,2.5f); + + matrices.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(blockEntity.getFacing())); + + matrices.multiply(Vector3f.POSITIVE_Z.getDegreesQuaternion(160)); + MinecraftClient.getInstance().getItemRenderer().renderItem(new ItemStack(Items.IRON_AXE), + ModelTransformation.Mode.GROUND, lightAbove, overlay, matrices, vertexConsumers); + + + matrices.pop(); + } +} diff --git a/src/main/java/eu/midnightdust/motschen/decorative/block/render/JungleChoppingLogBlockEntityRenderer.java b/src/main/java/eu/midnightdust/motschen/decorative/block/render/JungleChoppingLogBlockEntityRenderer.java new file mode 100644 index 0000000..d23360b --- /dev/null +++ b/src/main/java/eu/midnightdust/motschen/decorative/block/render/JungleChoppingLogBlockEntityRenderer.java @@ -0,0 +1,52 @@ +package eu.midnightdust.motschen.decorative.block.render; + +import eu.midnightdust.motschen.decorative.block.blockentity.JungleChoppingLogBlockEntity; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; +import net.minecraft.block.BlockState; +import net.minecraft.client.MinecraftClient; +import net.minecraft.client.render.VertexConsumerProvider; +import net.minecraft.client.render.WorldRenderer; +import net.minecraft.client.render.block.entity.BlockEntityRenderDispatcher; +import net.minecraft.client.render.block.entity.BlockEntityRenderer; +import net.minecraft.client.render.model.json.ModelTransformation; +import net.minecraft.client.util.math.MatrixStack; +import net.minecraft.client.util.math.Vector3f; +import net.minecraft.item.ItemStack; +import net.minecraft.item.Items; +import net.minecraft.util.math.BlockPos; + +@Environment(EnvType.CLIENT) +public class JungleChoppingLogBlockEntityRenderer extends BlockEntityRenderer { + + public JungleChoppingLogBlockEntityRenderer(BlockEntityRenderDispatcher blockEntityRenderDispatcher) { + super(blockEntityRenderDispatcher); + } + + @Override + public boolean rendersOutsideBoundingBox(JungleChoppingLogBlockEntity blockEntity) { + return true; + } + + + @Override + public void render(JungleChoppingLogBlockEntity blockEntity, float tickDelta, MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light, int overlay) { + BlockPos pos = blockEntity.getPos(); + BlockState state = blockEntity.getWorld().getBlockState(pos); + + matrices.push(); + int lightAbove = WorldRenderer.getLightmapCoordinates(blockEntity.getWorld(), blockEntity.getPos().up()); + + matrices.translate(blockEntity.getAxeX(), 1.5D, blockEntity.getAxeZ()); + matrices.scale(2.5f,2.5f,2.5f); + + matrices.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(blockEntity.getFacing())); + + matrices.multiply(Vector3f.POSITIVE_Z.getDegreesQuaternion(160)); + MinecraftClient.getInstance().getItemRenderer().renderItem(new ItemStack(Items.IRON_AXE), + ModelTransformation.Mode.GROUND, lightAbove, overlay, matrices, vertexConsumers); + + + matrices.pop(); + } +} diff --git a/src/main/java/eu/midnightdust/motschen/decorative/block/render/OakChoppingLogBlockEntityRenderer.java b/src/main/java/eu/midnightdust/motschen/decorative/block/render/OakChoppingLogBlockEntityRenderer.java new file mode 100644 index 0000000..ffdbb99 --- /dev/null +++ b/src/main/java/eu/midnightdust/motschen/decorative/block/render/OakChoppingLogBlockEntityRenderer.java @@ -0,0 +1,51 @@ +package eu.midnightdust.motschen.decorative.block.render; + +import eu.midnightdust.motschen.decorative.block.blockentity.OakChoppingLogBlockEntity; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; +import net.minecraft.block.BlockState; +import net.minecraft.client.MinecraftClient; +import net.minecraft.client.render.*; +import net.minecraft.client.render.block.entity.BlockEntityRenderDispatcher; +import net.minecraft.client.render.block.entity.BlockEntityRenderer; +import net.minecraft.client.render.model.json.ModelTransformation; +import net.minecraft.client.util.math.MatrixStack; +import net.minecraft.client.util.math.Vector3f; +import net.minecraft.item.ItemStack; +import net.minecraft.item.Items; +import net.minecraft.util.math.BlockPos; + +@Environment(EnvType.CLIENT) +public class OakChoppingLogBlockEntityRenderer extends BlockEntityRenderer { + + public OakChoppingLogBlockEntityRenderer(BlockEntityRenderDispatcher blockEntityRenderDispatcher) { + super(blockEntityRenderDispatcher); + } + + @Override + public boolean rendersOutsideBoundingBox(OakChoppingLogBlockEntity blockEntity) { + return true; + } + + + @Override + public void render(OakChoppingLogBlockEntity blockEntity, float tickDelta, MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light, int overlay) { + BlockPos pos = blockEntity.getPos(); + BlockState state = blockEntity.getWorld().getBlockState(pos); + + matrices.push(); + int lightAbove = WorldRenderer.getLightmapCoordinates(blockEntity.getWorld(), blockEntity.getPos().up()); + + matrices.translate(blockEntity.getAxeX(), 1.5D, blockEntity.getAxeZ()); + matrices.scale(2.5f,2.5f,2.5f); + + matrices.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(blockEntity.getFacing())); + + matrices.multiply(Vector3f.POSITIVE_Z.getDegreesQuaternion(160)); + MinecraftClient.getInstance().getItemRenderer().renderItem(new ItemStack(Items.IRON_AXE), + ModelTransformation.Mode.GROUND, lightAbove, overlay, matrices, vertexConsumers); + + + matrices.pop(); + } +} diff --git a/src/main/java/eu/midnightdust/motschen/decorative/block/render/SpruceChoppingLogBlockEntityRenderer.java b/src/main/java/eu/midnightdust/motschen/decorative/block/render/SpruceChoppingLogBlockEntityRenderer.java new file mode 100644 index 0000000..86e439b --- /dev/null +++ b/src/main/java/eu/midnightdust/motschen/decorative/block/render/SpruceChoppingLogBlockEntityRenderer.java @@ -0,0 +1,52 @@ +package eu.midnightdust.motschen.decorative.block.render; + +import eu.midnightdust.motschen.decorative.block.blockentity.SpruceChoppingLogBlockEntity; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; +import net.minecraft.block.BlockState; +import net.minecraft.client.MinecraftClient; +import net.minecraft.client.render.VertexConsumerProvider; +import net.minecraft.client.render.WorldRenderer; +import net.minecraft.client.render.block.entity.BlockEntityRenderDispatcher; +import net.minecraft.client.render.block.entity.BlockEntityRenderer; +import net.minecraft.client.render.model.json.ModelTransformation; +import net.minecraft.client.util.math.MatrixStack; +import net.minecraft.client.util.math.Vector3f; +import net.minecraft.item.ItemStack; +import net.minecraft.item.Items; +import net.minecraft.util.math.BlockPos; + +@Environment(EnvType.CLIENT) +public class SpruceChoppingLogBlockEntityRenderer extends BlockEntityRenderer { + + public SpruceChoppingLogBlockEntityRenderer(BlockEntityRenderDispatcher blockEntityRenderDispatcher) { + super(blockEntityRenderDispatcher); + } + + @Override + public boolean rendersOutsideBoundingBox(SpruceChoppingLogBlockEntity blockEntity) { + return true; + } + + + @Override + public void render(SpruceChoppingLogBlockEntity blockEntity, float tickDelta, MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light, int overlay) { + BlockPos pos = blockEntity.getPos(); + BlockState state = blockEntity.getWorld().getBlockState(pos); + + matrices.push(); + int lightAbove = WorldRenderer.getLightmapCoordinates(blockEntity.getWorld(), blockEntity.getPos().up()); + + matrices.translate(blockEntity.getAxeX(), 1.5D, blockEntity.getAxeZ()); + matrices.scale(2.5f,2.5f,2.5f); + + matrices.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(blockEntity.getFacing())); + + matrices.multiply(Vector3f.POSITIVE_Z.getDegreesQuaternion(160)); + MinecraftClient.getInstance().getItemRenderer().renderItem(new ItemStack(Items.IRON_AXE), + ModelTransformation.Mode.GROUND, lightAbove, overlay, matrices, vertexConsumers); + + + matrices.pop(); + } +} diff --git a/src/main/java/eu/midnightdust/motschen/decorative/blockstates/CeilingFanStage.java b/src/main/java/eu/midnightdust/motschen/decorative/blockstates/CeilingFanStage.java new file mode 100644 index 0000000..86aafe3 --- /dev/null +++ b/src/main/java/eu/midnightdust/motschen/decorative/blockstates/CeilingFanStage.java @@ -0,0 +1,24 @@ +package eu.midnightdust.motschen.decorative.blockstates; + +import net.minecraft.util.StringIdentifiable; + +public enum CeilingFanStage implements StringIdentifiable { + OFF("off"), + LEVEL_1("level1"), + LEVEL_2("level2"), + LEVEL_3("level3"); + + private final String name; + + CeilingFanStage(String name) { + this.name = name; + } + + public String toString() { + return this.name; + } + + public String asString() { + return this.name; + } +} diff --git a/src/main/java/eu/midnightdust/motschen/decorative/Part.java b/src/main/java/eu/midnightdust/motschen/decorative/blockstates/Part.java similarity index 86% rename from src/main/java/eu/midnightdust/motschen/decorative/Part.java rename to src/main/java/eu/midnightdust/motschen/decorative/blockstates/Part.java index bbb73ca..4387875 100644 --- a/src/main/java/eu/midnightdust/motschen/decorative/Part.java +++ b/src/main/java/eu/midnightdust/motschen/decorative/blockstates/Part.java @@ -1,4 +1,4 @@ -package eu.midnightdust.motschen.decorative; +package eu.midnightdust.motschen.decorative.blockstates; import net.minecraft.util.StringIdentifiable; diff --git a/src/main/java/eu/midnightdust/motschen/decorative/PoolShape.java b/src/main/java/eu/midnightdust/motschen/decorative/blockstates/PoolShape.java similarity index 87% rename from src/main/java/eu/midnightdust/motschen/decorative/PoolShape.java rename to src/main/java/eu/midnightdust/motschen/decorative/blockstates/PoolShape.java index ff0be62..436647b 100644 --- a/src/main/java/eu/midnightdust/motschen/decorative/PoolShape.java +++ b/src/main/java/eu/midnightdust/motschen/decorative/blockstates/PoolShape.java @@ -1,4 +1,4 @@ -package eu.midnightdust.motschen.decorative; +package eu.midnightdust.motschen.decorative.blockstates; import net.minecraft.util.StringIdentifiable; diff --git a/src/main/java/eu/midnightdust/motschen/decorative/Program.java b/src/main/java/eu/midnightdust/motschen/decorative/blockstates/Program.java similarity index 88% rename from src/main/java/eu/midnightdust/motschen/decorative/Program.java rename to src/main/java/eu/midnightdust/motschen/decorative/blockstates/Program.java index e67ae82..e4eed8d 100644 --- a/src/main/java/eu/midnightdust/motschen/decorative/Program.java +++ b/src/main/java/eu/midnightdust/motschen/decorative/blockstates/Program.java @@ -1,4 +1,4 @@ -package eu.midnightdust.motschen.decorative; +package eu.midnightdust.motschen.decorative.blockstates; import net.minecraft.util.StringIdentifiable; diff --git a/src/main/java/eu/midnightdust/motschen/decorative/init/BathTires.java b/src/main/java/eu/midnightdust/motschen/decorative/init/BathTires.java index 24cbb6f..3ff04ae 100644 --- a/src/main/java/eu/midnightdust/motschen/decorative/init/BathTires.java +++ b/src/main/java/eu/midnightdust/motschen/decorative/init/BathTires.java @@ -16,76 +16,76 @@ import net.minecraft.util.registry.Registry; public class BathTires { public static final EntityType WHITE_BATH_TIRE = - Registry.register(Registry.ENTITY_TYPE,new Identifier("decorative","white_bath_tire"), FabricEntityTypeBuilder.create(SpawnGroup.AMBIENT,BathTireEntity::new).dimensions(EntityDimensions.fixed(1.5f,1)).trackable(100,4).build()); + Registry.register(Registry.ENTITY_TYPE,new Identifier(DecorativeMain.MOD_ID,"white_bath_tire"), FabricEntityTypeBuilder.create(SpawnGroup.AMBIENT,BathTireEntity::new).dimensions(EntityDimensions.fixed(1.5f,1)).trackable(100,4).build()); public static final EntityType ORANGE_BATH_TIRE = - Registry.register(Registry.ENTITY_TYPE,new Identifier("decorative","orange_bath_tire"), FabricEntityTypeBuilder.create(SpawnGroup.AMBIENT,BathTireEntity::new).dimensions(EntityDimensions.fixed(1.5f,1)).trackable(100,4).build()); + Registry.register(Registry.ENTITY_TYPE,new Identifier(DecorativeMain.MOD_ID,"orange_bath_tire"), FabricEntityTypeBuilder.create(SpawnGroup.AMBIENT,BathTireEntity::new).dimensions(EntityDimensions.fixed(1.5f,1)).trackable(100,4).build()); public static final EntityType MAGENTA_BATH_TIRE= - Registry.register(Registry.ENTITY_TYPE,new Identifier("decorative","magenta_bath_tire"), FabricEntityTypeBuilder.create(SpawnGroup.AMBIENT,BathTireEntity::new).dimensions(EntityDimensions.fixed(1.5f,1)).trackable(100,4).build()); + Registry.register(Registry.ENTITY_TYPE,new Identifier(DecorativeMain.MOD_ID,"magenta_bath_tire"), FabricEntityTypeBuilder.create(SpawnGroup.AMBIENT,BathTireEntity::new).dimensions(EntityDimensions.fixed(1.5f,1)).trackable(100,4).build()); public static final EntityType LIGHT_BLUE_BATH_TIRE = - Registry.register(Registry.ENTITY_TYPE,new Identifier("decorative","light_blue_bath_tire"), FabricEntityTypeBuilder.create(SpawnGroup.AMBIENT,BathTireEntity::new).dimensions(EntityDimensions.fixed(1.5f,1)).trackable(100,4).build()); + Registry.register(Registry.ENTITY_TYPE,new Identifier(DecorativeMain.MOD_ID,"light_blue_bath_tire"), FabricEntityTypeBuilder.create(SpawnGroup.AMBIENT,BathTireEntity::new).dimensions(EntityDimensions.fixed(1.5f,1)).trackable(100,4).build()); public static final EntityType YELLOW_BATH_TIRE = - Registry.register(Registry.ENTITY_TYPE,new Identifier("decorative","yellow_bath_tire"), FabricEntityTypeBuilder.create(SpawnGroup.AMBIENT,BathTireEntity::new).dimensions(EntityDimensions.fixed(1.5f,1)).trackable(100,4).build()); + Registry.register(Registry.ENTITY_TYPE,new Identifier(DecorativeMain.MOD_ID,"yellow_bath_tire"), FabricEntityTypeBuilder.create(SpawnGroup.AMBIENT,BathTireEntity::new).dimensions(EntityDimensions.fixed(1.5f,1)).trackable(100,4).build()); public static final EntityType LIME_BATH_TIRE = - Registry.register(Registry.ENTITY_TYPE,new Identifier("decorative","lime_bath_tire"), FabricEntityTypeBuilder.create(SpawnGroup.AMBIENT,BathTireEntity::new).dimensions(EntityDimensions.fixed(1.5f,1)).trackable(100,4).build()); + Registry.register(Registry.ENTITY_TYPE,new Identifier(DecorativeMain.MOD_ID,"lime_bath_tire"), FabricEntityTypeBuilder.create(SpawnGroup.AMBIENT,BathTireEntity::new).dimensions(EntityDimensions.fixed(1.5f,1)).trackable(100,4).build()); public static final EntityType PINK_BATH_TIRE = - Registry.register(Registry.ENTITY_TYPE,new Identifier("decorative","pink_bath_tire"), FabricEntityTypeBuilder.create(SpawnGroup.AMBIENT,BathTireEntity::new).dimensions(EntityDimensions.fixed(1.5f,1)).trackable(100,4).build()); + Registry.register(Registry.ENTITY_TYPE,new Identifier(DecorativeMain.MOD_ID,"pink_bath_tire"), FabricEntityTypeBuilder.create(SpawnGroup.AMBIENT,BathTireEntity::new).dimensions(EntityDimensions.fixed(1.5f,1)).trackable(100,4).build()); public static final EntityType GRAY_BATH_TIRE = - Registry.register(Registry.ENTITY_TYPE,new Identifier("decorative","gray_bath_tire"), FabricEntityTypeBuilder.create(SpawnGroup.AMBIENT,BathTireEntity::new).dimensions(EntityDimensions.fixed(1.5f,1)).trackable(100,4).build()); + Registry.register(Registry.ENTITY_TYPE,new Identifier(DecorativeMain.MOD_ID,"gray_bath_tire"), FabricEntityTypeBuilder.create(SpawnGroup.AMBIENT,BathTireEntity::new).dimensions(EntityDimensions.fixed(1.5f,1)).trackable(100,4).build()); public static final EntityType LIGHT_GRAY_BATH_TIRE = - Registry.register(Registry.ENTITY_TYPE,new Identifier("decorative","light_gray_bath_tire"), FabricEntityTypeBuilder.create(SpawnGroup.AMBIENT,BathTireEntity::new).dimensions(EntityDimensions.fixed(1.5f,1)).trackable(100,4).build()); + Registry.register(Registry.ENTITY_TYPE,new Identifier(DecorativeMain.MOD_ID,"light_gray_bath_tire"), FabricEntityTypeBuilder.create(SpawnGroup.AMBIENT,BathTireEntity::new).dimensions(EntityDimensions.fixed(1.5f,1)).trackable(100,4).build()); public static final EntityType CYAN_BATH_TIRE = - Registry.register(Registry.ENTITY_TYPE,new Identifier("decorative","cyan_bath_tire"), FabricEntityTypeBuilder.create(SpawnGroup.AMBIENT,BathTireEntity::new).dimensions(EntityDimensions.fixed(1.5f,1)).trackable(100,4).build()); + Registry.register(Registry.ENTITY_TYPE,new Identifier(DecorativeMain.MOD_ID,"cyan_bath_tire"), FabricEntityTypeBuilder.create(SpawnGroup.AMBIENT,BathTireEntity::new).dimensions(EntityDimensions.fixed(1.5f,1)).trackable(100,4).build()); public static final EntityType PURPLE_BATH_TIRE = - Registry.register(Registry.ENTITY_TYPE,new Identifier("decorative","purple_bath_tire"), FabricEntityTypeBuilder.create(SpawnGroup.AMBIENT,BathTireEntity::new).dimensions(EntityDimensions.fixed(1.5f,1)).trackable(100,4).build()); + Registry.register(Registry.ENTITY_TYPE,new Identifier(DecorativeMain.MOD_ID,"purple_bath_tire"), FabricEntityTypeBuilder.create(SpawnGroup.AMBIENT,BathTireEntity::new).dimensions(EntityDimensions.fixed(1.5f,1)).trackable(100,4).build()); public static final EntityType BLUE_BATH_TIRE = - Registry.register(Registry.ENTITY_TYPE,new Identifier("decorative","blue_bath_tire"), FabricEntityTypeBuilder.create(SpawnGroup.AMBIENT,BathTireEntity::new).dimensions(EntityDimensions.fixed(1.5f,1)).trackable(100,4).build()); + Registry.register(Registry.ENTITY_TYPE,new Identifier(DecorativeMain.MOD_ID,"blue_bath_tire"), FabricEntityTypeBuilder.create(SpawnGroup.AMBIENT,BathTireEntity::new).dimensions(EntityDimensions.fixed(1.5f,1)).trackable(100,4).build()); public static final EntityType BROWN_BATH_TIRE = - Registry.register(Registry.ENTITY_TYPE,new Identifier("decorative","brown_bath_tire"), FabricEntityTypeBuilder.create(SpawnGroup.AMBIENT,BathTireEntity::new).dimensions(EntityDimensions.fixed(1.5f,1)).trackable(100,4).build()); + Registry.register(Registry.ENTITY_TYPE,new Identifier(DecorativeMain.MOD_ID,"brown_bath_tire"), FabricEntityTypeBuilder.create(SpawnGroup.AMBIENT,BathTireEntity::new).dimensions(EntityDimensions.fixed(1.5f,1)).trackable(100,4).build()); public static final EntityType GREEN_BATH_TIRE = - Registry.register(Registry.ENTITY_TYPE,new Identifier("decorative","green_bath_tire"), FabricEntityTypeBuilder.create(SpawnGroup.AMBIENT,BathTireEntity::new).dimensions(EntityDimensions.fixed(1.5f,1)).trackable(100,4).build()); + Registry.register(Registry.ENTITY_TYPE,new Identifier(DecorativeMain.MOD_ID,"green_bath_tire"), FabricEntityTypeBuilder.create(SpawnGroup.AMBIENT,BathTireEntity::new).dimensions(EntityDimensions.fixed(1.5f,1)).trackable(100,4).build()); public static final EntityType RED_BATH_TIRE = - Registry.register(Registry.ENTITY_TYPE,new Identifier("decorative","red_bath_tire"), FabricEntityTypeBuilder.create(SpawnGroup.AMBIENT,BathTireEntity::new).dimensions(EntityDimensions.fixed(1.5f,1)).trackable(100,4).build()); + Registry.register(Registry.ENTITY_TYPE,new Identifier(DecorativeMain.MOD_ID,"red_bath_tire"), FabricEntityTypeBuilder.create(SpawnGroup.AMBIENT,BathTireEntity::new).dimensions(EntityDimensions.fixed(1.5f,1)).trackable(100,4).build()); public static final EntityType BLACK_BATH_TIRE = - Registry.register(Registry.ENTITY_TYPE,new Identifier("decorative","black_bath_tire"), FabricEntityTypeBuilder.create(SpawnGroup.AMBIENT,BathTireEntity::new).dimensions(EntityDimensions.fixed(1.5f,1)).trackable(100,4).build()); + Registry.register(Registry.ENTITY_TYPE,new Identifier(DecorativeMain.MOD_ID,"black_bath_tire"), FabricEntityTypeBuilder.create(SpawnGroup.AMBIENT,BathTireEntity::new).dimensions(EntityDimensions.fixed(1.5f,1)).trackable(100,4).build()); public static final EntityType DUCK_BATH_TIRE = - Registry.register(Registry.ENTITY_TYPE,new Identifier("decorative","duck_bath_tire"), FabricEntityTypeBuilder.create(SpawnGroup.AMBIENT,BathTireEntity::new).dimensions(EntityDimensions.fixed(1.5f,1)).trackable(100,4).build()); + Registry.register(Registry.ENTITY_TYPE,new Identifier(DecorativeMain.MOD_ID,"duck_bath_tire"), FabricEntityTypeBuilder.create(SpawnGroup.AMBIENT,BathTireEntity::new).dimensions(EntityDimensions.fixed(1.5f,1)).trackable(100,4).build()); public static void init() { - Registry.register(Registry.ITEM, new Identifier("decorative","white_bath_tire"), new BathTireItem(WHITE_BATH_TIRE, new Item.Settings().group(DecorativeMain.PoolGroup))); + Registry.register(Registry.ITEM, new Identifier(DecorativeMain.MOD_ID,"white_bath_tire"), new BathTireItem(WHITE_BATH_TIRE, new Item.Settings().group(DecorativeMain.PoolGroup))); FabricDefaultAttributeRegistry.register(WHITE_BATH_TIRE, MobEntity.createMobAttributes().add(EntityAttributes.GENERIC_MAX_HEALTH, 2.0D)); - Registry.register(Registry.ITEM, new Identifier("decorative","orange_bath_tire"), new BathTireItem(ORANGE_BATH_TIRE, new Item.Settings().group(DecorativeMain.PoolGroup))); + Registry.register(Registry.ITEM, new Identifier(DecorativeMain.MOD_ID,"orange_bath_tire"), new BathTireItem(ORANGE_BATH_TIRE, new Item.Settings().group(DecorativeMain.PoolGroup))); FabricDefaultAttributeRegistry.register(ORANGE_BATH_TIRE, MobEntity.createMobAttributes().add(EntityAttributes.GENERIC_MAX_HEALTH, 2.0D)); - Registry.register(Registry.ITEM, new Identifier("decorative","magenta_bath_tire"), new BathTireItem(MAGENTA_BATH_TIRE, new Item.Settings().group(DecorativeMain.PoolGroup))); + Registry.register(Registry.ITEM, new Identifier(DecorativeMain.MOD_ID,"magenta_bath_tire"), new BathTireItem(MAGENTA_BATH_TIRE, new Item.Settings().group(DecorativeMain.PoolGroup))); FabricDefaultAttributeRegistry.register(MAGENTA_BATH_TIRE, MobEntity.createMobAttributes().add(EntityAttributes.GENERIC_MAX_HEALTH, 2.0D)); - Registry.register(Registry.ITEM, new Identifier("decorative","light_blue_bath_tire"), new BathTireItem(LIGHT_BLUE_BATH_TIRE, new Item.Settings().group(DecorativeMain.PoolGroup))); + Registry.register(Registry.ITEM, new Identifier(DecorativeMain.MOD_ID,"light_blue_bath_tire"), new BathTireItem(LIGHT_BLUE_BATH_TIRE, new Item.Settings().group(DecorativeMain.PoolGroup))); FabricDefaultAttributeRegistry.register(LIGHT_BLUE_BATH_TIRE, MobEntity.createMobAttributes().add(EntityAttributes.GENERIC_MAX_HEALTH, 2.0D)); - Registry.register(Registry.ITEM, new Identifier("decorative","yellow_bath_tire"), new BathTireItem(YELLOW_BATH_TIRE, new Item.Settings().group(DecorativeMain.PoolGroup))); + Registry.register(Registry.ITEM, new Identifier(DecorativeMain.MOD_ID,"yellow_bath_tire"), new BathTireItem(YELLOW_BATH_TIRE, new Item.Settings().group(DecorativeMain.PoolGroup))); FabricDefaultAttributeRegistry.register(YELLOW_BATH_TIRE, MobEntity.createMobAttributes().add(EntityAttributes.GENERIC_MAX_HEALTH, 2.0D)); - Registry.register(Registry.ITEM, new Identifier("decorative","lime_bath_tire"), new BathTireItem(LIME_BATH_TIRE, new Item.Settings().group(DecorativeMain.PoolGroup))); + Registry.register(Registry.ITEM, new Identifier(DecorativeMain.MOD_ID,"lime_bath_tire"), new BathTireItem(LIME_BATH_TIRE, new Item.Settings().group(DecorativeMain.PoolGroup))); FabricDefaultAttributeRegistry.register(LIME_BATH_TIRE, MobEntity.createMobAttributes().add(EntityAttributes.GENERIC_MAX_HEALTH, 2.0D)); - Registry.register(Registry.ITEM, new Identifier("decorative","pink_bath_tire"), new BathTireItem(PINK_BATH_TIRE, new Item.Settings().group(DecorativeMain.PoolGroup))); + Registry.register(Registry.ITEM, new Identifier(DecorativeMain.MOD_ID,"pink_bath_tire"), new BathTireItem(PINK_BATH_TIRE, new Item.Settings().group(DecorativeMain.PoolGroup))); FabricDefaultAttributeRegistry.register(PINK_BATH_TIRE, MobEntity.createMobAttributes().add(EntityAttributes.GENERIC_MAX_HEALTH, 2.0D)); - Registry.register(Registry.ITEM, new Identifier("decorative","gray_bath_tire"), new BathTireItem(GRAY_BATH_TIRE, new Item.Settings().group(DecorativeMain.PoolGroup))); + Registry.register(Registry.ITEM, new Identifier(DecorativeMain.MOD_ID,"gray_bath_tire"), new BathTireItem(GRAY_BATH_TIRE, new Item.Settings().group(DecorativeMain.PoolGroup))); FabricDefaultAttributeRegistry.register(GRAY_BATH_TIRE, MobEntity.createMobAttributes().add(EntityAttributes.GENERIC_MAX_HEALTH, 2.0D)); - Registry.register(Registry.ITEM, new Identifier("decorative","light_gray_bath_tire"), new BathTireItem(LIGHT_GRAY_BATH_TIRE, new Item.Settings().group(DecorativeMain.PoolGroup))); + Registry.register(Registry.ITEM, new Identifier(DecorativeMain.MOD_ID,"light_gray_bath_tire"), new BathTireItem(LIGHT_GRAY_BATH_TIRE, new Item.Settings().group(DecorativeMain.PoolGroup))); FabricDefaultAttributeRegistry.register(LIGHT_GRAY_BATH_TIRE, MobEntity.createMobAttributes().add(EntityAttributes.GENERIC_MAX_HEALTH, 2.0D)); - Registry.register(Registry.ITEM, new Identifier("decorative","cyan_bath_tire"), new BathTireItem(CYAN_BATH_TIRE, new Item.Settings().group(DecorativeMain.PoolGroup))); + Registry.register(Registry.ITEM, new Identifier(DecorativeMain.MOD_ID,"cyan_bath_tire"), new BathTireItem(CYAN_BATH_TIRE, new Item.Settings().group(DecorativeMain.PoolGroup))); FabricDefaultAttributeRegistry.register(CYAN_BATH_TIRE, MobEntity.createMobAttributes().add(EntityAttributes.GENERIC_MAX_HEALTH, 2.0D)); - Registry.register(Registry.ITEM, new Identifier("decorative","purple_bath_tire"), new BathTireItem(PURPLE_BATH_TIRE, new Item.Settings().group(DecorativeMain.PoolGroup))); + Registry.register(Registry.ITEM, new Identifier(DecorativeMain.MOD_ID,"purple_bath_tire"), new BathTireItem(PURPLE_BATH_TIRE, new Item.Settings().group(DecorativeMain.PoolGroup))); FabricDefaultAttributeRegistry.register(PURPLE_BATH_TIRE, MobEntity.createMobAttributes().add(EntityAttributes.GENERIC_MAX_HEALTH, 2.0D)); - Registry.register(Registry.ITEM, new Identifier("decorative","blue_bath_tire"), new BathTireItem(BLUE_BATH_TIRE, new Item.Settings().group(DecorativeMain.PoolGroup))); + Registry.register(Registry.ITEM, new Identifier(DecorativeMain.MOD_ID,"blue_bath_tire"), new BathTireItem(BLUE_BATH_TIRE, new Item.Settings().group(DecorativeMain.PoolGroup))); FabricDefaultAttributeRegistry.register(BLUE_BATH_TIRE, MobEntity.createMobAttributes().add(EntityAttributes.GENERIC_MAX_HEALTH, 2.0D)); - Registry.register(Registry.ITEM, new Identifier("decorative","brown_bath_tire"), new BathTireItem(BROWN_BATH_TIRE, new Item.Settings().group(DecorativeMain.PoolGroup))); + Registry.register(Registry.ITEM, new Identifier(DecorativeMain.MOD_ID,"brown_bath_tire"), new BathTireItem(BROWN_BATH_TIRE, new Item.Settings().group(DecorativeMain.PoolGroup))); FabricDefaultAttributeRegistry.register(BROWN_BATH_TIRE, MobEntity.createMobAttributes().add(EntityAttributes.GENERIC_MAX_HEALTH, 2.0D)); - Registry.register(Registry.ITEM, new Identifier("decorative","green_bath_tire"), new BathTireItem(GREEN_BATH_TIRE, new Item.Settings().group(DecorativeMain.PoolGroup))); + Registry.register(Registry.ITEM, new Identifier(DecorativeMain.MOD_ID,"green_bath_tire"), new BathTireItem(GREEN_BATH_TIRE, new Item.Settings().group(DecorativeMain.PoolGroup))); FabricDefaultAttributeRegistry.register(GREEN_BATH_TIRE, MobEntity.createMobAttributes().add(EntityAttributes.GENERIC_MAX_HEALTH, 2.0D)); - Registry.register(Registry.ITEM, new Identifier("decorative","red_bath_tire"), new BathTireItem(RED_BATH_TIRE, new Item.Settings().group(DecorativeMain.PoolGroup))); + Registry.register(Registry.ITEM, new Identifier(DecorativeMain.MOD_ID,"red_bath_tire"), new BathTireItem(RED_BATH_TIRE, new Item.Settings().group(DecorativeMain.PoolGroup))); FabricDefaultAttributeRegistry.register(RED_BATH_TIRE, MobEntity.createMobAttributes().add(EntityAttributes.GENERIC_MAX_HEALTH, 2.0D)); - Registry.register(Registry.ITEM, new Identifier("decorative","black_bath_tire"), new BathTireItem(BLACK_BATH_TIRE, new Item.Settings().group(DecorativeMain.PoolGroup))); + Registry.register(Registry.ITEM, new Identifier(DecorativeMain.MOD_ID,"black_bath_tire"), new BathTireItem(BLACK_BATH_TIRE, new Item.Settings().group(DecorativeMain.PoolGroup))); FabricDefaultAttributeRegistry.register(BLACK_BATH_TIRE, MobEntity.createMobAttributes().add(EntityAttributes.GENERIC_MAX_HEALTH, 2.0D)); - Registry.register(Registry.ITEM, new Identifier("decorative","duck_bath_tire"), new BathTireItem(DUCK_BATH_TIRE, new Item.Settings().group(DecorativeMain.PoolGroup))); + Registry.register(Registry.ITEM, new Identifier(DecorativeMain.MOD_ID,"duck_bath_tire"), new BathTireItem(DUCK_BATH_TIRE, new Item.Settings().group(DecorativeMain.PoolGroup))); FabricDefaultAttributeRegistry.register(DUCK_BATH_TIRE, MobEntity.createMobAttributes().add(EntityAttributes.GENERIC_MAX_HEALTH, 2.0D)); } } diff --git a/src/main/java/eu/midnightdust/motschen/decorative/init/BlockEntities.java b/src/main/java/eu/midnightdust/motschen/decorative/init/BlockEntities.java index ac59c19..33c61fc 100644 --- a/src/main/java/eu/midnightdust/motschen/decorative/init/BlockEntities.java +++ b/src/main/java/eu/midnightdust/motschen/decorative/init/BlockEntities.java @@ -1,8 +1,7 @@ package eu.midnightdust.motschen.decorative.init; import eu.midnightdust.motschen.decorative.DecorativeMain; -import eu.midnightdust.motschen.decorative.block.blockentity.PoolSprinklerBlockEntity; -import eu.midnightdust.motschen.decorative.block.blockentity.ShowerHeadBlockEntity; +import eu.midnightdust.motschen.decorative.block.blockentity.*; import net.minecraft.block.entity.BlockEntityType; import net.minecraft.util.Identifier; import net.minecraft.util.registry.Registry; @@ -11,10 +10,23 @@ public class BlockEntities { public static BlockEntityType PoolSprinklerBlockEntity; public static BlockEntityType ShowerHeadBlockEntity; + public static BlockEntityType CeilingFanBlockEntity; + public static BlockEntityType OakChoppingLogBlockEntity; + public static BlockEntityType SpruceChoppingLogBlockEntity; + public static BlockEntityType BirchChoppingLogBlockEntity; + public static BlockEntityType AcaciaChoppingLogBlockEntity; + public static BlockEntityType JungleChoppingLogBlockEntity; + public static BlockEntityType DarkOakChoppingLogBlockEntity; public static void init() { - PoolSprinklerBlockEntity = Registry.register(Registry.BLOCK_ENTITY_TYPE, new Identifier("decorative","pool_sprinkler_blockentity"), BlockEntityType.Builder.create(PoolSprinklerBlockEntity::new, Pool.PoolSprinkler).build(null)); - ShowerHeadBlockEntity = Registry.register(Registry.BLOCK_ENTITY_TYPE, new Identifier("decorative","shower_head_blockentity"), BlockEntityType.Builder.create(ShowerHeadBlockEntity::new, DecorativeMain.ShowerHead).build(null)); - + PoolSprinklerBlockEntity = Registry.register(Registry.BLOCK_ENTITY_TYPE, new Identifier(DecorativeMain.MOD_ID,"pool_sprinkler_blockentity"), BlockEntityType.Builder.create(PoolSprinklerBlockEntity::new, Pool.PoolSprinkler).build(null)); + ShowerHeadBlockEntity = Registry.register(Registry.BLOCK_ENTITY_TYPE, new Identifier(DecorativeMain.MOD_ID,"shower_head_blockentity"), BlockEntityType.Builder.create(ShowerHeadBlockEntity::new, DecorativeMain.ShowerHead).build(null)); + CeilingFanBlockEntity = Registry.register(Registry.BLOCK_ENTITY_TYPE, new Identifier(DecorativeMain.MOD_ID,"ceiling_fan_blockentity"), BlockEntityType.Builder.create(CeilingFanBlockEntity::new, DecorativeMain.CeilingFan).build(null)); + OakChoppingLogBlockEntity = Registry.register(Registry.BLOCK_ENTITY_TYPE, new Identifier(DecorativeMain.MOD_ID,"oak_chopping_log_blockentity"), BlockEntityType.Builder.create(OakChoppingLogBlockEntity::new, LogsWithAxes.OakChoppingLog).build(null)); + SpruceChoppingLogBlockEntity = Registry.register(Registry.BLOCK_ENTITY_TYPE, new Identifier(DecorativeMain.MOD_ID,"spruce_chopping_log_blockentity"), BlockEntityType.Builder.create(SpruceChoppingLogBlockEntity::new, LogsWithAxes.SpruceChoppingLog).build(null)); + BirchChoppingLogBlockEntity = Registry.register(Registry.BLOCK_ENTITY_TYPE, new Identifier(DecorativeMain.MOD_ID,"birch_chopping_log_blockentity"), BlockEntityType.Builder.create(BirchChoppingLogBlockEntity::new, LogsWithAxes.BirchChoppingLog).build(null)); + AcaciaChoppingLogBlockEntity = Registry.register(Registry.BLOCK_ENTITY_TYPE, new Identifier(DecorativeMain.MOD_ID,"acacia_chopping_log_blockentity"), BlockEntityType.Builder.create(AcaciaChoppingLogBlockEntity::new, LogsWithAxes.AcaciaChoppingLog).build(null)); + JungleChoppingLogBlockEntity = Registry.register(Registry.BLOCK_ENTITY_TYPE, new Identifier(DecorativeMain.MOD_ID,"jungle_chopping_log_blockentity"), BlockEntityType.Builder.create(JungleChoppingLogBlockEntity::new, LogsWithAxes.JungleChoppingLog).build(null)); + DarkOakChoppingLogBlockEntity = Registry.register(Registry.BLOCK_ENTITY_TYPE, new Identifier(DecorativeMain.MOD_ID,"dark_oak_chopping_log_blockentity"), BlockEntityType.Builder.create(DarkOakChoppingLogBlockEntity::new, LogsWithAxes.DarkOakChoppingLog).build(null)); } } diff --git a/src/main/java/eu/midnightdust/motschen/decorative/init/DoubleLamps.java b/src/main/java/eu/midnightdust/motschen/decorative/init/DoubleLamps.java index c0fbdfe..592b303 100644 --- a/src/main/java/eu/midnightdust/motschen/decorative/init/DoubleLamps.java +++ b/src/main/java/eu/midnightdust/motschen/decorative/init/DoubleLamps.java @@ -27,37 +27,37 @@ public class DoubleLamps { public static Block BlackDoubleLamp = new DoubleLamp(); public static void init() { - Registry.register(Registry.BLOCK, new Identifier("decorative","white_double_lamp"), WhiteDoubleLamp); - Registry.register(Registry.ITEM, new Identifier("decorative","white_double_lamp"), new BlockItem(WhiteDoubleLamp, new Item.Settings().group(DecorativeMain.IndoorGroup))); - Registry.register(Registry.BLOCK, new Identifier("decorative","orange_double_lamp"), OrangeDoubleLamp); - Registry.register(Registry.ITEM, new Identifier("decorative","orange_double_lamp"), new BlockItem(OrangeDoubleLamp, new Item.Settings().group(DecorativeMain.IndoorGroup))); - Registry.register(Registry.BLOCK, new Identifier("decorative","magenta_double_lamp"), MagentaDoubleLamp); - Registry.register(Registry.ITEM, new Identifier("decorative","magenta_double_lamp"), new BlockItem(MagentaDoubleLamp, new Item.Settings().group(DecorativeMain.IndoorGroup))); - Registry.register(Registry.BLOCK, new Identifier("decorative","light_blue_double_lamp"), LightBlueDoubleLamp); - Registry.register(Registry.ITEM, new Identifier("decorative","light_blue_double_lamp"), new BlockItem(LightBlueDoubleLamp, new Item.Settings().group(DecorativeMain.IndoorGroup))); - Registry.register(Registry.BLOCK, new Identifier("decorative","yellow_double_lamp"), YellowDoubleLamp); - Registry.register(Registry.ITEM, new Identifier("decorative","yellow_double_lamp"), new BlockItem(YellowDoubleLamp, new Item.Settings().group(DecorativeMain.IndoorGroup))); - Registry.register(Registry.BLOCK, new Identifier("decorative","lime_double_lamp"), LimeDoubleLamp); - Registry.register(Registry.ITEM, new Identifier("decorative","lime_double_lamp"), new BlockItem(LimeDoubleLamp, new Item.Settings().group(DecorativeMain.IndoorGroup))); - Registry.register(Registry.BLOCK, new Identifier("decorative","pink_double_lamp"), PinkDoubleLamp); - Registry.register(Registry.ITEM, new Identifier("decorative","pink_double_lamp"), new BlockItem(PinkDoubleLamp, new Item.Settings().group(DecorativeMain.IndoorGroup))); - Registry.register(Registry.BLOCK, new Identifier("decorative","gray_double_lamp"), GrayDoubleLamp); - Registry.register(Registry.ITEM, new Identifier("decorative","gray_double_lamp"), new BlockItem(GrayDoubleLamp, new Item.Settings().group(DecorativeMain.IndoorGroup))); - Registry.register(Registry.BLOCK, new Identifier("decorative","light_gray_double_lamp"), LightGrayDoubleLamp); - Registry.register(Registry.ITEM, new Identifier("decorative","light_gray_double_lamp"), new BlockItem(LightGrayDoubleLamp, new Item.Settings().group(DecorativeMain.IndoorGroup))); - Registry.register(Registry.BLOCK, new Identifier("decorative","cyan_double_lamp"), CyanDoubleLamp); - Registry.register(Registry.ITEM, new Identifier("decorative","cyan_double_lamp"), new BlockItem(CyanDoubleLamp, new Item.Settings().group(DecorativeMain.IndoorGroup))); - Registry.register(Registry.BLOCK, new Identifier("decorative","purple_double_lamp"), PurpleDoubleLamp); - Registry.register(Registry.ITEM, new Identifier("decorative","purple_double_lamp"), new BlockItem(PurpleDoubleLamp, new Item.Settings().group(DecorativeMain.IndoorGroup))); - Registry.register(Registry.BLOCK, new Identifier("decorative","blue_double_lamp"), BlueDoubleLamp); - Registry.register(Registry.ITEM, new Identifier("decorative","blue_double_lamp"), new BlockItem(BlueDoubleLamp, new Item.Settings().group(DecorativeMain.IndoorGroup))); - Registry.register(Registry.BLOCK, new Identifier("decorative","brown_double_lamp"), BrownDoubleLamp); - Registry.register(Registry.ITEM, new Identifier("decorative","brown_double_lamp"), new BlockItem(BrownDoubleLamp, new Item.Settings().group(DecorativeMain.IndoorGroup))); - Registry.register(Registry.BLOCK, new Identifier("decorative","green_double_lamp"), GreenDoubleLamp); - Registry.register(Registry.ITEM, new Identifier("decorative","green_double_lamp"), new BlockItem(GreenDoubleLamp, new Item.Settings().group(DecorativeMain.IndoorGroup))); - Registry.register(Registry.BLOCK, new Identifier("decorative","red_double_lamp"), RedDoubleLamp); - Registry.register(Registry.ITEM, new Identifier("decorative","red_double_lamp"), new BlockItem(RedDoubleLamp, new Item.Settings().group(DecorativeMain.IndoorGroup))); - Registry.register(Registry.BLOCK, new Identifier("decorative","black_double_lamp"), BlackDoubleLamp); - Registry.register(Registry.ITEM, new Identifier("decorative","black_double_lamp"), new BlockItem(BlackDoubleLamp, new Item.Settings().group(DecorativeMain.IndoorGroup))); + Registry.register(Registry.BLOCK, new Identifier(DecorativeMain.MOD_ID,"white_double_lamp"), WhiteDoubleLamp); + Registry.register(Registry.ITEM, new Identifier(DecorativeMain.MOD_ID,"white_double_lamp"), new BlockItem(WhiteDoubleLamp, new Item.Settings().group(DecorativeMain.IndoorGroup))); + Registry.register(Registry.BLOCK, new Identifier(DecorativeMain.MOD_ID,"orange_double_lamp"), OrangeDoubleLamp); + Registry.register(Registry.ITEM, new Identifier(DecorativeMain.MOD_ID,"orange_double_lamp"), new BlockItem(OrangeDoubleLamp, new Item.Settings().group(DecorativeMain.IndoorGroup))); + Registry.register(Registry.BLOCK, new Identifier(DecorativeMain.MOD_ID,"magenta_double_lamp"), MagentaDoubleLamp); + Registry.register(Registry.ITEM, new Identifier(DecorativeMain.MOD_ID,"magenta_double_lamp"), new BlockItem(MagentaDoubleLamp, new Item.Settings().group(DecorativeMain.IndoorGroup))); + Registry.register(Registry.BLOCK, new Identifier(DecorativeMain.MOD_ID,"light_blue_double_lamp"), LightBlueDoubleLamp); + Registry.register(Registry.ITEM, new Identifier(DecorativeMain.MOD_ID,"light_blue_double_lamp"), new BlockItem(LightBlueDoubleLamp, new Item.Settings().group(DecorativeMain.IndoorGroup))); + Registry.register(Registry.BLOCK, new Identifier(DecorativeMain.MOD_ID,"yellow_double_lamp"), YellowDoubleLamp); + Registry.register(Registry.ITEM, new Identifier(DecorativeMain.MOD_ID,"yellow_double_lamp"), new BlockItem(YellowDoubleLamp, new Item.Settings().group(DecorativeMain.IndoorGroup))); + Registry.register(Registry.BLOCK, new Identifier(DecorativeMain.MOD_ID,"lime_double_lamp"), LimeDoubleLamp); + Registry.register(Registry.ITEM, new Identifier(DecorativeMain.MOD_ID,"lime_double_lamp"), new BlockItem(LimeDoubleLamp, new Item.Settings().group(DecorativeMain.IndoorGroup))); + Registry.register(Registry.BLOCK, new Identifier(DecorativeMain.MOD_ID,"pink_double_lamp"), PinkDoubleLamp); + Registry.register(Registry.ITEM, new Identifier(DecorativeMain.MOD_ID,"pink_double_lamp"), new BlockItem(PinkDoubleLamp, new Item.Settings().group(DecorativeMain.IndoorGroup))); + Registry.register(Registry.BLOCK, new Identifier(DecorativeMain.MOD_ID,"gray_double_lamp"), GrayDoubleLamp); + Registry.register(Registry.ITEM, new Identifier(DecorativeMain.MOD_ID,"gray_double_lamp"), new BlockItem(GrayDoubleLamp, new Item.Settings().group(DecorativeMain.IndoorGroup))); + Registry.register(Registry.BLOCK, new Identifier(DecorativeMain.MOD_ID,"light_gray_double_lamp"), LightGrayDoubleLamp); + Registry.register(Registry.ITEM, new Identifier(DecorativeMain.MOD_ID,"light_gray_double_lamp"), new BlockItem(LightGrayDoubleLamp, new Item.Settings().group(DecorativeMain.IndoorGroup))); + Registry.register(Registry.BLOCK, new Identifier(DecorativeMain.MOD_ID,"cyan_double_lamp"), CyanDoubleLamp); + Registry.register(Registry.ITEM, new Identifier(DecorativeMain.MOD_ID,"cyan_double_lamp"), new BlockItem(CyanDoubleLamp, new Item.Settings().group(DecorativeMain.IndoorGroup))); + Registry.register(Registry.BLOCK, new Identifier(DecorativeMain.MOD_ID,"purple_double_lamp"), PurpleDoubleLamp); + Registry.register(Registry.ITEM, new Identifier(DecorativeMain.MOD_ID,"purple_double_lamp"), new BlockItem(PurpleDoubleLamp, new Item.Settings().group(DecorativeMain.IndoorGroup))); + Registry.register(Registry.BLOCK, new Identifier(DecorativeMain.MOD_ID,"blue_double_lamp"), BlueDoubleLamp); + Registry.register(Registry.ITEM, new Identifier(DecorativeMain.MOD_ID,"blue_double_lamp"), new BlockItem(BlueDoubleLamp, new Item.Settings().group(DecorativeMain.IndoorGroup))); + Registry.register(Registry.BLOCK, new Identifier(DecorativeMain.MOD_ID,"brown_double_lamp"), BrownDoubleLamp); + Registry.register(Registry.ITEM, new Identifier(DecorativeMain.MOD_ID,"brown_double_lamp"), new BlockItem(BrownDoubleLamp, new Item.Settings().group(DecorativeMain.IndoorGroup))); + Registry.register(Registry.BLOCK, new Identifier(DecorativeMain.MOD_ID,"green_double_lamp"), GreenDoubleLamp); + Registry.register(Registry.ITEM, new Identifier(DecorativeMain.MOD_ID,"green_double_lamp"), new BlockItem(GreenDoubleLamp, new Item.Settings().group(DecorativeMain.IndoorGroup))); + Registry.register(Registry.BLOCK, new Identifier(DecorativeMain.MOD_ID,"red_double_lamp"), RedDoubleLamp); + Registry.register(Registry.ITEM, new Identifier(DecorativeMain.MOD_ID,"red_double_lamp"), new BlockItem(RedDoubleLamp, new Item.Settings().group(DecorativeMain.IndoorGroup))); + Registry.register(Registry.BLOCK, new Identifier(DecorativeMain.MOD_ID,"black_double_lamp"), BlackDoubleLamp); + Registry.register(Registry.ITEM, new Identifier(DecorativeMain.MOD_ID,"black_double_lamp"), new BlockItem(BlackDoubleLamp, new Item.Settings().group(DecorativeMain.IndoorGroup))); } } diff --git a/src/main/java/eu/midnightdust/motschen/decorative/init/Lamps.java b/src/main/java/eu/midnightdust/motschen/decorative/init/Lamps.java index 0c18a76..79192d9 100644 --- a/src/main/java/eu/midnightdust/motschen/decorative/init/Lamps.java +++ b/src/main/java/eu/midnightdust/motschen/decorative/init/Lamps.java @@ -27,37 +27,37 @@ public class Lamps { public static Block BlackLamp = new Lamp(); public static void init() { - Registry.register(Registry.BLOCK, new Identifier("decorative","white_lamp"), WhiteLamp); - Registry.register(Registry.ITEM, new Identifier("decorative","white_lamp"), new BlockItem(WhiteLamp, new Item.Settings().group(DecorativeMain.IndoorGroup))); - Registry.register(Registry.BLOCK, new Identifier("decorative","orange_lamp"), OrangeLamp); - Registry.register(Registry.ITEM, new Identifier("decorative","orange_lamp"), new BlockItem(OrangeLamp, new Item.Settings().group(DecorativeMain.IndoorGroup))); - Registry.register(Registry.BLOCK, new Identifier("decorative","magenta_lamp"), MagentaLamp); - Registry.register(Registry.ITEM, new Identifier("decorative","magenta_lamp"), new BlockItem(MagentaLamp, new Item.Settings().group(DecorativeMain.IndoorGroup))); - Registry.register(Registry.BLOCK, new Identifier("decorative","light_blue_lamp"), LightBlueLamp); - Registry.register(Registry.ITEM, new Identifier("decorative","light_blue_lamp"), new BlockItem(LightBlueLamp, new Item.Settings().group(DecorativeMain.IndoorGroup))); - Registry.register(Registry.BLOCK, new Identifier("decorative","yellow_lamp"), YellowLamp); - Registry.register(Registry.ITEM, new Identifier("decorative","yellow_lamp"), new BlockItem(YellowLamp, new Item.Settings().group(DecorativeMain.IndoorGroup))); - Registry.register(Registry.BLOCK, new Identifier("decorative","lime_lamp"), LimeLamp); - Registry.register(Registry.ITEM, new Identifier("decorative","lime_lamp"), new BlockItem(LimeLamp, new Item.Settings().group(DecorativeMain.IndoorGroup))); - Registry.register(Registry.BLOCK, new Identifier("decorative","pink_lamp"), PinkLamp); - Registry.register(Registry.ITEM, new Identifier("decorative","pink_lamp"), new BlockItem(PinkLamp, new Item.Settings().group(DecorativeMain.IndoorGroup))); - Registry.register(Registry.BLOCK, new Identifier("decorative","gray_lamp"), GrayLamp); - Registry.register(Registry.ITEM, new Identifier("decorative","gray_lamp"), new BlockItem(GrayLamp, new Item.Settings().group(DecorativeMain.IndoorGroup))); - Registry.register(Registry.BLOCK, new Identifier("decorative","light_gray_lamp"), LightGrayLamp); - Registry.register(Registry.ITEM, new Identifier("decorative","light_gray_lamp"), new BlockItem(LightGrayLamp, new Item.Settings().group(DecorativeMain.IndoorGroup))); - Registry.register(Registry.BLOCK, new Identifier("decorative","cyan_lamp"), CyanLamp); - Registry.register(Registry.ITEM, new Identifier("decorative","cyan_lamp"), new BlockItem(CyanLamp, new Item.Settings().group(DecorativeMain.IndoorGroup))); - Registry.register(Registry.BLOCK, new Identifier("decorative","purple_lamp"), PurpleLamp); - Registry.register(Registry.ITEM, new Identifier("decorative","purple_lamp"), new BlockItem(PurpleLamp, new Item.Settings().group(DecorativeMain.IndoorGroup))); - Registry.register(Registry.BLOCK, new Identifier("decorative","blue_lamp"), BlueLamp); - Registry.register(Registry.ITEM, new Identifier("decorative","blue_lamp"), new BlockItem(BlueLamp, new Item.Settings().group(DecorativeMain.IndoorGroup))); - Registry.register(Registry.BLOCK, new Identifier("decorative","brown_lamp"), BrownLamp); - Registry.register(Registry.ITEM, new Identifier("decorative","brown_lamp"), new BlockItem(BrownLamp, new Item.Settings().group(DecorativeMain.IndoorGroup))); - Registry.register(Registry.BLOCK, new Identifier("decorative","green_lamp"), GreenLamp); - Registry.register(Registry.ITEM, new Identifier("decorative","green_lamp"), new BlockItem(GreenLamp, new Item.Settings().group(DecorativeMain.IndoorGroup))); - Registry.register(Registry.BLOCK, new Identifier("decorative","red_lamp"), RedLamp); - Registry.register(Registry.ITEM, new Identifier("decorative","red_lamp"), new BlockItem(RedLamp, new Item.Settings().group(DecorativeMain.IndoorGroup))); - Registry.register(Registry.BLOCK, new Identifier("decorative","black_lamp"), BlackLamp); - Registry.register(Registry.ITEM, new Identifier("decorative","black_lamp"), new BlockItem(BlackLamp, new Item.Settings().group(DecorativeMain.IndoorGroup))); + Registry.register(Registry.BLOCK, new Identifier(DecorativeMain.MOD_ID,"white_lamp"), WhiteLamp); + Registry.register(Registry.ITEM, new Identifier(DecorativeMain.MOD_ID,"white_lamp"), new BlockItem(WhiteLamp, new Item.Settings().group(DecorativeMain.IndoorGroup))); + Registry.register(Registry.BLOCK, new Identifier(DecorativeMain.MOD_ID,"orange_lamp"), OrangeLamp); + Registry.register(Registry.ITEM, new Identifier(DecorativeMain.MOD_ID,"orange_lamp"), new BlockItem(OrangeLamp, new Item.Settings().group(DecorativeMain.IndoorGroup))); + Registry.register(Registry.BLOCK, new Identifier(DecorativeMain.MOD_ID,"magenta_lamp"), MagentaLamp); + Registry.register(Registry.ITEM, new Identifier(DecorativeMain.MOD_ID,"magenta_lamp"), new BlockItem(MagentaLamp, new Item.Settings().group(DecorativeMain.IndoorGroup))); + Registry.register(Registry.BLOCK, new Identifier(DecorativeMain.MOD_ID,"light_blue_lamp"), LightBlueLamp); + Registry.register(Registry.ITEM, new Identifier(DecorativeMain.MOD_ID,"light_blue_lamp"), new BlockItem(LightBlueLamp, new Item.Settings().group(DecorativeMain.IndoorGroup))); + Registry.register(Registry.BLOCK, new Identifier(DecorativeMain.MOD_ID,"yellow_lamp"), YellowLamp); + Registry.register(Registry.ITEM, new Identifier(DecorativeMain.MOD_ID,"yellow_lamp"), new BlockItem(YellowLamp, new Item.Settings().group(DecorativeMain.IndoorGroup))); + Registry.register(Registry.BLOCK, new Identifier(DecorativeMain.MOD_ID,"lime_lamp"), LimeLamp); + Registry.register(Registry.ITEM, new Identifier(DecorativeMain.MOD_ID,"lime_lamp"), new BlockItem(LimeLamp, new Item.Settings().group(DecorativeMain.IndoorGroup))); + Registry.register(Registry.BLOCK, new Identifier(DecorativeMain.MOD_ID,"pink_lamp"), PinkLamp); + Registry.register(Registry.ITEM, new Identifier(DecorativeMain.MOD_ID,"pink_lamp"), new BlockItem(PinkLamp, new Item.Settings().group(DecorativeMain.IndoorGroup))); + Registry.register(Registry.BLOCK, new Identifier(DecorativeMain.MOD_ID,"gray_lamp"), GrayLamp); + Registry.register(Registry.ITEM, new Identifier(DecorativeMain.MOD_ID,"gray_lamp"), new BlockItem(GrayLamp, new Item.Settings().group(DecorativeMain.IndoorGroup))); + Registry.register(Registry.BLOCK, new Identifier(DecorativeMain.MOD_ID,"light_gray_lamp"), LightGrayLamp); + Registry.register(Registry.ITEM, new Identifier(DecorativeMain.MOD_ID,"light_gray_lamp"), new BlockItem(LightGrayLamp, new Item.Settings().group(DecorativeMain.IndoorGroup))); + Registry.register(Registry.BLOCK, new Identifier(DecorativeMain.MOD_ID,"cyan_lamp"), CyanLamp); + Registry.register(Registry.ITEM, new Identifier(DecorativeMain.MOD_ID,"cyan_lamp"), new BlockItem(CyanLamp, new Item.Settings().group(DecorativeMain.IndoorGroup))); + Registry.register(Registry.BLOCK, new Identifier(DecorativeMain.MOD_ID,"purple_lamp"), PurpleLamp); + Registry.register(Registry.ITEM, new Identifier(DecorativeMain.MOD_ID,"purple_lamp"), new BlockItem(PurpleLamp, new Item.Settings().group(DecorativeMain.IndoorGroup))); + Registry.register(Registry.BLOCK, new Identifier(DecorativeMain.MOD_ID,"blue_lamp"), BlueLamp); + Registry.register(Registry.ITEM, new Identifier(DecorativeMain.MOD_ID,"blue_lamp"), new BlockItem(BlueLamp, new Item.Settings().group(DecorativeMain.IndoorGroup))); + Registry.register(Registry.BLOCK, new Identifier(DecorativeMain.MOD_ID,"brown_lamp"), BrownLamp); + Registry.register(Registry.ITEM, new Identifier(DecorativeMain.MOD_ID,"brown_lamp"), new BlockItem(BrownLamp, new Item.Settings().group(DecorativeMain.IndoorGroup))); + Registry.register(Registry.BLOCK, new Identifier(DecorativeMain.MOD_ID,"green_lamp"), GreenLamp); + Registry.register(Registry.ITEM, new Identifier(DecorativeMain.MOD_ID,"green_lamp"), new BlockItem(GreenLamp, new Item.Settings().group(DecorativeMain.IndoorGroup))); + Registry.register(Registry.BLOCK, new Identifier(DecorativeMain.MOD_ID,"red_lamp"), RedLamp); + Registry.register(Registry.ITEM, new Identifier(DecorativeMain.MOD_ID,"red_lamp"), new BlockItem(RedLamp, new Item.Settings().group(DecorativeMain.IndoorGroup))); + Registry.register(Registry.BLOCK, new Identifier(DecorativeMain.MOD_ID,"black_lamp"), BlackLamp); + Registry.register(Registry.ITEM, new Identifier(DecorativeMain.MOD_ID,"black_lamp"), new BlockItem(BlackLamp, new Item.Settings().group(DecorativeMain.IndoorGroup))); } } diff --git a/src/main/java/eu/midnightdust/motschen/decorative/init/LogsWithAxes.java b/src/main/java/eu/midnightdust/motschen/decorative/init/LogsWithAxes.java index 6a16248..dea8fa7 100644 --- a/src/main/java/eu/midnightdust/motschen/decorative/init/LogsWithAxes.java +++ b/src/main/java/eu/midnightdust/motschen/decorative/init/LogsWithAxes.java @@ -1,7 +1,7 @@ package eu.midnightdust.motschen.decorative.init; import eu.midnightdust.motschen.decorative.DecorativeMain; -import eu.midnightdust.motschen.decorative.block.LogWithAxe; +import eu.midnightdust.motschen.decorative.block.*; import net.minecraft.block.Block; import net.minecraft.item.BlockItem; import net.minecraft.item.Item; @@ -9,25 +9,25 @@ import net.minecraft.util.Identifier; import net.minecraft.util.registry.Registry; public class LogsWithAxes { - public static Block OakLogWithAxe = new LogWithAxe(); - public static Block SpruceLogWithAxe = new LogWithAxe(); - public static Block BirchLogWithAxe = new LogWithAxe(); - public static Block AcaciaLogWithAxe = new LogWithAxe(); - public static Block JungleLogWithAxe = new LogWithAxe(); - public static Block DarkOakLogWithAxe = new LogWithAxe(); + public static Block OakChoppingLog = new OakChoppingLog(); + public static Block SpruceChoppingLog = new SpruceChoppingLog(); + public static Block BirchChoppingLog = new BirchChoppingLog(); + public static Block AcaciaChoppingLog = new AcaciaChoppingLog(); + public static Block JungleChoppingLog = new JungleChoppingLog(); + public static Block DarkOakChoppingLog = new DarkOakChoppingLog(); public static void init() { - Registry.register(Registry.BLOCK, new Identifier("decorative","oak_log_with_axe"), OakLogWithAxe); - Registry.register(Registry.ITEM, new Identifier("decorative","oak_log_with_axe"), new BlockItem(OakLogWithAxe, new Item.Settings().group(DecorativeMain.GardenGroup))); - Registry.register(Registry.BLOCK, new Identifier("decorative","spruce_log_with_axe"), SpruceLogWithAxe); - Registry.register(Registry.ITEM, new Identifier("decorative","spruce_log_with_axe"), new BlockItem(SpruceLogWithAxe, new Item.Settings().group(DecorativeMain.GardenGroup))); - Registry.register(Registry.BLOCK, new Identifier("decorative","birch_log_with_axe"), BirchLogWithAxe); - Registry.register(Registry.ITEM, new Identifier("decorative","birch_log_with_axe"), new BlockItem(BirchLogWithAxe, new Item.Settings().group(DecorativeMain.GardenGroup))); - Registry.register(Registry.BLOCK, new Identifier("decorative","acacia_log_with_axe"), AcaciaLogWithAxe); - Registry.register(Registry.ITEM, new Identifier("decorative","acacia_log_with_axe"), new BlockItem(AcaciaLogWithAxe, new Item.Settings().group(DecorativeMain.GardenGroup))); - Registry.register(Registry.BLOCK, new Identifier("decorative","jungle_log_with_axe"), JungleLogWithAxe); - Registry.register(Registry.ITEM, new Identifier("decorative","jungle_log_with_axe"), new BlockItem(JungleLogWithAxe, new Item.Settings().group(DecorativeMain.GardenGroup))); - Registry.register(Registry.BLOCK, new Identifier("decorative","dark_oak_log_with_axe"), DarkOakLogWithAxe); - Registry.register(Registry.ITEM, new Identifier("decorative","dark_oak_log_with_axe"), new BlockItem(DarkOakLogWithAxe, new Item.Settings().group(DecorativeMain.GardenGroup))); + Registry.register(Registry.BLOCK, new Identifier(DecorativeMain.MOD_ID,"oak_log_with_axe"), OakChoppingLog); + Registry.register(Registry.ITEM, new Identifier(DecorativeMain.MOD_ID,"oak_log_with_axe"), new BlockItem(OakChoppingLog, new Item.Settings().group(DecorativeMain.GardenGroup))); + Registry.register(Registry.BLOCK, new Identifier(DecorativeMain.MOD_ID,"spruce_log_with_axe"), SpruceChoppingLog); + Registry.register(Registry.ITEM, new Identifier(DecorativeMain.MOD_ID,"spruce_log_with_axe"), new BlockItem(SpruceChoppingLog, new Item.Settings().group(DecorativeMain.GardenGroup))); + Registry.register(Registry.BLOCK, new Identifier(DecorativeMain.MOD_ID,"birch_log_with_axe"), BirchChoppingLog); + Registry.register(Registry.ITEM, new Identifier(DecorativeMain.MOD_ID,"birch_log_with_axe"), new BlockItem(BirchChoppingLog, new Item.Settings().group(DecorativeMain.GardenGroup))); + Registry.register(Registry.BLOCK, new Identifier(DecorativeMain.MOD_ID,"acacia_log_with_axe"), AcaciaChoppingLog); + Registry.register(Registry.ITEM, new Identifier(DecorativeMain.MOD_ID,"acacia_log_with_axe"), new BlockItem(AcaciaChoppingLog, new Item.Settings().group(DecorativeMain.GardenGroup))); + Registry.register(Registry.BLOCK, new Identifier(DecorativeMain.MOD_ID,"jungle_log_with_axe"), JungleChoppingLog); + Registry.register(Registry.ITEM, new Identifier(DecorativeMain.MOD_ID,"jungle_log_with_axe"), new BlockItem(JungleChoppingLog, new Item.Settings().group(DecorativeMain.GardenGroup))); + Registry.register(Registry.BLOCK, new Identifier(DecorativeMain.MOD_ID,"dark_oak_log_with_axe"), DarkOakChoppingLog); + Registry.register(Registry.ITEM, new Identifier(DecorativeMain.MOD_ID,"dark_oak_log_with_axe"), new BlockItem(DarkOakChoppingLog, new Item.Settings().group(DecorativeMain.GardenGroup))); } } diff --git a/src/main/java/eu/midnightdust/motschen/decorative/init/Pool.java b/src/main/java/eu/midnightdust/motschen/decorative/init/Pool.java index bf8eb28..be0d2c0 100644 --- a/src/main/java/eu/midnightdust/motschen/decorative/init/Pool.java +++ b/src/main/java/eu/midnightdust/motschen/decorative/init/Pool.java @@ -22,20 +22,20 @@ import net.minecraft.util.registry.Registry; public class Pool { public static final EntityType BEACH_BALL = - Registry.register(Registry.ENTITY_TYPE,new Identifier("decorative","beach_ball"), FabricEntityTypeBuilder.create(SpawnGroup.AMBIENT, BeachBallEntity::new).dimensions(EntityDimensions.fixed(0.9f,0.9f)).trackable(100,4).build()); + Registry.register(Registry.ENTITY_TYPE,new Identifier(DecorativeMain.MOD_ID,"beach_ball"), FabricEntityTypeBuilder.create(SpawnGroup.AMBIENT, BeachBallEntity::new).dimensions(EntityDimensions.fixed(0.9f,0.9f)).trackable(100,4).build()); public static Item BEACH_BALL_ITEM = new BathTireItem(BEACH_BALL, new Item.Settings().group(DecorativeMain.PoolGroup)); public static Block PoolWall = new PoolWall(); public static Block Springboard = new Springboard(); public static Block PoolSprinkler = new PoolSprinkler(); public static void init() { - Registry.register(Registry.BLOCK, new Identifier("decorative","pool_wall"), PoolWall); - Registry.register(Registry.ITEM, new Identifier("decorative","pool_wall"), new BlockItem(PoolWall, new Item.Settings().group(DecorativeMain.PoolGroup))); - Registry.register(Registry.BLOCK, new Identifier("decorative","springboard"), Springboard); - Registry.register(Registry.ITEM, new Identifier("decorative","springboard"), new BlockItem(Springboard, new Item.Settings().group(DecorativeMain.PoolGroup))); - Registry.register(Registry.BLOCK, new Identifier("decorative","pool_sprinkler"), PoolSprinkler); - Registry.register(Registry.ITEM, new Identifier("decorative","pool_sprinkler"), new BlockItem(PoolSprinkler, new Item.Settings().group(DecorativeMain.PoolGroup))); - Registry.register(Registry.ITEM, new Identifier("decorative","beach_ball"), BEACH_BALL_ITEM); + Registry.register(Registry.BLOCK, new Identifier(DecorativeMain.MOD_ID,"pool_wall"), PoolWall); + Registry.register(Registry.ITEM, new Identifier(DecorativeMain.MOD_ID,"pool_wall"), new BlockItem(PoolWall, new Item.Settings().group(DecorativeMain.PoolGroup))); + Registry.register(Registry.BLOCK, new Identifier(DecorativeMain.MOD_ID,"springboard"), Springboard); + Registry.register(Registry.ITEM, new Identifier(DecorativeMain.MOD_ID,"springboard"), new BlockItem(Springboard, new Item.Settings().group(DecorativeMain.PoolGroup))); + Registry.register(Registry.BLOCK, new Identifier(DecorativeMain.MOD_ID,"pool_sprinkler"), PoolSprinkler); + Registry.register(Registry.ITEM, new Identifier(DecorativeMain.MOD_ID,"pool_sprinkler"), new BlockItem(PoolSprinkler, new Item.Settings().group(DecorativeMain.PoolGroup))); + Registry.register(Registry.ITEM, new Identifier(DecorativeMain.MOD_ID,"beach_ball"), BEACH_BALL_ITEM); FabricDefaultAttributeRegistry.register(BEACH_BALL, MobEntity.createMobAttributes().add(EntityAttributes.GENERIC_MAX_HEALTH, 100000.0D).add(EntityAttributes.GENERIC_KNOCKBACK_RESISTANCE, -10D)); BathTires.init(); } diff --git a/src/main/java/eu/midnightdust/motschen/decorative/init/Signs.java b/src/main/java/eu/midnightdust/motschen/decorative/init/Signs.java index b194018..cf7a987 100644 --- a/src/main/java/eu/midnightdust/motschen/decorative/init/Signs.java +++ b/src/main/java/eu/midnightdust/motschen/decorative/init/Signs.java @@ -25,34 +25,34 @@ public class Signs { public static Block OnehundredtenSign = new Sign(); public static void init() { - Registry.register(Registry.BLOCK, new Identifier("decorative","empty_sign"), EmptySign); - Registry.register(Registry.ITEM, new Identifier("decorative","empty_sign"), new BlockItem(EmptySign, new Item.Settings().group(DecorativeMain.TrafficGroup))); + Registry.register(Registry.BLOCK, new Identifier(DecorativeMain.MOD_ID,"empty_sign"), EmptySign); + Registry.register(Registry.ITEM, new Identifier(DecorativeMain.MOD_ID,"empty_sign"), new BlockItem(EmptySign, new Item.Settings().group(DecorativeMain.TrafficGroup))); - Registry.register(Registry.BLOCK, new Identifier("decorative","stop_sign"), StopSign); - Registry.register(Registry.ITEM, new Identifier("decorative","stop_sign"), new BlockItem(StopSign, new Item.Settings().group(DecorativeMain.TrafficGroup))); - Registry.register(Registry.BLOCK, new Identifier("decorative","five_sign"), FiveSign); - Registry.register(Registry.ITEM, new Identifier("decorative","five_sign"), new BlockItem(FiveSign, new Item.Settings().group(DecorativeMain.TrafficGroup))); - Registry.register(Registry.BLOCK, new Identifier("decorative","ten_sign"), TenSign); - Registry.register(Registry.ITEM, new Identifier("decorative","ten_sign"), new BlockItem(TenSign, new Item.Settings().group(DecorativeMain.TrafficGroup))); - Registry.register(Registry.BLOCK, new Identifier("decorative","twenty_sign"), TwentySign); - Registry.register(Registry.ITEM, new Identifier("decorative","twenty_sign"), new BlockItem(TwentySign, new Item.Settings().group(DecorativeMain.TrafficGroup))); - Registry.register(Registry.BLOCK, new Identifier("decorative","thirty_sign"), ThirtySign); - Registry.register(Registry.ITEM, new Identifier("decorative","thirty_sign"), new BlockItem(ThirtySign, new Item.Settings().group(DecorativeMain.TrafficGroup))); - Registry.register(Registry.BLOCK, new Identifier("decorative","forty_sign"), FortySign); - Registry.register(Registry.ITEM, new Identifier("decorative","forty_sign"), new BlockItem(FortySign, new Item.Settings().group(DecorativeMain.TrafficGroup))); - Registry.register(Registry.BLOCK, new Identifier("decorative","fifty_sign"), FiftySign); - Registry.register(Registry.ITEM, new Identifier("decorative","fifty_sign"), new BlockItem(FiftySign, new Item.Settings().group(DecorativeMain.TrafficGroup))); - Registry.register(Registry.BLOCK, new Identifier("decorative","sixty_sign"), SixtySign); - Registry.register(Registry.ITEM, new Identifier("decorative","sixty_sign"), new BlockItem(SixtySign, new Item.Settings().group(DecorativeMain.TrafficGroup))); - Registry.register(Registry.BLOCK, new Identifier("decorative","seventy_sign"), SeventySign); - Registry.register(Registry.ITEM, new Identifier("decorative","seventy_sign"), new BlockItem(SeventySign, new Item.Settings().group(DecorativeMain.TrafficGroup))); - Registry.register(Registry.BLOCK, new Identifier("decorative","eighty_sign"), EightySign); - Registry.register(Registry.ITEM, new Identifier("decorative","eighty_sign"), new BlockItem(EightySign, new Item.Settings().group(DecorativeMain.TrafficGroup))); - Registry.register(Registry.BLOCK, new Identifier("decorative","ninety_sign"), NinetySign); - Registry.register(Registry.ITEM, new Identifier("decorative","ninety_sign"), new BlockItem(NinetySign, new Item.Settings().group(DecorativeMain.TrafficGroup))); - Registry.register(Registry.BLOCK, new Identifier("decorative","onehundred_sign"), OnehundredSign); - Registry.register(Registry.ITEM, new Identifier("decorative","onehundred_sign"), new BlockItem(OnehundredSign, new Item.Settings().group(DecorativeMain.TrafficGroup))); - Registry.register(Registry.BLOCK, new Identifier("decorative","onehundredten_sign"), OnehundredtenSign); - Registry.register(Registry.ITEM, new Identifier("decorative","onehundredten_sign"), new BlockItem(OnehundredtenSign, new Item.Settings().group(DecorativeMain.TrafficGroup))); + Registry.register(Registry.BLOCK, new Identifier(DecorativeMain.MOD_ID,"stop_sign"), StopSign); + Registry.register(Registry.ITEM, new Identifier(DecorativeMain.MOD_ID,"stop_sign"), new BlockItem(StopSign, new Item.Settings().group(DecorativeMain.TrafficGroup))); + Registry.register(Registry.BLOCK, new Identifier(DecorativeMain.MOD_ID,"five_sign"), FiveSign); + Registry.register(Registry.ITEM, new Identifier(DecorativeMain.MOD_ID,"five_sign"), new BlockItem(FiveSign, new Item.Settings().group(DecorativeMain.TrafficGroup))); + Registry.register(Registry.BLOCK, new Identifier(DecorativeMain.MOD_ID,"ten_sign"), TenSign); + Registry.register(Registry.ITEM, new Identifier(DecorativeMain.MOD_ID,"ten_sign"), new BlockItem(TenSign, new Item.Settings().group(DecorativeMain.TrafficGroup))); + Registry.register(Registry.BLOCK, new Identifier(DecorativeMain.MOD_ID,"twenty_sign"), TwentySign); + Registry.register(Registry.ITEM, new Identifier(DecorativeMain.MOD_ID,"twenty_sign"), new BlockItem(TwentySign, new Item.Settings().group(DecorativeMain.TrafficGroup))); + Registry.register(Registry.BLOCK, new Identifier(DecorativeMain.MOD_ID,"thirty_sign"), ThirtySign); + Registry.register(Registry.ITEM, new Identifier(DecorativeMain.MOD_ID,"thirty_sign"), new BlockItem(ThirtySign, new Item.Settings().group(DecorativeMain.TrafficGroup))); + Registry.register(Registry.BLOCK, new Identifier(DecorativeMain.MOD_ID,"forty_sign"), FortySign); + Registry.register(Registry.ITEM, new Identifier(DecorativeMain.MOD_ID,"forty_sign"), new BlockItem(FortySign, new Item.Settings().group(DecorativeMain.TrafficGroup))); + Registry.register(Registry.BLOCK, new Identifier(DecorativeMain.MOD_ID,"fifty_sign"), FiftySign); + Registry.register(Registry.ITEM, new Identifier(DecorativeMain.MOD_ID,"fifty_sign"), new BlockItem(FiftySign, new Item.Settings().group(DecorativeMain.TrafficGroup))); + Registry.register(Registry.BLOCK, new Identifier(DecorativeMain.MOD_ID,"sixty_sign"), SixtySign); + Registry.register(Registry.ITEM, new Identifier(DecorativeMain.MOD_ID,"sixty_sign"), new BlockItem(SixtySign, new Item.Settings().group(DecorativeMain.TrafficGroup))); + Registry.register(Registry.BLOCK, new Identifier(DecorativeMain.MOD_ID,"seventy_sign"), SeventySign); + Registry.register(Registry.ITEM, new Identifier(DecorativeMain.MOD_ID,"seventy_sign"), new BlockItem(SeventySign, new Item.Settings().group(DecorativeMain.TrafficGroup))); + Registry.register(Registry.BLOCK, new Identifier(DecorativeMain.MOD_ID,"eighty_sign"), EightySign); + Registry.register(Registry.ITEM, new Identifier(DecorativeMain.MOD_ID,"eighty_sign"), new BlockItem(EightySign, new Item.Settings().group(DecorativeMain.TrafficGroup))); + Registry.register(Registry.BLOCK, new Identifier(DecorativeMain.MOD_ID,"ninety_sign"), NinetySign); + Registry.register(Registry.ITEM, new Identifier(DecorativeMain.MOD_ID,"ninety_sign"), new BlockItem(NinetySign, new Item.Settings().group(DecorativeMain.TrafficGroup))); + Registry.register(Registry.BLOCK, new Identifier(DecorativeMain.MOD_ID,"onehundred_sign"), OnehundredSign); + Registry.register(Registry.ITEM, new Identifier(DecorativeMain.MOD_ID,"onehundred_sign"), new BlockItem(OnehundredSign, new Item.Settings().group(DecorativeMain.TrafficGroup))); + Registry.register(Registry.BLOCK, new Identifier(DecorativeMain.MOD_ID,"onehundredten_sign"), OnehundredtenSign); + Registry.register(Registry.ITEM, new Identifier(DecorativeMain.MOD_ID,"onehundredten_sign"), new BlockItem(OnehundredtenSign, new Item.Settings().group(DecorativeMain.TrafficGroup))); } } diff --git a/src/main/java/eu/midnightdust/motschen/decorative/mixin/DefaultBiomeFeaturesMixin.java b/src/main/java/eu/midnightdust/motschen/decorative/mixin/DefaultBiomeFeaturesMixin.java deleted file mode 100644 index 6c20262..0000000 --- a/src/main/java/eu/midnightdust/motschen/decorative/mixin/DefaultBiomeFeaturesMixin.java +++ /dev/null @@ -1,18 +0,0 @@ -package eu.midnightdust.motschen.decorative.mixin; - -import eu.midnightdust.motschen.decorative.OreFeatures; -import net.minecraft.world.biome.GenerationSettings.Builder; -import net.minecraft.world.gen.GenerationStep; -import net.minecraft.world.gen.feature.DefaultBiomeFeatures; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; - -@Mixin(DefaultBiomeFeatures.class) -public class DefaultBiomeFeaturesMixin { - @Inject(at = @At("RETURN"), method = "addDefaultOres") - private static void addDefaultOres(Builder builder, CallbackInfo info) { - builder.feature(GenerationStep.Feature.UNDERGROUND_ORES, OreFeatures.ROCKY_ASPHALT_FEATURE); - } -} diff --git a/src/main/java/eu/midnightdust/motschen/decorative/mixin/GenerationSettingsAccessorMixin.java b/src/main/java/eu/midnightdust/motschen/decorative/mixin/GenerationSettingsAccessorMixin.java new file mode 100644 index 0000000..4b9d27a --- /dev/null +++ b/src/main/java/eu/midnightdust/motschen/decorative/mixin/GenerationSettingsAccessorMixin.java @@ -0,0 +1,19 @@ +package eu.midnightdust.motschen.decorative.mixin; + +import net.minecraft.world.biome.GenerationSettings; +import net.minecraft.world.gen.feature.ConfiguredFeature; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.gen.Accessor; + +import java.util.List; +import java.util.function.Supplier; + +@Mixin(GenerationSettings.class) +public interface GenerationSettingsAccessorMixin { + + @Accessor + List>>> getFeatures(); + + @Accessor + void setFeatures(List>>> features); +} diff --git a/src/main/java/eu/midnightdust/motschen/decorative/sound/DecorativeSoundEvents.java b/src/main/java/eu/midnightdust/motschen/decorative/sound/DecorativeSoundEvents.java new file mode 100644 index 0000000..dbdbbd8 --- /dev/null +++ b/src/main/java/eu/midnightdust/motschen/decorative/sound/DecorativeSoundEvents.java @@ -0,0 +1,13 @@ +package eu.midnightdust.motschen.decorative.sound; + +import net.minecraft.sound.SoundEvent; +import net.minecraft.util.Identifier; +import net.minecraft.util.registry.Registry; + +public class DecorativeSoundEvents { + public static final SoundEvent CEILINGFAN_AMBIENT = register("decorative:ceiling_fan.ambient"); + + private static SoundEvent register(String id) { + return Registry.register(Registry.SOUND_EVENT, id, new SoundEvent(new Identifier(id))); + } +} \ No newline at end of file diff --git a/src/main/java/eu/midnightdust/motschen/decorative/world/OreFeatureInjector.java b/src/main/java/eu/midnightdust/motschen/decorative/world/OreFeatureInjector.java new file mode 100644 index 0000000..f33b0ce --- /dev/null +++ b/src/main/java/eu/midnightdust/motschen/decorative/world/OreFeatureInjector.java @@ -0,0 +1,44 @@ +package eu.midnightdust.motschen.decorative.world; + +import com.google.common.collect.Lists; +import eu.midnightdust.motschen.decorative.mixin.GenerationSettingsAccessorMixin; +import net.fabricmc.fabric.api.event.registry.RegistryEntryAddedCallback; +import net.minecraft.util.registry.BuiltinRegistries; +import net.minecraft.world.biome.Biome; +import net.minecraft.world.gen.GenerationStep; +import net.minecraft.world.gen.feature.ConfiguredFeature; + +import java.util.ArrayList; +import java.util.List; +import java.util.function.Supplier; + +public class OreFeatureInjector { + + public static void init() { + BuiltinRegistries.BIOME.forEach(OreFeatureInjector::addToBiome); + RegistryEntryAddedCallback.event(BuiltinRegistries.BIOME).register((i, identifier, biome) -> addToBiome(biome)); + } + + private static void addToBiome(Biome biome) { + addSaltOre(biome); + } + + private static void addSaltOre(Biome biome) { + if (biome.getCategory() != Biome.Category.NETHER && biome.getCategory() != Biome.Category.THEEND) { + addFeature(biome, GenerationStep.Feature.UNDERGROUND_DECORATION, OreFeatures.ROCKY_ASPHALT_FEATURE); + } + } + + public static void addFeature(Biome biome, GenerationStep.Feature step, ConfiguredFeature feature) { + GenerationSettingsAccessorMixin generationSettingsAccessor = (GenerationSettingsAccessorMixin) biome.getGenerationSettings(); + int stepIndex = step.ordinal(); + List>>> featuresByStep = new ArrayList<>( generationSettingsAccessor.getFeatures()); + while (featuresByStep.size() <= stepIndex) { + featuresByStep.add(Lists.newArrayList()); + } + List>> features = new ArrayList<>(featuresByStep.get(stepIndex)); + features.add(() -> feature); + featuresByStep.set(stepIndex, features); + generationSettingsAccessor.setFeatures(featuresByStep); + } +} \ No newline at end of file diff --git a/src/main/java/eu/midnightdust/motschen/decorative/OreFeatures.java b/src/main/java/eu/midnightdust/motschen/decorative/world/OreFeatures.java similarity index 87% rename from src/main/java/eu/midnightdust/motschen/decorative/OreFeatures.java rename to src/main/java/eu/midnightdust/motschen/decorative/world/OreFeatures.java index 304e049..a1fac42 100644 --- a/src/main/java/eu/midnightdust/motschen/decorative/OreFeatures.java +++ b/src/main/java/eu/midnightdust/motschen/decorative/world/OreFeatures.java @@ -1,5 +1,6 @@ -package eu.midnightdust.motschen.decorative; +package eu.midnightdust.motschen.decorative.world; +import eu.midnightdust.motschen.decorative.DecorativeMain; import net.minecraft.util.Identifier; import net.minecraft.util.registry.BuiltinRegistries; import net.minecraft.util.registry.Registry; @@ -12,6 +13,5 @@ public class OreFeatures { public static void init() { Registry.register(BuiltinRegistries.CONFIGURED_FEATURE, new Identifier(DecorativeMain.MOD_ID, "rocky_asphalt"), ROCKY_ASPHALT_FEATURE); - } } diff --git a/src/main/resources/assets/decorative/blockstates/acacia_log_with_axe.json b/src/main/resources/assets/decorative/blockstates/acacia_log_with_axe.json index bf410b7..5c3b27c 100644 --- a/src/main/resources/assets/decorative/blockstates/acacia_log_with_axe.json +++ b/src/main/resources/assets/decorative/blockstates/acacia_log_with_axe.json @@ -1,8 +1,5 @@ { "variants": { - "facing=south": { "model": "decorative:block/acacia_log_with_axe" }, - "facing=west": { "model": "decorative:block/acacia_log_with_axe", "y": 90 }, - "facing=north": { "model": "decorative:block/acacia_log_with_axe", "y": 180 }, - "facing=east": { "model": "decorative:block/acacia_log_with_axe", "y": 270 } + "": { "model": "block/acacia_log" } } } diff --git a/src/main/resources/assets/decorative/blockstates/birch_log_with_axe.json b/src/main/resources/assets/decorative/blockstates/birch_log_with_axe.json index f1eb74c..ea63c3b 100644 --- a/src/main/resources/assets/decorative/blockstates/birch_log_with_axe.json +++ b/src/main/resources/assets/decorative/blockstates/birch_log_with_axe.json @@ -1,8 +1,5 @@ { "variants": { - "facing=south": { "model": "decorative:block/birch_log_with_axe" }, - "facing=west": { "model": "decorative:block/birch_log_with_axe", "y": 90 }, - "facing=north": { "model": "decorative:block/birch_log_with_axe", "y": 180 }, - "facing=east": { "model": "decorative:block/birch_log_with_axe", "y": 270 } + "": { "model": "block/birch_log" } } } diff --git a/src/main/resources/assets/decorative/blockstates/ceilingfan.json b/src/main/resources/assets/decorative/blockstates/ceilingfan.json index 8aea452..ff21578 100644 --- a/src/main/resources/assets/decorative/blockstates/ceilingfan.json +++ b/src/main/resources/assets/decorative/blockstates/ceilingfan.json @@ -1,6 +1,5 @@ { "variants": { - "lit=true": { "model": "decorative:block/ceilingfan_activated" }, - "lit=false": { "model": "decorative:block/ceilingfan" } + "": { "model": "decorative:block/ceilingfan" } } } diff --git a/src/main/resources/assets/decorative/blockstates/dark_oak_log_with_axe.json b/src/main/resources/assets/decorative/blockstates/dark_oak_log_with_axe.json index ac72544..7ae8344 100644 --- a/src/main/resources/assets/decorative/blockstates/dark_oak_log_with_axe.json +++ b/src/main/resources/assets/decorative/blockstates/dark_oak_log_with_axe.json @@ -1,8 +1,5 @@ { "variants": { - "facing=south": { "model": "decorative:block/dark_oak_log_with_axe" }, - "facing=west": { "model": "decorative:block/dark_oak_log_with_axe", "y": 90 }, - "facing=north": { "model": "decorative:block/dark_oak_log_with_axe", "y": 180 }, - "facing=east": { "model": "decorative:block/dark_oak_log_with_axe", "y": 270 } + "": { "model": "block/dark_oak_log" } } } diff --git a/src/main/resources/assets/decorative/blockstates/jungle_log_with_axe.json b/src/main/resources/assets/decorative/blockstates/jungle_log_with_axe.json index 3253708..6a99f00 100644 --- a/src/main/resources/assets/decorative/blockstates/jungle_log_with_axe.json +++ b/src/main/resources/assets/decorative/blockstates/jungle_log_with_axe.json @@ -1,8 +1,5 @@ { "variants": { - "facing=south": { "model": "decorative:block/jungle_log_with_axe" }, - "facing=west": { "model": "decorative:block/jungle_log_with_axe", "y": 90 }, - "facing=north": { "model": "decorative:block/jungle_log_with_axe", "y": 180 }, - "facing=east": { "model": "decorative:block/jungle_log_with_axe", "y": 270 } + "": { "model": "block/jungle_log" } } } diff --git a/src/main/resources/assets/decorative/blockstates/oak_log_with_axe.json b/src/main/resources/assets/decorative/blockstates/oak_log_with_axe.json index e70e141..509b9e4 100644 --- a/src/main/resources/assets/decorative/blockstates/oak_log_with_axe.json +++ b/src/main/resources/assets/decorative/blockstates/oak_log_with_axe.json @@ -1,8 +1,5 @@ { "variants": { - "facing=south": { "model": "decorative:block/oak_log_with_axe" }, - "facing=west": { "model": "decorative:block/oak_log_with_axe", "y": 90 }, - "facing=north": { "model": "decorative:block/oak_log_with_axe", "y": 180 }, - "facing=east": { "model": "decorative:block/oak_log_with_axe", "y": 270 } + "": { "model": "block/oak_log" } } } diff --git a/src/main/resources/assets/decorative/blockstates/pennant_chain.json b/src/main/resources/assets/decorative/blockstates/pennant_chain.json new file mode 100644 index 0000000..8963ca6 --- /dev/null +++ b/src/main/resources/assets/decorative/blockstates/pennant_chain.json @@ -0,0 +1,8 @@ +{ + "variants": { + "facing=south": { "model": "decorative:block/pennant_chain", "uvlock": true }, + "facing=west": { "model": "decorative:block/pennant_chain", "uvlock": true, "y": 90 }, + "facing=north": { "model": "decorative:block/pennant_chain", "uvlock": true, "y": 180 }, + "facing=east": { "model": "decorative:block/pennant_chain", "uvlock": true, "y": 270 } + } +} diff --git a/src/main/resources/assets/decorative/blockstates/spruce_log_with_axe.json b/src/main/resources/assets/decorative/blockstates/spruce_log_with_axe.json index 36a9cb8..5fb3b76 100644 --- a/src/main/resources/assets/decorative/blockstates/spruce_log_with_axe.json +++ b/src/main/resources/assets/decorative/blockstates/spruce_log_with_axe.json @@ -1,8 +1,5 @@ { "variants": { - "facing=south": { "model": "decorative:block/spruce_log_with_axe" }, - "facing=west": { "model": "decorative:block/spruce_log_with_axe", "y": 90 }, - "facing=north": { "model": "decorative:block/spruce_log_with_axe", "y": 180 }, - "facing=east": { "model": "decorative:block/spruce_log_with_axe", "y": 270 } + "": { "model": "block/spruce_log" } } } diff --git a/src/main/resources/assets/decorative/models/block/ceilingfan.json b/src/main/resources/assets/decorative/models/block/ceilingfan.json index 8fce297..394c6ad 100644 --- a/src/main/resources/assets/decorative/models/block/ceilingfan.json +++ b/src/main/resources/assets/decorative/models/block/ceilingfan.json @@ -2,10 +2,8 @@ "credit": "made by Motschen", "parent": "block/block", "textures": { - "2": "block/gray_concrete", - "3": "decorative:block/ceilingfannormal", - "5": "block/black_wool", - "particle": "decorative:block/ceilingfannormal" + "1": "block/gray_concrete", + "particle": "block/gray_concrete" }, "elements": [ { @@ -13,77 +11,12 @@ "from": [7, 6, 7], "to": [9, 16, 9], "faces": { - "north": {"uv": [0, 0, 2, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 2, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 2, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 2, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 2, 2], "texture": "#2"} + "north": {"uv": [0, 0, 2, 6], "texture": "#1"}, + "east": {"uv": [0, 0, 2, 6], "texture": "#1"}, + "south": {"uv": [0, 0, 2, 6], "texture": "#1"}, + "west": {"uv": [0, 0, 2, 6], "texture": "#1"}, + "up": {"uv": [0, 0, 2, 2], "texture": "#1"} } - }, - { - "from": [7, 4, 7], - "to": [9, 6, 9], - "faces": { - "north": {"uv": [0, 0, 2, 2], "texture": "#5"}, - "east": {"uv": [0, 0, 2, 2], "texture": "#5"}, - "south": {"uv": [0, 0, 2, 2], "texture": "#5"}, - "west": {"uv": [0, 0, 2, 2], "texture": "#5"}, - "down": {"uv": [0, 0, 2, 2], "texture": "#5"} - } - }, - { - "from": [-3, 5, 7], - "to": [7, 6, 9], - "faces": { - "north": {"uv": [0, 0, 4, 4], "texture": "#3"}, - "east": {"uv": [0, 0, 4, 4], "texture": "#3"}, - "south": {"uv": [0, 0, 4, 4], "texture": "#3"}, - "west": {"uv": [0, 0, 4, 4], "texture": "#3"}, - "up": {"uv": [0, 0, 4, 4], "texture": "#3"}, - "down": {"uv": [0, 0, 4, 4], "texture": "#3"} - } - }, - { - "from": [9, 5, 7], - "to": [19, 6, 9], - "faces": { - "north": {"uv": [0, 0, 4, 4], "texture": "#3"}, - "east": {"uv": [0, 0, 4, 4], "texture": "#3"}, - "south": {"uv": [0, 0, 4, 4], "texture": "#3"}, - "west": {"uv": [0, 0, 4, 4], "texture": "#3"}, - "up": {"uv": [0, 0, 4, 4], "texture": "#3"}, - "down": {"uv": [0, 0, 4, 4], "texture": "#3"} - } - }, - { - "from": [7, 5, -3], - "to": [9, 6, 7], - "faces": { - "north": {"uv": [0, 0, 4, 4], "rotation": 90, "texture": "#3"}, - "east": {"uv": [0, 0, 4, 4], "rotation": 90, "texture": "#3"}, - "south": {"uv": [0, 0, 4, 4], "rotation": 90, "texture": "#3"}, - "west": {"uv": [0, 0, 4, 4], "rotation": 90, "texture": "#3"}, - "up": {"uv": [0, 0, 4, 4], "rotation": 90, "texture": "#3"}, - "down": {"uv": [0, 0, 4, 4], "rotation": 90, "texture": "#3"} - } - }, - { - "from": [7, 5, 9], - "to": [9, 6, 19], - "faces": { - "north": {"uv": [0, 0, 4, 4], "rotation": 90, "texture": "#3"}, - "east": {"uv": [0, 0, 4, 4], "rotation": 90, "texture": "#3"}, - "south": {"uv": [0, 0, 4, 4], "rotation": 90, "texture": "#3"}, - "west": {"uv": [0, 0, 4, 4], "rotation": 90, "texture": "#3"}, - "up": {"uv": [0, 0, 4, 4], "rotation": 90, "texture": "#3"}, - "down": {"uv": [0, 0, 4, 4], "rotation": 90, "texture": "#3"} - } - } - ], - "groups": [0, 1, - { - "name": "normal", - "children": [2, 3, 4, 5] } ] } \ No newline at end of file diff --git a/src/main/resources/assets/decorative/models/block/ceilingfan_activated.json b/src/main/resources/assets/decorative/models/block/ceilingfan_activated.json deleted file mode 100644 index e1c194f..0000000 --- a/src/main/resources/assets/decorative/models/block/ceilingfan_activated.json +++ /dev/null @@ -1,257 +0,0 @@ -{ - "credit": "made by Motschen", - "parent": "block/block", - "textures": { - "1": "decorative:block/ceilingfan", - "2": "block/gray_concrete", - "5": "block/black_wool", - "particle": "decorative:block/ceilingfannormal" - }, - "elements": [ - { - "name": "Cube", - "from": [7, 6, 7], - "to": [9, 16, 9], - "faces": { - "north": {"uv": [0, 0, 2, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 2, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 2, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 2, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 2, 2], "texture": "#2"} - } - }, - { - "from": [7, 4, 7], - "to": [9, 6, 9], - "faces": { - "north": {"uv": [0, 0, 2, 2], "texture": "#5"}, - "east": {"uv": [0, 0, 2, 2], "texture": "#5"}, - "south": {"uv": [0, 0, 2, 2], "texture": "#5"}, - "west": {"uv": [0, 0, 2, 2], "texture": "#5"}, - "down": {"uv": [0, 0, 2, 2], "texture": "#5"} - } - }, - { - "from": [-3, 5, 7], - "to": [7, 6, 9], - "faces": { - "north": {"uv": [0, 0, 4, 4], "texture": "#1"}, - "east": {"uv": [0, 0, 4, 4], "texture": "#1"}, - "south": {"uv": [0, 0, 4, 4], "texture": "#1"}, - "west": {"uv": [0, 0, 4, 4], "texture": "#1"}, - "up": {"uv": [0, 0, 4, 4], "texture": "#1"}, - "down": {"uv": [0, 0, 4, 4], "texture": "#1"} - } - }, - { - "from": [9, 5, 7], - "to": [19, 6, 9], - "faces": { - "north": {"uv": [0, 0, 4, 4], "texture": "#1"}, - "east": {"uv": [0, 0, 4, 4], "texture": "#1"}, - "south": {"uv": [0, 0, 4, 4], "texture": "#1"}, - "west": {"uv": [0, 0, 4, 4], "texture": "#1"}, - "up": {"uv": [0, 0, 4, 4], "texture": "#1"}, - "down": {"uv": [0, 0, 4, 4], "texture": "#1"} - } - }, - { - "from": [7, 5, -3], - "to": [9, 6, 7], - "faces": { - "north": {"uv": [0, 0, 4, 4], "rotation": 90, "texture": "#1"}, - "east": {"uv": [0, 0, 4, 4], "rotation": 90, "texture": "#1"}, - "south": {"uv": [0, 0, 4, 4], "rotation": 90, "texture": "#1"}, - "west": {"uv": [0, 0, 4, 4], "rotation": 90, "texture": "#1"}, - "up": {"uv": [0, 0, 4, 4], "rotation": 90, "texture": "#1"}, - "down": {"uv": [0, 0, 4, 4], "rotation": 90, "texture": "#1"} - } - }, - { - "from": [7, 5, 9], - "to": [9, 6, 19], - "faces": { - "north": {"uv": [0, 0, 4, 4], "rotation": 90, "texture": "#1"}, - "east": {"uv": [0, 0, 4, 4], "rotation": 90, "texture": "#1"}, - "south": {"uv": [0, 0, 4, 4], "rotation": 90, "texture": "#1"}, - "west": {"uv": [0, 0, 4, 4], "rotation": 90, "texture": "#1"}, - "up": {"uv": [0, 0, 4, 4], "rotation": 90, "texture": "#1"}, - "down": {"uv": [0, 0, 4, 4], "rotation": 90, "texture": "#1"} - } - }, - { - "from": [6, 5, 1.5], - "to": [8, 6, 11.5], - "rotation": {"angle": 22.5, "axis": "y", "origin": [-3.5, 5.5, 7.5]}, - "faces": { - "north": {"uv": [12, 0, 16, 4], "texture": "#1"}, - "east": {"uv": [12, 0, 16, 4], "texture": "#1"}, - "south": {"uv": [12, 0, 16, 4], "texture": "#1"}, - "west": {"uv": [12, 0, 16, 4], "texture": "#1"}, - "up": {"uv": [12, 0, 16, 4], "texture": "#1"}, - "down": {"uv": [12, 0, 16, 4], "texture": "#1"} - } - }, - { - "from": [6, 5, 11.5], - "to": [8, 6, 23.5], - "rotation": {"angle": 22.5, "axis": "y", "origin": [-3.5, 5.5, 7.5]}, - "faces": { - "north": {"uv": [8, 0, 16, 4], "texture": "#1"}, - "east": {"uv": [8, 0, 16, 4], "texture": "#1"}, - "south": {"uv": [8, 0, 16, 4], "texture": "#1"}, - "west": {"uv": [8, 0, 16, 4], "texture": "#1"}, - "up": {"uv": [8, 0, 16, 4], "texture": "#1"}, - "down": {"uv": [8, 0, 16, 4], "texture": "#1"} - } - }, - { - "from": [-4, 5, 11.5], - "to": [6, 6, 13.5], - "rotation": {"angle": 22.5, "axis": "y", "origin": [-3.5, 5.5, 7.5]}, - "faces": { - "north": {"uv": [8, 0, 16, 4], "texture": "#1"}, - "east": {"uv": [8, 0, 16, 4], "texture": "#1"}, - "south": {"uv": [8, 0, 16, 4], "texture": "#1"}, - "west": {"uv": [8, 0, 16, 4], "texture": "#1"}, - "up": {"uv": [8, 0, 16, 4], "texture": "#1"}, - "down": {"uv": [8, 0, 16, 4], "texture": "#1"} - } - }, - { - "from": [8, 5, 11.5], - "to": [18, 6, 13.5], - "rotation": {"angle": 22.5, "axis": "y", "origin": [-3.5, 5.5, 7.5]}, - "faces": { - "north": {"uv": [8, 0, 16, 4], "texture": "#1"}, - "east": {"uv": [8, 0, 16, 4], "texture": "#1"}, - "south": {"uv": [8, 0, 16, 4], "texture": "#1"}, - "west": {"uv": [8, 0, 16, 4], "texture": "#1"}, - "up": {"uv": [8, 0, 16, 4], "texture": "#1"}, - "down": {"uv": [8, 0, 16, 4], "texture": "#1"} - } - }, - { - "from": [3, 5, 5], - "to": [5, 6, 15], - "rotation": {"angle": 45, "axis": "y", "origin": [-3.5, 5.5, 7.5]}, - "faces": { - "north": {"uv": [12, 12, 16, 16], "texture": "#1"}, - "east": {"uv": [12, 12, 16, 16], "texture": "#1"}, - "south": {"uv": [12, 12, 16, 16], "texture": "#1"}, - "west": {"uv": [12, 12, 16, 16], "texture": "#1"}, - "up": {"uv": [12, 12, 16, 16], "texture": "#1"}, - "down": {"uv": [12, 12, 16, 16], "texture": "#1"} - } - }, - { - "from": [3, 5, 15], - "to": [5, 6, 27], - "rotation": {"angle": 45, "axis": "y", "origin": [-3.5, 5.5, 7.5]}, - "faces": { - "north": {"uv": [12, 12, 16, 16], "texture": "#1"}, - "east": {"uv": [12, 12, 16, 16], "texture": "#1"}, - "south": {"uv": [12, 12, 16, 16], "texture": "#1"}, - "west": {"uv": [12, 12, 16, 16], "texture": "#1"}, - "up": {"uv": [12, 12, 16, 16], "texture": "#1"}, - "down": {"uv": [12, 12, 16, 16], "texture": "#1"} - } - }, - { - "from": [-7, 5, 15], - "to": [3, 6, 17], - "rotation": {"angle": 45, "axis": "y", "origin": [-3.5, 5.5, 7.5]}, - "faces": { - "north": {"uv": [12, 12, 16, 16], "texture": "#1"}, - "east": {"uv": [12, 12, 16, 16], "texture": "#1"}, - "south": {"uv": [12, 12, 16, 16], "texture": "#1"}, - "west": {"uv": [12, 12, 16, 16], "texture": "#1"}, - "up": {"uv": [12, 12, 16, 16], "texture": "#1"}, - "down": {"uv": [12, 12, 16, 16], "texture": "#1"} - } - }, - { - "from": [5, 5, 15], - "to": [15, 6, 17], - "rotation": {"angle": 45, "axis": "y", "origin": [-3.5, 5.5, 7.5]}, - "faces": { - "north": {"uv": [12, 12, 16, 16], "texture": "#1"}, - "east": {"uv": [12, 12, 16, 16], "texture": "#1"}, - "south": {"uv": [12, 12, 16, 16], "texture": "#1"}, - "west": {"uv": [12, 12, 16, 16], "texture": "#1"}, - "up": {"uv": [12, 12, 16, 16], "texture": "#1"}, - "down": {"uv": [12, 12, 16, 16], "texture": "#1"} - } - }, - { - "from": [6.5, 5, -7.5], - "to": [8.5, 6, 2.5], - "rotation": {"angle": -22.5, "axis": "y", "origin": [-3.5, 5.5, 7.5]}, - "faces": { - "north": {"uv": [0, 12, 4, 16], "texture": "#1"}, - "east": {"uv": [0, 12, 4, 16], "texture": "#1"}, - "south": {"uv": [0, 12, 4, 16], "texture": "#1"}, - "west": {"uv": [0, 12, 4, 16], "texture": "#1"}, - "up": {"uv": [0, 12, 4, 16], "texture": "#1"}, - "down": {"uv": [0, 12, 4, 16], "texture": "#1"} - } - }, - { - "from": [6.5, 5, 2.5], - "to": [8.5, 6, 14.5], - "rotation": {"angle": -22.5, "axis": "y", "origin": [-3.5, 5.5, 7.5]}, - "faces": { - "north": {"uv": [0, 8, 4, 16], "texture": "#1"}, - "east": {"uv": [0, 8, 4, 16], "texture": "#1"}, - "south": {"uv": [0, 8, 4, 16], "texture": "#1"}, - "west": {"uv": [0, 8, 4, 16], "texture": "#1"}, - "up": {"uv": [0, 8, 4, 16], "texture": "#1"}, - "down": {"uv": [0, 8, 4, 16], "texture": "#1"} - } - }, - { - "from": [-3.5, 5, 2.5], - "to": [6.5, 6, 4.5], - "rotation": {"angle": -22.5, "axis": "y", "origin": [-3.5, 5.5, 7.5]}, - "faces": { - "north": {"uv": [0, 8, 4, 16], "texture": "#1"}, - "east": {"uv": [0, 8, 4, 16], "texture": "#1"}, - "south": {"uv": [0, 8, 4, 16], "texture": "#1"}, - "west": {"uv": [0, 8, 4, 16], "texture": "#1"}, - "up": {"uv": [0, 8, 4, 16], "texture": "#1"}, - "down": {"uv": [0, 8, 4, 16], "texture": "#1"} - } - }, - { - "from": [8.5, 5, 2.5], - "to": [18.5, 6, 4.5], - "rotation": {"angle": -22.5, "axis": "y", "origin": [-3.5, 5.5, 7.5]}, - "faces": { - "north": {"uv": [0, 8, 4, 16], "texture": "#1"}, - "east": {"uv": [0, 8, 4, 16], "texture": "#1"}, - "south": {"uv": [0, 8, 4, 16], "texture": "#1"}, - "west": {"uv": [0, 8, 4, 16], "texture": "#1"}, - "up": {"uv": [0, 8, 4, 16], "texture": "#1"}, - "down": {"uv": [0, 8, 4, 16], "texture": "#1"} - } - } - ], - "groups": [0, 1, - { - "name": "normal", - "children": [2, 3, 4, 5] - }, - { - "name": "rot1", - "children": [6, 7, 8, 9] - }, - { - "name": "rot2", - "children": [10, 11, 12, 13] - }, - { - "name": "rot3", - "children": [14, 15, 16, 17] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/decorative/models/block/pennant_chain.json b/src/main/resources/assets/decorative/models/block/pennant_chain.json new file mode 100644 index 0000000..9e00b55 --- /dev/null +++ b/src/main/resources/assets/decorative/models/block/pennant_chain.json @@ -0,0 +1,246 @@ +{ + "credit": "made by Motschen", + "textures": { + "1": "block/black_concrete", + "2": "decorative:block/red_lamp_off", + "4": "decorative:block/green_lamp_off", + "particle": "block/black_concrete" + }, + "elements": [ + { + "from": [-8, 4.6, 8], + "to": [3, 5.6, 9], + "rotation": {"angle": -22.5, "axis": "z", "origin": [8, 12, 8]}, + "faces": { + "north": {"uv": [0, 0, 11, 1], "texture": "#1"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#1"}, + "south": {"uv": [0, 0, 11, 1], "texture": "#1"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#1"}, + "up": {"uv": [0, 0, 11, 1], "texture": "#1"}, + "down": {"uv": [0, 0, 11, 1], "texture": "#1"} + } + }, + { + "from": [13.1, 4.6, 8], + "to": [24.1, 5.6, 9], + "rotation": {"angle": 22.5, "axis": "z", "origin": [8, 12, 8]}, + "faces": { + "north": {"uv": [0, 0, 11, 1], "texture": "#1"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#1"}, + "south": {"uv": [0, 0, 11, 1], "texture": "#1"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#1"}, + "up": {"uv": [0, 0, 11, 1], "rotation": 180, "texture": "#1"}, + "down": {"uv": [0, 0, 11, 1], "rotation": 180, "texture": "#1"} + } + }, + { + "from": [0.5, 7.1, 8], + "to": [15.53, 8.1, 9], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 8]}, + "faces": { + "north": {"uv": [0, 0, 15.03, 1], "texture": "#1"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#1"}, + "south": {"uv": [0, 0, 15.03, 1], "texture": "#1"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#1"}, + "up": {"uv": [0, 0, 15.03, 1], "rotation": 180, "texture": "#1"}, + "down": {"uv": [0, 0, 15.03, 1], "rotation": 180, "texture": "#1"} + } + }, + { + "from": [20, 24, 8], + "to": [21, 32, 9], + "rotation": {"angle": -45, "axis": "z", "origin": [8, 12, 8]}, + "faces": { + "north": {"uv": [0, 0, 8, 1], "rotation": 90, "texture": "#1"}, + "east": {"uv": [0, 0, 8, 1], "rotation": 90, "texture": "#1"}, + "south": {"uv": [0, 0, 8, 1], "rotation": 270, "texture": "#1"}, + "west": {"uv": [0, 0, 8, 1], "rotation": 90, "texture": "#1"}, + "up": {"uv": [0, 0, 1, 1], "rotation": 270, "texture": "#1"}, + "down": {"uv": [0, 0, 1, 1], "rotation": 270, "texture": "#1"} + } + }, + { + "from": [-5, 24, 8], + "to": [-4, 32, 9], + "rotation": {"angle": 45, "axis": "z", "origin": [8, 12, 8]}, + "faces": { + "north": {"uv": [0, 0, 8, 1], "rotation": 270, "texture": "#1"}, + "east": {"uv": [0, 0, 8, 1], "rotation": 90, "texture": "#1"}, + "south": {"uv": [0, 0, 8, 1], "rotation": 90, "texture": "#1"}, + "west": {"uv": [0, 0, 8, 1], "rotation": 90, "texture": "#1"}, + "up": {"uv": [0, 0, 1, 1], "rotation": 90, "texture": "#1"}, + "down": {"uv": [0, 0, 1, 1], "rotation": 90, "texture": "#1"} + } + }, + { + "from": [1, 4, 7], + "to": [4, 7, 10], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 12, 8]}, + "faces": { + "north": {"uv": [9, 9, 12, 12], "texture": "#2"}, + "east": {"uv": [11, 10, 14, 13], "texture": "#2"}, + "south": {"uv": [4, 2, 7, 5], "texture": "#2"}, + "west": {"uv": [2, 3, 5, 6], "texture": "#2"}, + "up": {"uv": [11, 11, 14, 14], "texture": "#2"}, + "down": {"uv": [7, 4, 10, 7], "texture": "#2"} + } + }, + { + "from": [6.5, 4, 7], + "to": [9.5, 7, 10], + "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, 8]}, + "faces": { + "north": {"uv": [9, 9, 12, 12], "texture": "#4"}, + "east": {"uv": [11, 10, 14, 13], "texture": "#4"}, + "south": {"uv": [4, 2, 7, 5], "texture": "#4"}, + "west": {"uv": [2, 3, 5, 6], "texture": "#4"}, + "up": {"uv": [11, 11, 14, 14], "texture": "#4"}, + "down": {"uv": [7, 4, 10, 7], "texture": "#4"} + } + }, + { + "from": [12, 4, 7], + "to": [15, 7, 10], + "rotation": {"angle": 0, "axis": "y", "origin": [20, 12, 8]}, + "faces": { + "north": {"uv": [9, 9, 12, 12], "texture": "#2"}, + "east": {"uv": [11, 10, 14, 13], "texture": "#2"}, + "south": {"uv": [4, 2, 7, 5], "texture": "#2"}, + "west": {"uv": [2, 3, 5, 6], "texture": "#2"}, + "up": {"uv": [11, 11, 14, 14], "texture": "#2"}, + "down": {"uv": [7, 4, 10, 7], "texture": "#2"} + } + }, + { + "from": [15.5, 9, 7], + "to": [18.5, 12, 10], + "rotation": {"angle": 22.5, "axis": "z", "origin": [27, 14, 8]}, + "faces": { + "north": {"uv": [9, 9, 12, 12], "texture": "#4"}, + "east": {"uv": [11, 10, 14, 13], "texture": "#4"}, + "south": {"uv": [4, 2, 7, 5], "texture": "#4"}, + "west": {"uv": [2, 3, 5, 6], "texture": "#4"}, + "up": {"uv": [11, 11, 14, 14], "texture": "#4"}, + "down": {"uv": [7, 4, 10, 7], "texture": "#4"} + } + }, + { + "from": [-2.5, 3, 7], + "to": [0.5, 6, 10], + "rotation": {"angle": -22.5, "axis": "z", "origin": [5, 12, 8]}, + "faces": { + "north": {"uv": [9, 9, 12, 12], "texture": "#4"}, + "east": {"uv": [11, 10, 14, 13], "texture": "#4"}, + "south": {"uv": [4, 2, 7, 5], "texture": "#4"}, + "west": {"uv": [2, 3, 5, 6], "texture": "#4"}, + "up": {"uv": [11, 11, 14, 14], "texture": "#4"}, + "down": {"uv": [7, 4, 10, 7], "texture": "#4"} + } + }, + { + "from": [22, 10, 7], + "to": [25, 13, 10], + "rotation": {"angle": 22.5, "axis": "z", "origin": [30, 12, 8]}, + "faces": { + "north": {"uv": [9, 9, 12, 12], "texture": "#2"}, + "east": {"uv": [11, 10, 14, 13], "texture": "#2"}, + "south": {"uv": [4, 2, 7, 5], "texture": "#2"}, + "west": {"uv": [2, 3, 5, 6], "texture": "#2"}, + "up": {"uv": [11, 11, 14, 14], "texture": "#2"}, + "down": {"uv": [7, 4, 10, 7], "texture": "#2"} + } + }, + { + "from": [-8, 7.5, 7], + "to": [-5, 10.5, 10], + "rotation": {"angle": -22.5, "axis": "z", "origin": [-7, 12, 8]}, + "faces": { + "north": {"uv": [9, 9, 12, 12], "texture": "#2"}, + "east": {"uv": [11, 10, 14, 13], "texture": "#2"}, + "south": {"uv": [4, 2, 7, 5], "texture": "#2"}, + "west": {"uv": [2, 3, 5, 6], "texture": "#2"}, + "up": {"uv": [11, 11, 14, 14], "texture": "#2"}, + "down": {"uv": [7, 4, 10, 7], "texture": "#2"} + } + } + ], + "display": { + "thirdperson_righthand": { + "translation": [0, 1, 0], + "scale": [0.25, 0.25, 0.25] + }, + "thirdperson_lefthand": { + "translation": [0, 1, 0], + "scale": [0.25, 0.25, 0.25] + }, + "firstperson_righthand": { + "rotation": [0, -23, 0], + "translation": [-0.25, 1.75, 0], + "scale": [0.25, 0.25, 0.25] + }, + "firstperson_lefthand": { + "rotation": [0, -23, 0], + "translation": [0, 2.25, 0], + "scale": [0.25, 0.25, 0.25] + }, + "ground": { + "scale": [0.25, 0.25, 0.25] + }, + "gui": { + "rotation": [25, -25, 0], + "translation": [0, -1.25, 0], + "scale": [0.32, 0.32, 0.32] + }, + "head": { + "translation": [0, 7.5, 0], + "scale": [0.25, 0.25, 0.25] + }, + "fixed": { + "translation": [0, 0, -0.5], + "scale": [0.5, 0.5, 0.5] + } + }, + "groups": [ + { + "name": "hanginglights", + "origin": [8, 8, 8], + "children": [0, 1, 2, 3, 4, + { + "name": "light1", + "origin": [8, 8, 8], + "children": [5] + }, + { + "name": "light2", + "origin": [8, 8, 8], + "children": [6] + }, + { + "name": "light1", + "origin": [8, 8, 8], + "children": [7] + }, + { + "name": "light2", + "origin": [8, 8, 8], + "children": [8] + }, + { + "name": "light2", + "origin": [8, 8, 8], + "children": [9] + }, + { + "name": "light1", + "origin": [8, 8, 8], + "children": [10] + }, + { + "name": "light1", + "origin": [8, 8, 8], + "children": [11] + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/decorative/models/item/ceilingfan.json b/src/main/resources/assets/decorative/models/item/ceilingfan.json index f1d131f..17bfa87 100644 --- a/src/main/resources/assets/decorative/models/item/ceilingfan.json +++ b/src/main/resources/assets/decorative/models/item/ceilingfan.json @@ -1,3 +1,89 @@ { - "parent": "decorative:block/ceilingfan" + "credit": "made by Motschen", + "parent": "block/block", + "textures": { + "2": "block/gray_concrete", + "3": "decorative:block/ceilingfan", + "5": "block/black_wool", + "particle": "decorative:block/ceilingfan" + }, + "elements": [ + { + "name": "Cube", + "from": [7, 6, 7], + "to": [9, 16, 9], + "faces": { + "north": {"uv": [0, 0, 2, 6], "texture": "#2"}, + "east": {"uv": [0, 0, 2, 6], "texture": "#2"}, + "south": {"uv": [0, 0, 2, 6], "texture": "#2"}, + "west": {"uv": [0, 0, 2, 6], "texture": "#2"}, + "up": {"uv": [0, 0, 2, 2], "texture": "#2"} + } + }, + { + "from": [7, 4, 7], + "to": [9, 6, 9], + "faces": { + "north": {"uv": [0, 0, 2, 2], "texture": "#5"}, + "east": {"uv": [0, 0, 2, 2], "texture": "#5"}, + "south": {"uv": [0, 0, 2, 2], "texture": "#5"}, + "west": {"uv": [0, 0, 2, 2], "texture": "#5"}, + "down": {"uv": [0, 0, 2, 2], "texture": "#5"} + } + }, + { + "from": [-3, 5, 7], + "to": [7, 6, 9], + "faces": { + "north": {"uv": [0, 0, 4, 4], "texture": "#3"}, + "east": {"uv": [0, 0, 4, 4], "texture": "#3"}, + "south": {"uv": [0, 0, 4, 4], "texture": "#3"}, + "west": {"uv": [0, 0, 4, 4], "texture": "#3"}, + "up": {"uv": [0, 0, 4, 4], "texture": "#3"}, + "down": {"uv": [0, 0, 4, 4], "texture": "#3"} + } + }, + { + "from": [9, 5, 7], + "to": [19, 6, 9], + "faces": { + "north": {"uv": [0, 0, 4, 4], "texture": "#3"}, + "east": {"uv": [0, 0, 4, 4], "texture": "#3"}, + "south": {"uv": [0, 0, 4, 4], "texture": "#3"}, + "west": {"uv": [0, 0, 4, 4], "texture": "#3"}, + "up": {"uv": [0, 0, 4, 4], "texture": "#3"}, + "down": {"uv": [0, 0, 4, 4], "texture": "#3"} + } + }, + { + "from": [7, 5, -3], + "to": [9, 6, 7], + "faces": { + "north": {"uv": [0, 0, 4, 4], "rotation": 90, "texture": "#3"}, + "east": {"uv": [0, 0, 4, 4], "rotation": 90, "texture": "#3"}, + "south": {"uv": [0, 0, 4, 4], "rotation": 90, "texture": "#3"}, + "west": {"uv": [0, 0, 4, 4], "rotation": 90, "texture": "#3"}, + "up": {"uv": [0, 0, 4, 4], "rotation": 90, "texture": "#3"}, + "down": {"uv": [0, 0, 4, 4], "rotation": 90, "texture": "#3"} + } + }, + { + "from": [7, 5, 9], + "to": [9, 6, 19], + "faces": { + "north": {"uv": [0, 0, 4, 4], "rotation": 90, "texture": "#3"}, + "east": {"uv": [0, 0, 4, 4], "rotation": 90, "texture": "#3"}, + "south": {"uv": [0, 0, 4, 4], "rotation": 90, "texture": "#3"}, + "west": {"uv": [0, 0, 4, 4], "rotation": 90, "texture": "#3"}, + "up": {"uv": [0, 0, 4, 4], "rotation": 90, "texture": "#3"}, + "down": {"uv": [0, 0, 4, 4], "rotation": 90, "texture": "#3"} + } + } + ], + "groups": [0, 1, + { + "name": "normal", + "children": [2, 3, 4, 5] + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/decorative/sounds.json b/src/main/resources/assets/decorative/sounds.json new file mode 100644 index 0000000..888e4f7 --- /dev/null +++ b/src/main/resources/assets/decorative/sounds.json @@ -0,0 +1,10 @@ +{ +"ceiling_fan.ambient": { + "sounds": [ + { + "name": "decorative:block/ceiling_fan_ambient", + "stream": false + } + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/decorative/sounds/block/ceiling_fan_ambient.ogg b/src/main/resources/assets/decorative/sounds/block/ceiling_fan_ambient.ogg new file mode 100644 index 0000000000000000000000000000000000000000..1c4c1ff385a7c9dee84af3d110ddf522301c52f5 GIT binary patch literal 25506 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 XTpNN5>)Hfctcq`hPyWUj1poj5x(zxR literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/decorative/textures/block/ceilingfan.png b/src/main/resources/assets/decorative/textures/block/ceilingfan.png index ae0cfb5cb46774c1ab8a0fa764ea53f3215c6a0f..ec8c4c8a2e6670d8f57614090b9b67dd7a7c73a6 100644 GIT binary patch delta 145 zcmdnYxPeizGr-TCmrII^fq{Y7)59eQNGpIa2NRI|Bk^|eL`9ACJq!$ddl;wgDe?pg zx_Y`ehIn|ty|_@2L6L{`qC@5d?3{%kImr-ztc`upG>Ep7k~ybc)I$ztaD0e0sz+_E@J=y delta 148 zcmdnMxS3J0Gr-TCmrII^fq{Y7)59eQNDBb50|y(B6t4X~ZK9$^)@}v{zTJ$+e_SyG z3VL|DIEF;HzrDVZlR<%p^`dU4x@-{Ic|D^vc1naxiRhiX&q`OH{Vdfe x&g7t#ZaeoLciYQu1_qr!+$;^PdnY!i@XA^8$4+R_kpr5^;OXk;vd$@?2>_oaFUefNB{$UHx3vIVCg!0Q+|#1poj5 diff --git a/src/main/resources/decorative.mixins.json b/src/main/resources/decorative.mixins.json index 420c293..baa1df2 100644 --- a/src/main/resources/decorative.mixins.json +++ b/src/main/resources/decorative.mixins.json @@ -3,7 +3,7 @@ "package": "eu.midnightdust.motschen.decorative.mixin", "compatibilityLevel": "JAVA_8", "mixins": [ - "DefaultBiomeFeaturesMixin" + "GenerationSettingsAccessorMixin" ], "injectors": { "defaultRequire": 1