From a8aa25365348de6bdd0279ede37cd465534f60c9 Mon Sep 17 00:00:00 2001 From: XiaoMoMi Date: Wed, 12 Feb 2025 18:37:44 +0800 Subject: [PATCH 1/2] Added bow template --- .../resources/default/configuration/items.yml | 44 +++++++------- .../resources/default/configuration/ores.yml | 2 +- .../default/configuration/palm_tree.yml | 10 ++++ .../default/configuration/templates.yml | 55 ++++++++++++++++++ .../textures/block/custom/chinese_lantern.png | Bin 0 -> 1107 bytes .../block/custom/chinese_lantern.png.mcmeta | 6 ++ .../block/custom/chinese_lantern_top.png | Bin 0 -> 1265 bytes .../custom/chinese_lantern_top.png.mcmeta | 6 ++ .../block/custom/deepslate_topaz_ore.png | Bin 1033 -> 984 bytes .../textures/item/custom/beginner_rod.png | Bin 233 -> 0 bytes .../item/custom/beginner_rod_cast.png | Bin 191 -> 0 bytes .../textures/item/custom/topaz_bow.png | Bin 0 -> 288 bytes .../item/custom/topaz_bow_pulling_0.png | Bin 0 -> 399 bytes .../item/custom/topaz_bow_pulling_1.png | Bin 0 -> 390 bytes .../item/custom/topaz_bow_pulling_2.png | Bin 0 -> 381 bytes .../item/custom/topaz_crossbow_arrow.png | Bin 0 -> 652 bytes .../item/custom/topaz_crossbow_firework.png | Bin 0 -> 674 bytes .../item/custom/topaz_crossbow_pulling_0.png | Bin 0 -> 634 bytes .../item/custom/topaz_crossbow_pulling_1.png | Bin 0 -> 633 bytes .../item/custom/topaz_crossbow_pulling_2.png | Bin 0 -> 619 bytes .../item/custom/topaz_crossbow_standby.png | Bin 0 -> 625 bytes .../textures/item/custom/topaz_rod.png | Bin 0 -> 256 bytes .../textures/item/custom/topaz_rod_cast.png | Bin 0 -> 200 bytes .../core/pack/PackManagerImpl.java | 14 ++++- .../pack/model/RangeDispatchItemModel.java | 1 + 25 files changed, 115 insertions(+), 23 deletions(-) create mode 100644 bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/block/custom/chinese_lantern.png create mode 100644 bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/block/custom/chinese_lantern.png.mcmeta create mode 100644 bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/block/custom/chinese_lantern_top.png create mode 100644 bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/block/custom/chinese_lantern_top.png.mcmeta delete mode 100644 bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/beginner_rod.png delete mode 100644 bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/beginner_rod_cast.png create mode 100644 bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_bow.png create mode 100644 bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_bow_pulling_0.png create mode 100644 bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_bow_pulling_1.png create mode 100644 bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_bow_pulling_2.png create mode 100644 bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_crossbow_arrow.png create mode 100644 bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_crossbow_firework.png create mode 100644 bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_crossbow_pulling_0.png create mode 100644 bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_crossbow_pulling_1.png create mode 100644 bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_crossbow_pulling_2.png create mode 100644 bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_crossbow_standby.png create mode 100644 bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_rod.png create mode 100644 bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_rod_cast.png diff --git a/bukkit-loader/src/main/resources/resources/default/configuration/items.yml b/bukkit-loader/src/main/resources/resources/default/configuration/items.yml index 06c9a5553..e73f239bb 100644 --- a/bukkit-loader/src/main/resources/resources/default/configuration/items.yml +++ b/bukkit-loader/src/main/resources/resources/default/configuration/items.yml @@ -1,25 +1,29 @@ items: - default:beginner_rod: + default:topaz_rod: material: fishing_rod custom-model-data: 1000 data: - display-name: "Beginner Rod" - lore: - - "This is the description" + display-name: "<#FF8C00>Topaz Rod" model: - type: "minecraft:condition" - property: "minecraft:fishing_rod/cast" - on-false: - type: "minecraft:model" - path: "minecraft:item/custom/beginner_rod" - generation: - parent: "minecraft:item/fishing_rod" - textures: - "layer0": "minecraft:item/custom/beginner_rod" - on-true: - type: "minecraft:model" - path: "minecraft:item/custom/beginner_rod_cast" - generation: - parent: "minecraft:item/fishing_rod" - textures: - "layer0": "minecraft:item/custom/beginner_rod_cast" \ No newline at end of file + template: models:fishing_rod_2d + arguments: + rod_model: minecraft:item/custom/topaz_rod + rod_texture: minecraft:item/custom/topaz_rod + rod_cast_model: minecraft:item/custom/topaz_rod_cast + rod_cast_texture: minecraft:item/custom/topaz_rod_cast + default:topaz_bow: + material: bow + custom-model-data: 1000 + data: + display-name: "<#FF8C00>Topaz Bow" + model: + template: models:bow_2d + arguments: + bow_model: minecraft:item/custom/topaz_bow + bow_texture: minecraft:item/custom/topaz_bow + bow_pulling_0_model: minecraft:item/custom/topaz_bow_pulling_0 + bow_pulling_0_texture: minecraft:item/custom/topaz_bow_pulling_0 + bow_pulling_1_model: minecraft:item/custom/topaz_bow_pulling_1 + bow_pulling_1_texture: minecraft:item/custom/topaz_bow_pulling_1 + bow_pulling_2_model: minecraft:item/custom/topaz_bow_pulling_2 + bow_pulling_2_texture: minecraft:item/custom/topaz_bow_pulling_2 \ No newline at end of file diff --git a/bukkit-loader/src/main/resources/resources/default/configuration/ores.yml b/bukkit-loader/src/main/resources/resources/default/configuration/ores.yml index cd61392c9..ed469676a 100644 --- a/bukkit-loader/src/main/resources/resources/default/configuration/ores.yml +++ b/bukkit-loader/src/main/resources/resources/default/configuration/ores.yml @@ -29,7 +29,7 @@ items: material: paper custom-model-data: 1012 data: - display-name: "Topaz" + display-name: "<#FF8C00>Topaz" model: template: models:generated arguments: diff --git a/bukkit-loader/src/main/resources/resources/default/configuration/palm_tree.yml b/bukkit-loader/src/main/resources/resources/default/configuration/palm_tree.yml index ba0a4824a..e6076e8b7 100644 --- a/bukkit-loader/src/main/resources/resources/default/configuration/palm_tree.yml +++ b/bukkit-loader/src/main/resources/resources/default/configuration/palm_tree.yml @@ -222,6 +222,16 @@ items: behavior: type: block_item block: default:palm_planks + default:palm_sapling: + material: paper + custom-model-data: 1005 + data: + display-name: "Palm Sapling" + model: + template: models:generated + arguments: + model_path: "minecraft:item/custom/palm_sapling" + texture_path: "minecraft:block/custom/palm_sapling" default:palm_leaves: material: oak_leaves custom-model-data: 1000 diff --git a/bukkit-loader/src/main/resources/resources/default/configuration/templates.yml b/bukkit-loader/src/main/resources/resources/default/configuration/templates.yml index 6d70a9ef7..acd8c52d5 100644 --- a/bukkit-loader/src/main/resources/resources/default/configuration/templates.yml +++ b/bukkit-loader/src/main/resources/resources/default/configuration/templates.yml @@ -8,6 +8,61 @@ templates: parent: "minecraft:item/generated" textures: "layer0": "{texture_path}" + models:fishing_rod_2d: + type: "minecraft:condition" + property: "minecraft:fishing_rod/cast" + on-false: + type: "minecraft:model" + path: "{rod_model}" + generation: + parent: "minecraft:item/fishing_rod" + textures: + "layer0": "{rod_texture}" + on-true: + type: "minecraft:model" + path: "{rod_cast_model}" + generation: + parent: "minecraft:item/fishing_rod" + textures: + "layer0": "{rod_cast_texture}" + models:bow_2d: + type: "minecraft:condition" + property: "minecraft:using_item" + on-false: + type: "minecraft:model" + path: "{bow_model}" + generation: + parent: "minecraft:item/bow" + textures: + "layer0": "{bow_texture}" + on-true: + type: "minecraft:range_dispatch" + property: "minecraft:use_duration" + scale: 0.05 + entries: + - model: + type: minecraft:model + path: "{bow_pulling_1_model}" + generation: + parent: "minecraft:item/bow_pulling_1" + textures: + "layer0": "{bow_pulling_1_texture}" + threshold: 0.65 + - model: + type: minecraft:model + path: "{bow_pulling_2_model}" + generation: + parent: "minecraft:item/bow_pulling_2" + textures: + "layer0": "{bow_pulling_2_texture}" + threshold: 0.65 + fallback: + type: minecraft:model + path: "{bow_pulling_0_model}" + generation: + parent: "minecraft:item/bow_pulling_0" + textures: + "layer0": "{bow_pulling_0_texture}" # Block Settings block_settings:surface_decoration: diff --git a/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/block/custom/chinese_lantern.png b/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/block/custom/chinese_lantern.png new file mode 100644 index 0000000000000000000000000000000000000000..b8f5402c6f70aeba63c52097ef184795fe5cfdb7 GIT binary patch literal 1107 zcmV-Z1g!gsP)Px(4M{{nR9J=WSl??~RUH4^+ej^Cu1=+8V^h>_$b4|%UIul8?x{>gup~HFVGJ}Y z#U^2uQkI8m=@v~gh}S+?Cd*by=tEtV${c~Tg+BNvI1;jkjvM+T_x4&sHqX62+?>;# z+jC(fZzEqgaPQ}QK3_iHFZX*mTg?nloH_pid&$l$!58dDOUE0Wh$i!NoWi|{uTZa%ez@?S z^-9M+mc4gy0CM{wVF~8W8Zt_fx!lwYc#a=?8@+=Ad#uVYyv~cCJY*%((lScYZXy84 z?T2t7dP68?SUVWU+*z}6A<-p-iCx)G8PenOyya|~n+w_p_P(DzdiCX(SoYqb5ahPQ!V=6%5t&4k zx!fpk!*l$dqv#z9?XfD!yj9CoS&6i?Od?u$9<&|C=dqMfOfk6)jAK@cwoXKJ3(;QV z=fQvf{%tv%=H`O-freQriXAwKZWsW_M9;H^xCumJvr+`n^R@G!mV~bRkztsXA}mvd zWvU!T7t!;!1DY|Dh=S;O5Iv8Qs)Fcw+zI+{C+OoaqUVuGM0ZQbCg(V7+2kBH%G*ds zrr;g%!#mZg@-{?VHqIO6ZO~7ePNy<@9RSz_rXy2ua;4u!&o+J@^aVl;xOFv* zFTNcYlAU`C@hGHh!p}L-9z9^sABKMd0Q^3FnPD9VyLktvydSZbmGnIN0wJ{Qdy5m% zWb%vMSp4xa>NV2OU!JsHJFuT+@3|C!+~X~@^qZJT;I~+>3;Wp^jr$;u?ne` zS6fw9A}wusI$n1kv>w676Mu-sHLRXvR#$DEi0B%Ey~fW2Qu)W)(=<01wLZ`=tE(;! z97I+uGavu}002ovPDHLkV1oNx3(^1p literal 0 HcmV?d00001 diff --git a/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/block/custom/chinese_lantern.png.mcmeta b/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/block/custom/chinese_lantern.png.mcmeta new file mode 100644 index 000000000..4894b537c --- /dev/null +++ b/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/block/custom/chinese_lantern.png.mcmeta @@ -0,0 +1,6 @@ +{ + "animation": { + "interpolate": true, + "frametime": 10 + } +} diff --git a/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/block/custom/chinese_lantern_top.png b/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/block/custom/chinese_lantern_top.png new file mode 100644 index 0000000000000000000000000000000000000000..610d8d7eea55bee350c4b115aea9bcf56cd53f8f GIT binary patch literal 1265 zcmVPx(t4TybR9J=WSZhd|XB2*teCcpDF;T3cQmflQ$7J9x9ju7Bc8v7`8`L5Lky+N8 zZKt!Pt{pOptDCk{q;|Sh-GzxxcEN7-hmEU0_G29?OlP$^@2RoTT)yZ+V!rq6NBrLS zrIt$kS3K~+InTMihjTt&URC4Cbiz7Fcy(_Y3|mal8#kk-qyagF2VqP~g*q}GY|#SA zISy_7PApmefX0xB>Qg1izmNyfu>kwv-%!aFnBwAKot;%gH^s#Pz^XXMW_vD@XRMmq zOAipEIr96usqthw`F-8w_jQxc(Z(^EZ!bMSeqT4u_FN?4Mq|4oTPUd`;}yJGyBz@V zT~Pr5K;;>$CT;vqbd;CzvgVy`6x7#qW41JbszZkmW6<$rZ=A1%cf1LL#*oM}bLwqHR<>wCj6sLo>Yu@uCeTq{hVM%%0s;2C z`zDM@sW8`k8;BaYqU=SBVh-5S1karPK^7*5MuMX}?{xDL=bdgmm;8+4y#EZ1DD*O~ zy3>?R(J9aKWs(=gn3M{~SU>c}&0Ln8Zt4#SX;26eWcPG=I6W{62MhX;bAY;%abM4LlI%Co78 z^A6tWSLkJ4HT=^NGN!!1mq}g}LqZyylfBSIMR8ejjdGjm;Q=uFY_NiGNr>2_S&u(p z>AgnoX*2o7KB_;ugWS_*BIaG5UoZK^zQEXueMHPl^+$J*U+g3Iw3#N&rKD;*x0?V! zzcm@+y&*+#{nlgvSQY1(oc-37e7-ns=XS5yB5x2|=4D&=w3&q8ua+sYJwU2WtMb>+ zzaD`6VjpRAspzUX!OODQMdW?)ry@?nu~!fqt>?)y@~=R0_XDA2t%bNP^HSLB3;@!? z-SGbhGOa6sN4yU~TDS|1F0eRqXV=n1kPiSL-1xMRgZn?}Pz2&cKEy`rxxTCB1g?Ly zH*kc^;~!#w>2KUH)bRmY#`Y9f;>E0N@KLteMP8!KF5>Cbmlb~h_Wz~O%RDB{rHW;e z7loLYxOY}^kXm;1qgUjKUhH{K7h@qPeoydOL! b?+5<_0F+<7AC?W@00000NkvXXu0mjfO+sX| literal 0 HcmV?d00001 diff --git a/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/block/custom/chinese_lantern_top.png.mcmeta b/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/block/custom/chinese_lantern_top.png.mcmeta new file mode 100644 index 000000000..4894b537c --- /dev/null +++ b/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/block/custom/chinese_lantern_top.png.mcmeta @@ -0,0 +1,6 @@ +{ + "animation": { + "interpolate": true, + "frametime": 10 + } +} diff --git a/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/block/custom/deepslate_topaz_ore.png b/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/block/custom/deepslate_topaz_ore.png index 49f185bd6af8e1e50b8bfaed7da63cc4e401a513..b270e5ebd650a343a4749b7acb9f38add4e08e6a 100644 GIT binary patch delta 949 zcmV;m14{gf2-pXZF@KUtL_t(oh3%JJXdG1($A8l-wl&M(I(Gs!59v15*#{$eF;u%< zXcrapAnqzvijfA^f|?K{f{BV0DN!FvQ6D7kiUl8hC?vL&zLaWM(59tGhzeP;TT017 zdS_A`l5L?$#)oxoXEyZ>Utc@N@AKOZ+Csd{LEEeA%BN$yR4iZr!H3!qN`z}A1s6( zO5!*UL(3&zlm%raz@Cq~e%;ZC(RS_1dVs2V+qQdDl4k$?LxMdMv#cbJ<6v1yiv3e? z-=pLYd=EgSa*1GaUz5)sI>UI&C;%IRCuK%DSUEjTDwQIYN|8?YaPsLHbUm(acI4hk z+Pm8TkbhD(5)3VuRQ-F8?Np0WO7wj%QGWNbTJJlXW$&?__|7Q}nsx9+EA~&Za@l2m z<|=(>v+KT@nBPRfUa)OfiIu5zkWTlo@5(y}p@+KDG|ff{LF){|P#c4d^nPnW1^UiN zDT(<%{Fg!7bUlt?7&LckuwVXp9vs#hJlJoq=YPS>v**a13iBXVsa#TZ76%rf^8|eH z8urJH5`582(}aOHI9YvyVXvTW7vjM)*N=m-MCQ;YC18jL-!3w_{5w2&;bH;4`zhi< z!~>;6#Dn#>ispk`JScXCd7xbIh1x%rQ9NiC%(h)Pa)ODAMKXi+h6{hhgR%5iFgs2D ze1C%nl*eH4XM|{!qUCZq?{+*8Lg%QMWY{Z&tZd#B@gU*>L_CQ8FZ?U>!N3A^_LG19 zQ{cCGQ0_g$>+bD%Fj$B3ScnJZ1GNwjCVD2}fgM1A2Zyy=Jjj=}s6{CyJoz5w5ARg# znNwNvr7eGf2LlT*FJX2%H0J(!9t_4wr!IFhVo(1)9t?XC46X00000NkvXXu0mjfqL|2O delta 998 zcmV?tX38gb-5=DP-N1LCYvK z5B5PUGH2PtU=u9FL1&8_KFq-wV+`FMhPZ)ZlLxnl`LZQzSKNbhl)zY>!m8p!rruIa zL$&v+yR<<_XZDcY&)kX%lMM#5qH`BBMh{vOH z&Dmp`HbSTX_?wy(3Wa%Wdj$YhZE*#%EDKH3T+a1L{F|f0Q@WH)Z z7)A-(UcoR*08DN>$8K{_CIfh;xw-X2pYJ}=XoU304DE01W5b;*WG=MQ)YM2QB-p%p zBjxfv-ah&|y?;NSU<4sl{FO>Y9>+0NZ6O|y($LVr=L6reIDdDGci4q#+N_;9L3#O4gy^Z2 z(Qy_+bp^33i;p(s82u?FO9`;`c+cNEYCgV!fx#*u@7&cDltI?l-$_#6GfF%jMF^GN z-X7+TS!5@kmjMcec}&xm{on+d+;)yo=sCjS4wU*#$%7Hr&YYlFT%uT9LQxc^U!6l$ zTja@(#D8*xwzLBf2n6t@QmN|x)eLVH2c_!8;u5-^03dz1Q>yM*eSb&|*6ZMGNRQ00 zwqUb3cZ=P>3_dh7enn9zmsey)rz(zE$wGv1xP$kqUn7L-%3dlhql7|juF`3mCO10A zU0ht|Xmd(BI+Y0q+wkALyNa$SkplF&#JRYU7QK7fDhw1LK zOn0A^17#Q`&Y!=GVU)=B<)qk7Ab+7Sj}R)lo*+GT6E;o3ckg0O)UM!&cJ=B4j7>3Z zyv%{>gOPUefFHhx?U0-ZK2+~mEJEMb!;j~|-s>s2e9hy5#{;Q@$Absvy${@4=z4$ z10lL=0UpPLlOo67TnfwTlv*S|0cghKfyV=n2j2g}zx+P4U{~{p2Cr=MDoarPO ztPSClc`$Yp7MJ1DEXmXVga_j-gu`7NZ=QWR9vrB8Jn(q%|KWl6K5%u|fA&833v2y( U{rR=}sQ>@~07*qoM6N<$f{^g@*#H0l diff --git a/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/beginner_rod.png b/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/beginner_rod.png deleted file mode 100644 index 87b5ad10bf55ffaac1f951c316837d6feb159a32..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 233 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`8$4YcLn`8u6C^k$Oq%rR{?VgP z?RQxOGAy}y+2_mtHW~AmYz;ZAndd%CR=&$H}*0#R#w+SiFBR@lfywbw`5-4AmuP6O+bE$V5G6mm;cO+K0K@qCXYTD hb2P-X1RJX|Ffg0%AW}g0je~IUe3g!!@+HA$m znI)wf3@OYWf>jNIsn%!2COBz#P}SN_55?u8S~X6d^d{b_&LFWkB@>zGmdKI;Vst05A!2ng9R* literal 0 HcmV?d00001 diff --git a/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_bow_pulling_0.png b/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_bow_pulling_0.png new file mode 100644 index 0000000000000000000000000000000000000000..6f2cb5b9335d946a990e791909921ac34d384013 GIT binary patch literal 399 zcmV;A0dW3_P)Px$Nl8ROR5*>Dk}*gFK@dgX1-pPC*NLQ(+!3(5!t@ffh^E~lg_TuWtoEbI;>rVJrXND(mgSR5N}@Agpqu&}$c|If~!0YF5Af5HJ639>8h>_7RvK+Tx2w_aDVhj_i1Sm^u83-<@4hq#V1sVE~i#)Sj{a3 z_04@QNp5~OI6k|kH=I%4eYNq^&?afqbY`2e@$81cs^iM4<4U`1wkj@SD=7z2Kd0}@ z$n6Bi)3wtZ&Pe{m5ZIuotR;@8YiBgC@ceR@c3qdC2O}A)RU4Vz0NC2>CjC^f6x1a% tYf2zN1h5WDra(~vt?UW=4YvCKf*&e#ottPK4xIo1002ovPDHLkV1lnAt-b&N literal 0 HcmV?d00001 diff --git a/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_bow_pulling_1.png b/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_bow_pulling_1.png new file mode 100644 index 0000000000000000000000000000000000000000..99c78b5fec5b797700d68e2d62b6d3dfd816911c GIT binary patch literal 390 zcmV;10eSw3P)Px$KuJVFR5*>LQXy-@KotJ2%oPSBc0_hZ*qDjvd>Kr1)Sigg%v4~iRaI5%nCM*8 zD1~-9W1(Ti3rh#Mo z1ZW5V!1L`OtM3L-E$@p2>uZc#Q+V&GlJ5rFaV*=RXg<;S2nC3nb$WU@qfXl;t>6!q z?dZ8sfI4lL9^IErq>5aVL^<=gHARvnh*v-C?c)nYB3kFo$e_*0py3r1Lf%P!tQxT0 z=jt=vzIF}=I|&7dzWbVkA}5N2L%=WZ(eoDi+N!!+wo|&!>?>nA(}(~N%_l4>akdj^ k2mk|xSi;j$^mtYH1^K*_-50d|cK`qY07*qoM6N<$g0gPx$H%UZ6R5*>blCetzF%-tX9Bu`v+*Fa9BnDAjI@n!A2hlZyLtR|#s#6y`+3j%Z zR7CI`7awFuc;D}PFYf{W8A^hb1kK7>&@V(p zj4`Ia1=~Ip(n82)1ZDu@I7X5rB!pnP^TydKz~xWkFao$l`>jQW8vux)MD_g@^e4Nx z*||gKK6RFV-iM`!k{}V3=<0Nhjt&~m{@1I=1OVP|ar2{ry~9g%dt=m=pPcTN>-1!y zpF2-0ak(3SEc7W0eQMXtu@ymdfCqe!WAvP2vASecmyAAHw>O3k;gvEBKpy(2=0L1a z5=8G!tA%;(c&_9^z}5*aIPx%MoC0LR5*=|lHW^HVHn3hugyi4vz;w;PT47Ba2Cai#jsmN5M@D^LVrXTb*V{z zLC{UqMK^)bMYPKKV;518Ec-D|IdRT9!gPjs)|3g`q_+z_Cw~=vFW>ihKJW8<->+bo zhKGk4c|6L$)Zxg=+*VKk%w|$J0*aH)o~vk@#?a6Z0Nvf)EG=&UkmyfItNEP{eZ3xv zODWm=A}Rpttjoc{K`Et_6XS2B*Xt$GpOTsTYcg=91GnFU+wa+FUfVN~&_YpWGbyB$ z^4r29<6~3YeK^WYLgm$s+je1L1qQ|tp~y8UH?x0Mn9ZaBn4EY^Za&Y(ms@oCOT@Y= z=y@lAXlS{BRkvS43q|p_HUhBx(XE!^e>vdcI7hByC8cR<$AX zpI#phFm57U5jWX+xZdLvdcKUW-gy859GIkT|G_=Ih4XF4MLcaD3Q<*+&6Upw0qY-% z42&TFp6f+oVPy}*r#LCpsu+erEUeg&I@nH_E8@n=1VC~nfcNw{8&WWiMx=lL5sk9J#Ha zc$wJFyOprHg}uJCm!HrMJbh%!W>-DUE+^45jl|QY6j~_yw=cHkZ*4^T^%a14+LW=d mLOg8(J4yUs?Q-ApK>P;wQ3_W)5jimc0000Px%TuDShR5*=|l21sJVI0RlkIjj0dvSka(>eD>L-dVg#X#)*63WK9c?gV7-V!=g z#}1yl1sy`{5C|bghgPD85z!%-_GgUR)>L?HT9eoY(m0H6T8>>x4C%4 zk+|V@OSj3yX+=Q=d_vH@xQJ!<9Qt`fNRjOzt6fN1kvAd^mL z2moEzv9`AJW%U5iR69Jn7?;!f6ibx~kv%guyN}PiexgAKeur5$zI_M~kH@iloxGn} zVQTjW=UUg;D(A7;eaz)Ob;$CEHzxy(+ejs3C$|hYFL#L4dX=!R&;S7%oHQN3m`r)- z@3M$kvUCJ8o3#=RI#5-Wox;aPK;>PTiLd+1@gh|w8g$elh4l;;i3Yc;-JnUrc`3jwb zdOF(c7JZ$UIHjr#S`1WG#V`!qN;8|4J?VFtg#dUmv>#4wgyYgZYXHQOCFxe0aVut2 zR|~OZ3DKtwoYZqf-cB2RzdzL>(V&A^vIOvdfSL}aU&}!J0hc!KSQI1rp#T5?07*qo IM6N<$f+TS<4FCWD literal 0 HcmV?d00001 diff --git a/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_crossbow_pulling_0.png b/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_crossbow_pulling_0.png new file mode 100644 index 0000000000000000000000000000000000000000..48441b490b7620f1da6ec626b92c714bd1ca7bd5 GIT binary patch literal 634 zcmV-=0)_pFP)Px%G)Y83R5*==k}*gdQ5eU6FW5^_6z&XYiExLCkPN|=z|qMi2)2z%HwVGF)S-h; zLI`p0QW3;%9c;If+KM8r4oyjsDuE_c6s}@4p_)KMA?ffs#5=uM+7I6J-v9r;@Av-% z*D4;5^ZLyP{#7fF(sF3o6acwwnkHRSxIg%qKp;RY76Tv>iI6`!a|E_Hl>yb??lNhz zFJrM7^K(mbZ8gR1mS5uKy>+RN^a8z9w#ooJ^g}s+>gq@Yf+o3an)$gU`Q+)C00@T1 z<@XhXjj4q5@VEep15=3RJ}EDDuSUpa(*UfkrU0;}k@{3!JdsoYM04j|Y(X&G=Y|pp znnWTI?4RZ5UioPP84am28d9aMDN@%I07j#eG7vPekBfmdjnqfJu(7zu^KU8uhR+K? z=I~sOMko2P|5Y@m;sMAXouT^M*;w4O+s5#Du}-QOJ};rJ77WASqOg4Rh|J-+BeqVe^bE|fzc~va8%;cojtiMiLR~G6NzcFxmSs7eG@3XJDqCd|2d2nn z)8y*FFbsqJ%~{tt#YzpcyOre5_LV^@17jm9Ea1?7`|gDR&^1L~XHplJBp?8UHH}pL z?UeJUJoq>cKz8eui?*&QvZL)5W_K&rNtI%yMzQi6KzN3hP4Rx^lvD=f#ja=+1NPx%Gf6~2R5*==l2J%gVHC%IpUf>1N7I3p(!FeA-1{IE(xoRMBr>x_Zv{fovyb|u zjG^?{iy}llM%tUqs1zxESuCuLJ#4r(xPg<2y1_(43%(xi?sYP$KYZ}-gaM{6dILz$KoLpXtajt1cyt=+3l~5PZMPH`xr4N0nr=8eS0)_?V0kG9fH{U#MpafvC&{MaSM=Rgvb7a#vWOMfj)$gIFvx&oELaM4-*FpnW zqw@Cp$o_y|0Y#)X4;*r>2*6=6Q7=%77pZo7I-BZ5f_>xU*QNkut%&16WxdSfj|hm9 zv7Q82qYL(pW11$a-@|t07$eY3G?_RNh^63B$OoJ($%CO0r|10Ilv9aCF3D;F#88h< zzJA(3xvmSZzFA9H>%%5G+9E}D`~^t%(DalqREoHf3<~ZvUJ+S|6!%5*dr8G4*Px%B}qg%xB^>QZmV z7<3s#B1GMWc2%vHp?I;Y$pLF);29kj9Hr@^+(2=W2~QV$ac|W3=6U!%zwh_?{$2zv zh{a;8zxv3(5L6slIM)S0-nLLwzlWLIcL{|;M59pvB9REigA)LfcP!Z;r*kkj8=z9O z04R;eXf(>|%9`BVNOO7chj?*wOR5V&Ajt7f1%SD6s1%Rd9Ep%&lD92ZSJveH z2loVk5nhzLNsZJ}yqS1dg805E#DFek)ww7kZ(9ItZlnQlmyzmHjqKR)sNfL;qc>;} zjIiG3KnWQp<5!1x^X{oI!i!Q}*e10U=kaG>J>^tZOBu0OJ_A4>8|KT`3xU4I#a%}3 zKG`PqywD_TS1vI%F$f?-hS_r}eE`LS6MW+VKCKsUY?@^E=kKOSwUm*)1Qe)^${P;i zB#-ztsfyg@q3jf?qf4Z(Gw>`o%GAW5$bCC)l3SfC_%-MbF%^V-WCu8Gtvm_=wrie zLYk)Gx-QqQ*Uk}dKi`l4NY(EVO5t1=ACk3wmsLmPZ40|cw;$db<@L+59P#!u;`Lxo z4w1-~r2@4T?ZN57{Ip*rvSnE(w>R;B*ea=w?u(Wlh`)M^@6Ef?>z4ok002ovPDHLk FV1n33BE0|r literal 0 HcmV?d00001 diff --git a/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_crossbow_standby.png b/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_crossbow_standby.png new file mode 100644 index 0000000000000000000000000000000000000000..2337f1d114273563fc9c43ec75db1956eac47200 GIT binary patch literal 625 zcmV-%0*?KOP)Px%D@jB_R5*==l21sJVI0Rl&sY^PBr^XL-G!h-r%s_K zW5}Xo6p9cXi?mKMt1($+m&F^FW6(QV6Q($Ev_CM>*b<%&bFX{V>I={5;q!fd-|zDi zv}k&InuV8d`ImgwjLaVN2!OP%VO3l5?=Z%*F z!Eq^n-jg40Vw@LOkj*=PKs7jPTGs$rjwJxdO(K;E4=WR4GCDlS+Qiw;e$u+uFy7CI z)&Yb+pwe~TPCOnb5FD4^9)DuxX_kjyodBe^_5eixrQ7oR`ezfI*0rM!8kxPjywCp5n%v)6JKZ2UqDe>4N#+Oq z@+u;=wP%7o?lyWaoC7#vVma>kB-P1Axh`7aT(S076QhIbYK8EoD$=^f_0c=>(ac?; zxNNdDj>p|bp;|}v+KD9BjwVQ?z!7vBU$wY2BLFtabt6vGqyd+Woe`tGPWk+ng-X7} z)%WA*tItlft+;Hm!*K@HYbRH%QK;4_RDS~qOZK2gyor`bq~Q3HG__H#3)O2Ekz|=d zwN8h_##o;VKw1I9o9e0HagFu4L?l_3hcV10{!j58g~RqmO9$c)w%Z9^q5|5o00000 LNkvXXu0mjfo(UbL literal 0 HcmV?d00001 diff --git a/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_rod.png b/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_rod.png new file mode 100644 index 0000000000000000000000000000000000000000..629092f8baccee2ec5ab6ceb954533eb6ccdd1b5 GIT binary patch literal 256 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|c6quuhFJ6_ zCrEGvOt}5q{($*+`=Bd+`^h6@T>AFt3;+YGvMePsY-8~+m%kkmt-~EZ7Q{2{=)z8u3 zDc=TE*!A{55cK;bH|Tl)d0Bn^+~NO)S<6@$81llGe%$_fN*>S`44$rjF6*2UngD?I Baqa*B literal 0 HcmV?d00001 diff --git a/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_rod_cast.png b/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_rod_cast.png new file mode 100644 index 0000000000000000000000000000000000000000..ce042dcddfbc270b5d22f57c4069603f432c3f6e GIT binary patch literal 200 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|nmk<`Lo9le z6C^kSCfxpQf57~^{mohW?nZy!Z%R?P+rV)D&j0DklK=kOuX5VOSa5cIw)?!aAf`7( zDu@4{p2+iG^U|OHrMf=@S&d)(51jhH{JqVO`tRqO|3|59tl&*_x~`M1c;-TEQTxMp xcaJZ*{ikq|!JV5xIhI^^#@J~o%ksS#8D Date: Wed, 12 Feb 2025 18:52:41 +0800 Subject: [PATCH 2/2] Added crossbow template --- .../resources/default/configuration/items.yml | 22 ++++++- .../default/configuration/templates.yml | 57 ++++++++++++++++++ ...rossbow_standby.png => topaz_crossbow.png} | Bin .../core/pack/PackManagerImpl.java | 2 +- 4 files changed, 79 insertions(+), 2 deletions(-) rename bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/{topaz_crossbow_standby.png => topaz_crossbow.png} (100%) diff --git a/bukkit-loader/src/main/resources/resources/default/configuration/items.yml b/bukkit-loader/src/main/resources/resources/default/configuration/items.yml index e73f239bb..f4bd6bf6b 100644 --- a/bukkit-loader/src/main/resources/resources/default/configuration/items.yml +++ b/bukkit-loader/src/main/resources/resources/default/configuration/items.yml @@ -26,4 +26,24 @@ items: bow_pulling_1_model: minecraft:item/custom/topaz_bow_pulling_1 bow_pulling_1_texture: minecraft:item/custom/topaz_bow_pulling_1 bow_pulling_2_model: minecraft:item/custom/topaz_bow_pulling_2 - bow_pulling_2_texture: minecraft:item/custom/topaz_bow_pulling_2 \ No newline at end of file + bow_pulling_2_texture: minecraft:item/custom/topaz_bow_pulling_2 + default:topaz_crossbow: + material: crossbow + custom-model-data: 1000 + data: + display-name: "<#FF8C00>Topaz Crossbow" + model: + template: models:crossbow_2d + arguments: + crossbow_model: minecraft:item/custom/topaz_crossbow + crossbow_texture: minecraft:item/custom/topaz_crossbow + crossbow_pulling_0_model: minecraft:item/custom/topaz_crossbow_pulling_0 + crossbow_pulling_0_texture: minecraft:item/custom/topaz_crossbow_pulling_0 + crossbow_pulling_1_model: minecraft:item/custom/topaz_crossbow_pulling_1 + crossbow_pulling_1_texture: minecraft:item/custom/topaz_crossbow_pulling_1 + crossbow_pulling_2_model: minecraft:item/custom/topaz_crossbow_pulling_2 + crossbow_pulling_2_texture: minecraft:item/custom/topaz_crossbow_pulling_2 + crossbow_arrow_texture: minecraft:item/custom/topaz_crossbow_arrow + crossbow_arrow_model: minecraft:item/custom/topaz_crossbow_arrow + crossbow_firework_texture: minecraft:item/custom/topaz_crossbow_firework + crossbow_firework_model: minecraft:item/custom/topaz_crossbow_firework \ No newline at end of file diff --git a/bukkit-loader/src/main/resources/resources/default/configuration/templates.yml b/bukkit-loader/src/main/resources/resources/default/configuration/templates.yml index acd8c52d5..485074ab7 100644 --- a/bukkit-loader/src/main/resources/resources/default/configuration/templates.yml +++ b/bukkit-loader/src/main/resources/resources/default/configuration/templates.yml @@ -63,6 +63,63 @@ templates: parent: "minecraft:item/bow_pulling_0" textures: "layer0": "{bow_pulling_0_texture}" + models:crossbow_2d: + type: "minecraft:condition" + property: "minecraft:using_item" + on-false: + type: "minecraft:select" + property: "minecraft:charge_type" + cases: + - when: arrow + model: + type: minecraft:model + path: "{crossbow_arrow_model}" + generation: + parent: "minecraft:item/crossbow_arrow" + textures: + "layer0": "{crossbow_arrow_texture}" + - when: rocket + model: + type: minecraft:model + path: "{crossbow_firework_model}" + generation: + parent: "minecraft:item/crossbow_firework" + textures: + "layer0": "{crossbow_firework_texture}" + fallback: + type: minecraft:model + path: "{crossbow_model}" + generation: + parent: "minecraft:item/crossbow" + textures: + "layer0": "{crossbow_texture}" + on-true: + type: "minecraft:range_dispatch" + property: "minecraft:crossbow/pull" + entries: + - model: + type: minecraft:model + path: "{crossbow_pulling_1_model}" + generation: + parent: "minecraft:item/crossbow_pulling_1" + textures: + "layer0": "{crossbow_pulling_1_texture}" + threshold: 0.58 + - model: + type: minecraft:model + path: "{crossbow_pulling_2_model}" + generation: + parent: "minecraft:item/crossbow_pulling_2" + textures: + "layer0": "{crossbow_pulling_2_texture}" + threshold: 1.0 + fallback: + type: minecraft:model + path: "{crossbow_pulling_0_model}" + generation: + parent: "minecraft:item/crossbow_pulling_0" + textures: + "layer0": "{crossbow_pulling_0_texture}" # Block Settings block_settings:surface_decoration: diff --git a/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_crossbow_standby.png b/bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_crossbow.png similarity index 100% rename from bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_crossbow_standby.png rename to bukkit-loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_crossbow.png diff --git a/core/src/main/java/net/momirealms/craftengine/core/pack/PackManagerImpl.java b/core/src/main/java/net/momirealms/craftengine/core/pack/PackManagerImpl.java index 7bef1fd18..eef7018e9 100644 --- a/core/src/main/java/net/momirealms/craftengine/core/pack/PackManagerImpl.java +++ b/core/src/main/java/net/momirealms/craftengine/core/pack/PackManagerImpl.java @@ -141,7 +141,7 @@ public class PackManagerImpl implements PackManager { plugin.saveResource("resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_crossbow_pulling_0.png"); plugin.saveResource("resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_crossbow_pulling_1.png"); plugin.saveResource("resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_crossbow_pulling_2.png"); - plugin.saveResource("resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_crossbow_standby.png"); + plugin.saveResource("resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_crossbow.png"); // ores plugin.saveResource("resources/default/configuration/ores.yml"); plugin.saveResource("resources/default/resourcepack/assets/minecraft/textures/block/custom/deepslate_topaz_ore.png");