From 12ed600e270c11e00951df498cb904189d3c81fa Mon Sep 17 00:00:00 2001 From: XeKr <987820727@qq.com> Date: Sat, 7 Dec 2024 16:48:13 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=96=B9=E5=9D=97=E5=AF=B9?= =?UTF-8?q?=E6=AF=94=E5=99=A8=E6=A8=A1=E5=9E=8B=EF=BC=8C=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E7=94=B5=E7=A3=81=E7=8E=AF=E6=96=B9=E5=9D=97=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../blockstates/electromagnetic_ring.json | 108 ++++++++++++++++++ .../models/block/block_comparator.json | 57 +++++++-- .../models/block/electromagnetic_ring.json | 1 + .../block/electromagnetic_ring_off.json | 13 +++ .../block/electromagnetic_ring_overload.json | 13 +++ .../models/item/magnetoelectric_core.json | 2 +- .../textures/block/block_comparator.png | Bin 286 -> 317 bytes .../textures/block/block_comparator_body.png | Bin 228 -> 281 bytes .../textures/block/block_comparator_eyes.png | Bin 237 -> 277 bytes .../block/block_comparator_eyes_precise.png | Bin 257 -> 300 bytes .../textures/block/block_comparator_on.png | Bin 322 -> 342 bytes .../block/electromagnetic_ring_in.png | Bin 320 -> 332 bytes .../block/electromagnetic_ring_out.png | Bin 318 -> 331 bytes .../block/schmitt_trigger_indicator.png | Bin 170 -> 170 bytes .../schmitt_trigger_indicator_overlay.png | Bin 170 -> 170 bytes 15 files changed, 182 insertions(+), 12 deletions(-) create mode 100644 src/main/resources/assets/anvilcraft/blockstates/electromagnetic_ring.json create mode 100644 src/main/resources/assets/anvilcraft/models/block/electromagnetic_ring_off.json create mode 100644 src/main/resources/assets/anvilcraft/models/block/electromagnetic_ring_overload.json diff --git a/src/main/resources/assets/anvilcraft/blockstates/electromagnetic_ring.json b/src/main/resources/assets/anvilcraft/blockstates/electromagnetic_ring.json new file mode 100644 index 000000000..f5d7a6949 --- /dev/null +++ b/src/main/resources/assets/anvilcraft/blockstates/electromagnetic_ring.json @@ -0,0 +1,108 @@ +{ + "variants": { + "facing=down,overload=false,switch=on": { + "model": "anvilcraft:block/electromagnetic_ring", + "x": 180 + }, + "facing=east,overload=false,switch=on": { + "model": "anvilcraft:block/electromagnetic_ring", + "x": 90, + "y": 90 + }, + "facing=north,overload=false,switch=on": { + "model": "anvilcraft:block/electromagnetic_ring", + "x": 90 + }, + "facing=south,overload=false,switch=on": { + "model": "anvilcraft:block/electromagnetic_ring", + "x": 90, + "y": 180 + }, + "facing=up,overload=false,switch=on": { + "model": "anvilcraft:block/electromagnetic_ring" + }, + "facing=west,overload=false,switch=on": { + "model": "anvilcraft:block/electromagnetic_ring", + "x": 90, + "y": 270 + }, + "facing=down,overload=true,switch=on": { + "model": "anvilcraft:block/electromagnetic_ring_overload", + "x": 180 + }, + "facing=east,overload=true,switch=on": { + "model": "anvilcraft:block/electromagnetic_ring_overload", + "x": 90, + "y": 90 + }, + "facing=north,overload=true,switch=on": { + "model": "anvilcraft:block/electromagnetic_ring_overload", + "x": 90 + }, + "facing=south,overload=true,switch=on": { + "model": "anvilcraft:block/electromagnetic_ring_overload", + "x": 90, + "y": 180 + }, + "facing=up,overload=true,switch=on": { + "model": "anvilcraft:block/electromagnetic_ring_overload" + }, + "facing=west,overload=true,switch=on": { + "model": "anvilcraft:block/electromagnetic_ring_overload", + "x": 90, + "y": 270 + }, + "facing=down,overload=false,switch=off": { + "model": "anvilcraft:block/electromagnetic_ring_off", + "x": 180 + }, + "facing=east,overload=false,switch=off": { + "model": "anvilcraft:block/electromagnetic_ring_off", + "x": 90, + "y": 90 + }, + "facing=north,overload=false,switch=off": { + "model": "anvilcraft:block/electromagnetic_ring_off", + "x": 90 + }, + "facing=south,overload=false,switch=off": { + "model": "anvilcraft:block/electromagnetic_ring_off", + "x": 90, + "y": 180 + }, + "facing=up,overload=false,switch=off": { + "model": "anvilcraft:block/electromagnetic_ring_off" + }, + "facing=west,overload=false,switch=off": { + "model": "anvilcraft:block/electromagnetic_ring_off", + "x": 90, + "y": 270 + }, + "facing=down,overload=true,switch=off": { + "model": "anvilcraft:block/electromagnetic_ring_off", + "x": 180 + }, + "facing=east,overload=true,switch=off": { + "model": "anvilcraft:block/electromagnetic_ring_off", + "x": 90, + "y": 90 + }, + "facing=north,overload=true,switch=off": { + "model": "anvilcraft:block/electromagnetic_ring_off", + "x": 90 + }, + "facing=south,overload=true,switch=off": { + "model": "anvilcraft:block/electromagnetic_ring_off", + "x": 90, + "y": 180 + }, + "facing=up,overload=true,switch=off": { + "model": "anvilcraft:block/electromagnetic_ring_off" + }, + "facing=west,overload=true,switch=off": { + "model": "anvilcraft:block/electromagnetic_ring_off", + "x": 90, + "y": 270 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/anvilcraft/models/block/block_comparator.json b/src/main/resources/assets/anvilcraft/models/block/block_comparator.json index e5b717b26..53abcef5b 100644 --- a/src/main/resources/assets/anvilcraft/models/block/block_comparator.json +++ b/src/main/resources/assets/anvilcraft/models/block/block_comparator.json @@ -9,35 +9,70 @@ }, "elements": [ { - "from": [4, 0, 3], + "from": [4, 0, 5], "to": [12, 8, 16], "rotation": {"angle": 0, "axis": "y", "origin": [5, 0, 0]}, "faces": { - "north": {"uv": [0, 0, 8, 8], "texture": "#switch"}, - "east": {"uv": [16, 8, 3, 16], "texture": "#switch"}, + "north": {"uv": [8, 0, 16, 8], "texture": "#switch"}, + "east": {"uv": [16, 8, 5, 16], "texture": "#switch"}, "south": {"uv": [8, 0, 16, 8], "texture": "#switch", "cullface": "south"}, - "west": {"uv": [3, 8, 16, 16], "texture": "#switch"}, - "up": {"uv": [0, 3, 8, 16], "texture": "#body"}, - "down": {"uv": [8, 0, 16, 13], "texture": "#body", "cullface": "down"} + "west": {"uv": [5, 8, 16, 16], "texture": "#switch"}, + "up": {"uv": [0, 5, 8, 16], "texture": "#body"}, + "down": {"uv": [8, 0, 16, 11], "texture": "#body", "cullface": "down"} + } + }, + { + "from": [4.025, -0.3, 3.475], + "to": [11.975, 7.075, 6.55], + "rotation": {"angle": -22.5, "axis": "x", "origin": [5, 3.7, 3.475]}, + "faces": { + "north": {"uv": [0, 0, 8, 8], "texture": "#switch"}, + "east": {"uv": [6, 8, 3, 16], "texture": "#switch"}, + "west": {"uv": [3, 8, 6, 16], "texture": "#switch"}, + "up": {"uv": [0, 3, 8, 6], "texture": "#body"} } }, { "from": [0, 4, 0], + "to": [2, 7, 6], + "rotation": {"angle": 0, "axis": "y", "origin": [5, 0, 0]}, + "faces": { + "north": {"uv": [0, 5, 2, 8], "texture": "#eyes", "cullface": "north"}, + "east": {"uv": [6, 13, 0, 16], "texture": "#eyes", "cullface": "east"}, + "south": {"uv": [0, 5, 2, 8], "texture": "#eyes"}, + "west": {"uv": [0, 13, 6, 16], "texture": "#eyes", "cullface": "west"}, + "up": {"uv": [0, 0, 2, 6], "texture": "#eyes"}, + "down": {"uv": [0, 7, 2, 13], "texture": "#eyes"} + } + }, + { + "from": [14, 4, 0], "to": [16, 7, 6], "rotation": {"angle": 0, "axis": "y", "origin": [5, 0, 0]}, "faces": { - "north": {"uv": [0, 5, 16, 8], "texture": "#eyes", "cullface": "north"}, + "north": {"uv": [14, 5, 16, 8], "texture": "#eyes", "cullface": "north"}, "east": {"uv": [6, 13, 0, 16], "texture": "#eyes", "cullface": "east"}, - "south": {"uv": [0, 5, 16, 8], "texture": "#eyes"}, + "south": {"uv": [14, 5, 16, 8], "texture": "#eyes"}, "west": {"uv": [0, 13, 6, 16], "texture": "#eyes", "cullface": "west"}, - "up": {"uv": [0, 0, 16, 6], "texture": "#eyes"}, - "down": {"uv": [0, 7, 16, 13], "texture": "#eyes"} + "up": {"uv": [14, 0, 16, 6], "texture": "#eyes"}, + "down": {"uv": [14, 7, 16, 13], "texture": "#eyes"} + } + }, + { + "from": [2, 4.5, 0.5], + "to": [14, 6.5, 5.5], + "rotation": {"angle": 0, "axis": "y", "origin": [5, 0, 0]}, + "faces": { + "north": {"uv": [2, 5, 14, 7], "texture": "#eyes"}, + "south": {"uv": [2, 5, 14, 7], "texture": "#eyes"}, + "up": {"uv": [2, 0, 14, 5], "texture": "#eyes"}, + "down": {"uv": [2, 7, 14, 12], "texture": "#eyes"} } } ], "display": { "head": { - "translation": [0, 6, 0], + "translation": [0, 6, -0.25], "scale": [1.5, 1.5, 1.5] } } diff --git a/src/main/resources/assets/anvilcraft/models/block/electromagnetic_ring.json b/src/main/resources/assets/anvilcraft/models/block/electromagnetic_ring.json index 260b9605e..b462500c7 100644 --- a/src/main/resources/assets/anvilcraft/models/block/electromagnetic_ring.json +++ b/src/main/resources/assets/anvilcraft/models/block/electromagnetic_ring.json @@ -442,6 +442,7 @@ "scale": [0.5, 0.5, 0.5] }, "fixed": { + "rotation": [90, 0, 0], "scale": [0.4, 0.4, 0.4] } }, diff --git a/src/main/resources/assets/anvilcraft/models/block/electromagnetic_ring_off.json b/src/main/resources/assets/anvilcraft/models/block/electromagnetic_ring_off.json new file mode 100644 index 000000000..ec390189e --- /dev/null +++ b/src/main/resources/assets/anvilcraft/models/block/electromagnetic_ring_off.json @@ -0,0 +1,13 @@ +{ + "parent": "anvilcraft:block/electromagnetic_ring", + "render_type": "minecraft:cutout", + "textures": { + "0": "anvilcraft:block/electromagnetic_ring_in", + "1": "anvilcraft:block/electromagnetic_ring_out", + "2": "anvilcraft:block/electromagnetic_ring_inner", + "3": "anvilcraft:block/electromagnetic_ring_outer", + "4": "anvilcraft:block/electromagnetic_ring_pipe", + "particle": "anvilcraft:block/electromagnetic_ring_outer", + "state": "anvilcraft:block/electromagnetic_ring_off" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/anvilcraft/models/block/electromagnetic_ring_overload.json b/src/main/resources/assets/anvilcraft/models/block/electromagnetic_ring_overload.json new file mode 100644 index 000000000..0a7adf3fa --- /dev/null +++ b/src/main/resources/assets/anvilcraft/models/block/electromagnetic_ring_overload.json @@ -0,0 +1,13 @@ +{ + "parent": "anvilcraft:block/electromagnetic_ring", + "render_type": "minecraft:cutout", + "textures": { + "0": "anvilcraft:block/electromagnetic_ring_in", + "1": "anvilcraft:block/electromagnetic_ring_out", + "2": "anvilcraft:block/electromagnetic_ring_inner", + "3": "anvilcraft:block/electromagnetic_ring_outer", + "4": "anvilcraft:block/electromagnetic_ring_pipe", + "particle": "anvilcraft:block/electromagnetic_ring_outer", + "state": "anvilcraft:block/electromagnetic_ring_overload" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/anvilcraft/models/item/magnetoelectric_core.json b/src/main/resources/assets/anvilcraft/models/item/magnetoelectric_core.json index 98e1809e8..bf9eb4c5b 100644 --- a/src/main/resources/assets/anvilcraft/models/item/magnetoelectric_core.json +++ b/src/main/resources/assets/anvilcraft/models/item/magnetoelectric_core.json @@ -421,7 +421,7 @@ "scale": [0.33, 0.33, 0.33] }, "gui": { - "rotation": [45, 150, 0], + "rotation": [45, 45, 0], "scale": [0.8, 0.8, 0.8] }, "head": { diff --git a/src/main/resources/assets/anvilcraft/textures/block/block_comparator.png b/src/main/resources/assets/anvilcraft/textures/block/block_comparator.png index 8469c406154217e506601f176ea3684bfc5d06c4..0be65b2437c2700dbb70b8a0d8c157d0ef099e75 100644 GIT binary patch delta 252 zcmbQow3lguXT4c~Pl#(wOiXokwYRsoo0C&PL4g+|lPV)~1q-8*k&&>dOjT8tt&NSf zwRLK0s-~J+e}BKJi3tM(!+FzZ?|_t0NswRge{{g`X#aj8plrRTi(^Q|t(ZP;zQYC_ z&XM-nOh*gf)!$^i8>V5XT3^*Pl&4*BU5;IxGE!a1q-9FsEnJFQ&m+}YHDhKf4{Abjj4$V0|SHG zgCBN4il-#VFZe$KFbLg0cMd3C;pyTSQgJJ%Kah__k;8drENj&J`un;(v(Fr#!tzuz zi1)xfFB!>;m%hd2^n2V5HakB}_-uxuQrM4Bd)$r?w;TO9Q)Tk*1TKK#KYiM$RW`D+pz`c O2nJ7AKbLh*2~7Zf*;uy# diff --git a/src/main/resources/assets/anvilcraft/textures/block/block_comparator_body.png b/src/main/resources/assets/anvilcraft/textures/block/block_comparator_body.png index 91555c60d09d32ff07fe9729e0a59b933945080f..0f6ab9e00b5042323718e13e8c3661647a8b765b 100644 GIT binary patch delta 216 zcmaFDIFo6DXT4&8Pl&6xxA%@6JB}SYws!5>f`WqT>gt%7n2wH){{H^d)Kmrr299cn zFd)TU666>B9}XD2{24z1h08r%978H@`SdgLF)MH|2QJw1`+u|hoEd^bj{=w6c+SS) z%3eow!9(BCCTQ6{#ggRDTz~@lLlTbLV!Z z?WdL*d(FQ2SlQcb|Mze2Rv)};-#7m-dr8gGe+MmJHCk352yb9yDE!8DrTUIg4$ut@ Mp00i_>zopr0NjybQUCw| delta 163 zcmbQq^n`JOXT4~EPl&6VlT&JHYJY#ft&L4pRh6lU2?GPen~SoR8)@V8G!L_&DSH{wIC?BFtx1 KelF{r5}E)rWjjXz diff --git a/src/main/resources/assets/anvilcraft/textures/block/block_comparator_eyes.png b/src/main/resources/assets/anvilcraft/textures/block/block_comparator_eyes.png index c83c2669b3089db75c129c9e1a00102b0079e373..2ea6b595ac5887c6ebd68a873b40e433761a0ec0 100644 GIT binary patch delta 212 zcmaFMIF)IFXT3^*Pl&6gnwqevOiWBnK|z73iOJfvYrVa_t*xz7Q&ao<`>U#|7#JAx zR{Ti=QamL=e!>3{fI;Z~xpP4Ad`}n0kcwM5y^MTE6gXJceoeUf@BjYo4W6@?NxMp( zv}p1!T)#`AIpF!S7X<+amfv&{%TBOp-0Zu}bivU(@fUO<|(*uyZupduiV5fwdPVbZTqSlz8{HiU}Siu%%OXw@J$iWZU#?RKbLh* G2~7a&dR#*Q delta 172 zcmbQr^p6S9Lxus{?~7sl9zNPEqc~z)-(=Vqyvk3QSE*)~;Ra?d@GvRb_2$otm2Z zc%5~BfB)B8K@1EGueFy%11W)$Aiv=MsDR;ta;zj!uFTWLF{I*FPER1;VFe!NmkV?{ zJ*)oTKF7G^(?)fU8yjP?N|Mad`%|Kl0%i)>nKiYUPHdCe#B-4M&gWA`Dxuj8OC~Pe z_HuQ|-TlJlsYxQN70&{^)DDOiwx7H7N3TTsjmJ*we^cz(r^&rz~JfX=d#Wzp$PzZB4`i* delta 192 zcmZ3()W|f!vtBO1C&ZP3f#Ki3sgKuLo0^!oIXP8TReik`WNTy7-`@|ElFQnb1*Eu2 zg8YL2!vMpkGdkyiqRE~vjv*DdLV7%f4k+*(-lYEbfBS4!uB(lPQpX$4z3KMhc=mU? zVO~P8z|2!(O1V)f{q6td@7v5ByVdU;JpoN*5VH<-DRV`WzR8 nYU~a$+<7Y$!fW+NG=YKnH=B-6_t8l}`xrc3{an^LB{Ts56ERVj diff --git a/src/main/resources/assets/anvilcraft/textures/block/block_comparator_on.png b/src/main/resources/assets/anvilcraft/textures/block/block_comparator_on.png index fb12f0eda62a3d304710b0bdd6281f1189ec2a81..0b949339a4608e89aee7281fdd6d5d99fc0cdeb5 100644 GIT binary patch delta 278 zcmX@abd70(XT58HPl#(wOpK9{QFV3oMrH;tMka4>?}CB?VNsdl=;$kqO#c~}Ynd1q zR#e*B*w|=j1eqCITU%FERi&n;_V@Q|s;QZpm@qIfw3SS^15)B8L4Lviu>yu?4$tC% zN?JT!978H@#q`}4s&6*nVD(%ZmF@9l+W-Gon4+vN+xoxZVP|NNW!TFQCwK0UPtaKl1%Zpdrg%PF+-)oT=+7QoW5qrH_HU`_UscB(f<8HK-m^g7srr_TR#2Ve1{D< zoFi{9eJuU_-*njxKC5&meo(1uau!US#v0v{@$_r?gj_~5x3Et)i;g77F<#Q;sgt*H zFfNGgSb2zjqlRS`(>u>i-)jyBM~1kX9E{SIGYnW@d|=TZc7vLCMK%mmrC(G&Yq*oD uYfwFL&#BD^{O;So*g7?N`@48XHinx{Jh!%8H|GI5h{4m<&t;ucLK6VQ&1~xc diff --git a/src/main/resources/assets/anvilcraft/textures/block/electromagnetic_ring_in.png b/src/main/resources/assets/anvilcraft/textures/block/electromagnetic_ring_in.png index 83c598a12a99884e6b66cc0ca842c41208d0d5c5..3e1d7ce36bda2d445a46899eefee5e0d6fd524bb 100644 GIT binary patch delta 268 zcmX@WbcShyXT58HPlzjrg!=MWmsBIAvfQletw~C9GD>o?o93+$)%W06GIp@EHr3ZJ zPtSijy&}>-wA@Ck)7|)Jaj3D5R+yi+jj55Zx(ovY0~^=P9Y9LFB*-uLKUTo-%;8xa zP)U`ii(^Q|t&np!`RbV!IUE9yS#f(EEqwUjerv{Bzx)aX^@AKr+qb@-w{<&*M#$m7 z%Pu{0fowOpgUotju)Hhsj72a0Xbi;2OD+BkVDic17po^Cb8(#NVOFVn;Khu|8 zP`vEA>0Nl-sfOjJc89v#<(Vs>q6r(Hy4G9t2`s3IO5Ksh@#FE4jzZ|RqK zSx;4WJSr0r5Q#@K#dB3NEGkw`OFT6)O(z@x007SI8Xo`v02OpnPE(Pg6@M$)ed+)J z0Cq`4K~#9!Y|haR!ypJiQCw}6fmV_K|JI>%x+S~eft&;*sNT*!N6y`Fl&pQO}Jj{lJNqj>@pu?kG!w&DSv`TbL7KR`9m6~aZK?-L@~ oY#{7_v;fbD7*Fi`OMn3Y4ilyiHQL`cY5)KL07*qoM6N<$f+d$?TL1t6 diff --git a/src/main/resources/assets/anvilcraft/textures/block/electromagnetic_ring_out.png b/src/main/resources/assets/anvilcraft/textures/block/electromagnetic_ring_out.png index cf70f425824b18460c3f83f9454602054dca3227..f8c8a9db665eddd86bce2252e7506feeb072cb60 100644 GIT binary patch delta 267 zcmdnTbed^`XT58HPl&6cAm{bgq~)-wA@Ck)7|)Jaj3D5R+yi+jj55Zx(ovYgNev3eIO-X666>BA1h#Z=I|^I zsHD=<#WAGfR?In1p?YRT4u`;;%gr7~${zf4=apI<`}1g16*rf_&fd!JJv&_;7Dn|+ z-Tu`)DLzV1IOt@Qr$56F<|C}LndYf$mKWfXYZGv+1A{_ yy}P)&AXolD^SLGmUJaiGhlPJO-})z*!0`O8z}c)I$zu&i@RXaWFZi*d;S delta 236 zcmVq6r(Hy4G9t2`s3IO5Ksh@#FE4jzZ|RqK zSx;4WJSr0r5Q#@K#dB3NEGkw`OFT6)O(z@x007SI8Xo`v02OpnPE(Pg6@M$)ed+)J z0CY)2K~#9!e9l185|p|1$iIM6QGDyU;?)l5Ae+2PnrDy)j(GW7lpo0h-9;Y mumjQpJR@Q}vF{%N1^^O(4-qwsOAj&t0000KHs-{an^LB{Ts5V15!b delta 71 zcmZ3*xQcOtpRhY4lMNH24l_dpBO?O?!>PnO+a@L|Xl@ZsNJ>gcNpccONMK`Xb6m=# aaDd_K0_OTqBZCJ(bqt=aelF{r5}E+4_!Myf diff --git a/src/main/resources/assets/anvilcraft/textures/block/schmitt_trigger_indicator_overlay.png b/src/main/resources/assets/anvilcraft/textures/block/schmitt_trigger_indicator_overlay.png index e42011054476522f546ddd65a0501b56f46c0bd5..d43bf5cac103c4539f8f6704a40b74212b54331c 100644 GIT binary patch delta 48 zcmZ3*xQcN?qo%V@!$e6AiHR&TW=KfPm~kSMQ6Paq>@o9Uy+o!E1|aZs^>bP0l+XkK DdQlFu delta 48 zcmZ3*xQcN?qvjUjgruZ|gd``SgcLTWV~$Ii6b>+a`NmxT_Fm};1|aZs^>bP0l+XkK DuZ0n^