From cf963f8b83a05970b7dfac67323eabc244a62538 Mon Sep 17 00:00:00 2001 From: LYOfficial Date: Sat, 5 Nov 2022 20:25:20 +0800 Subject: [PATCH] =?UTF-8?q?11=E6=9C=88=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1.修复pack.mcmeta导致的无法识别使用问题 2.修补了GUI多出的异色角落 3.修复了模型json路径错误导致的方块错误 4.稍微补充和修改了一下地狱的方块，修改了地狱岩 Co-Authored-By: MouFengcoo <49562237+MouFengcoo@users.noreply.github.com> --- .../minecraft/models/block/carved_pumpkin.json | 2 +- .../models/block/deepslate_coal_ore.json | 2 +- .../models/block/deepslate_copper_ore.json | 2 +- .../models/block/deepslate_diamond_ore.json | 2 +- .../models/block/deepslate_emerald_ore.json | 2 +- .../models/block/deepslate_gold_ore.json | 2 +- .../models/block/deepslate_iron_ore.json | 2 +- .../models/block/deepslate_lapis_ore.json | 2 +- .../models/block/deepslate_redstone_ore.json | 2 +- .../minecraft/models/block/jack_o_lantern.json | 2 +- assets/minecraft/textures/block/glowstone.png | Bin 197 -> 378 bytes .../textures/block/glowstone.png.mcmeta | 10 ++++++++++ assets/minecraft/textures/block/glowstone_s.png | Bin 190 -> 127 bytes assets/minecraft/textures/block/netherrack.png | Bin 192 -> 230 bytes .../gui/container/creative_inventory/tabs.png | Bin 869 -> 455 bytes 15 files changed, 20 insertions(+), 10 deletions(-) create mode 100644 assets/minecraft/textures/block/glowstone.png.mcmeta diff --git a/assets/minecraft/models/block/carved_pumpkin.json b/assets/minecraft/models/block/carved_pumpkin.json index bd43f88..4a8b929 100644 --- a/assets/minecraft/models/block/carved_pumpkin.json +++ b/assets/minecraft/models/block/carved_pumpkin.json @@ -186,7 +186,7 @@ "east": {"uv": [0, 0, 16, 1], "texture": "#side", "cullface": "east"}, "south": {"uv": [0, 0, 16, 1], "texture": "#side", "cullface": "south"}, "west": {"uv": [0, 0, 16, 1], "texture": "#side", "cullface": "west"}, - "up": {"uv": [0, 0, 16, 16], "rotation": 180, "texture": "#4", "cullface": "up"}, + "up": {"uv": [0, 0, 16, 16], "rotation": 180, "texture": "#4", "cullface": "north"}, "down": {"uv": [0, 0, 16, 16], "rotation": 180, "texture": "#top", "cullface": "down"} } }, diff --git a/assets/minecraft/models/block/deepslate_coal_ore.json b/assets/minecraft/models/block/deepslate_coal_ore.json index 1964b4b..abb905e 100644 --- a/assets/minecraft/models/block/deepslate_coal_ore.json +++ b/assets/minecraft/models/block/deepslate_coal_ore.json @@ -3,7 +3,7 @@ "parent": "block/cube_all", "textures": { "1": "block/deepslate_coal_ore", - "all": "block/deepslate.png", + "all": "block/deepslate", "particle": "block/deepslate_coal_ore" }, "elements": [ diff --git a/assets/minecraft/models/block/deepslate_copper_ore.json b/assets/minecraft/models/block/deepslate_copper_ore.json index 390f414..2beb3cc 100644 --- a/assets/minecraft/models/block/deepslate_copper_ore.json +++ b/assets/minecraft/models/block/deepslate_copper_ore.json @@ -3,7 +3,7 @@ "parent": "block/cube_all", "textures": { "1": "block/deepslate_copper_ore", - "all": "block/deepslate.png", + "all": "block/deepslate", "particle": "block/deepslate_copper_ore" }, "elements": [ diff --git a/assets/minecraft/models/block/deepslate_diamond_ore.json b/assets/minecraft/models/block/deepslate_diamond_ore.json index ef5bdd5..d394038 100644 --- a/assets/minecraft/models/block/deepslate_diamond_ore.json +++ b/assets/minecraft/models/block/deepslate_diamond_ore.json @@ -3,7 +3,7 @@ "parent": "block/cube_all", "textures": { "1": "block/deepslate_diamond_ore", - "all": "block/deepslate.png", + "all": "block/deepslate", "particle": "block/deepslate_diamond_ore" }, "elements": [ diff --git a/assets/minecraft/models/block/deepslate_emerald_ore.json b/assets/minecraft/models/block/deepslate_emerald_ore.json index 8149dce..5169be0 100644 --- a/assets/minecraft/models/block/deepslate_emerald_ore.json +++ b/assets/minecraft/models/block/deepslate_emerald_ore.json @@ -3,7 +3,7 @@ "parent": "block/cube_all", "textures": { "1": "block/deepslate_emerald_ore", - "all": "block/deepslate.png", + "all": "block/deepslate", "particle": "block/deepslate_emerald_ore" }, "elements": [ diff --git a/assets/minecraft/models/block/deepslate_gold_ore.json b/assets/minecraft/models/block/deepslate_gold_ore.json index b62df5f..60fab99 100644 --- a/assets/minecraft/models/block/deepslate_gold_ore.json +++ b/assets/minecraft/models/block/deepslate_gold_ore.json @@ -3,7 +3,7 @@ "parent": "block/cube_all", "textures": { "1": "block/deepslate_gold_ore", - "all": "block/deepslate.png", + "all": "block/deepslate", "particle": "block/deepslate_gold_ore" }, "elements": [ diff --git a/assets/minecraft/models/block/deepslate_iron_ore.json b/assets/minecraft/models/block/deepslate_iron_ore.json index 04759ad..3902cee 100644 --- a/assets/minecraft/models/block/deepslate_iron_ore.json +++ b/assets/minecraft/models/block/deepslate_iron_ore.json @@ -3,7 +3,7 @@ "parent": "block/cube_all", "textures": { "1": "block/deepslate_iron_ore", - "all": "block/deepslate.png", + "all": "block/deepslate", "particle": "block/deepslate_iron_ore" }, "elements": [ diff --git a/assets/minecraft/models/block/deepslate_lapis_ore.json b/assets/minecraft/models/block/deepslate_lapis_ore.json index 2d12767..c9fd2e2 100644 --- a/assets/minecraft/models/block/deepslate_lapis_ore.json +++ b/assets/minecraft/models/block/deepslate_lapis_ore.json @@ -3,7 +3,7 @@ "parent": "block/cube_all", "textures": { "1": "block/deepslate_lapis_ore", - "all": "block/deepslate.png", + "all": "block/deepslate", "particle": "block/deepslate_lapis_ore" }, "elements": [ diff --git a/assets/minecraft/models/block/deepslate_redstone_ore.json b/assets/minecraft/models/block/deepslate_redstone_ore.json index e3fca72..0c3f7c7 100644 --- a/assets/minecraft/models/block/deepslate_redstone_ore.json +++ b/assets/minecraft/models/block/deepslate_redstone_ore.json @@ -3,7 +3,7 @@ "parent": "block/cube_all", "textures": { "1": "block/deepslate_redstone_ore", - "all": "block/deepslate.png", + "all": "block/deepslate", "particle": "block/deepslate_redstone_ore" }, "elements": [ diff --git a/assets/minecraft/models/block/jack_o_lantern.json b/assets/minecraft/models/block/jack_o_lantern.json index 844da95..c5bbc8e 100644 --- a/assets/minecraft/models/block/jack_o_lantern.json +++ b/assets/minecraft/models/block/jack_o_lantern.json @@ -198,7 +198,7 @@ "east": {"uv": [0, 0, 16, 1], "texture": "#side", "cullface": "east"}, "south": {"uv": [0, 0, 16, 1], "texture": "#side", "cullface": "south"}, "west": {"uv": [0, 0, 16, 1], "texture": "#side", "cullface": "west"}, - "up": {"uv": [0, 0, 16, 16], "rotation": 180, "texture": "#4", "cullface": "up"}, + "up": {"uv": [0, 0, 16, 16], "rotation": 180, "texture": "#4", "cullface": "north"}, "down": {"uv": [0, 0, 16, 16], "rotation": 180, "texture": "#top", "cullface": "down"} } }, diff --git a/assets/minecraft/textures/block/glowstone.png b/assets/minecraft/textures/block/glowstone.png index d26ec7bba1750a2eb86d99af6ccf51b96d547998..7688a8cee451364c32063fd651ca8d38bb692a44 100644 GIT binary patch delta 364 zcmV-y0h9j40r~=v7k@Aa1^@s67+?BV00009a7bBm000XU000XU0RWnu7ytkPEJ;K` zR7i>KRxu8PFbq5@hK${K1Ha%GeF#IBN>wG6KBd3tci0%S(E$)9v7H1`b*UvJl*INq zwl6N)rXF!XN&q;UeaeHK4FJIH(M&(4(zR?40O;;-0KjRp8Glk{&XnxN>_t>2XG`zU zqU@rv{q#BO+Ykhp;+kl{^{R+&AVT~*pc0W49svhi2*pQWDmiur(Q1IED6$#>H-x~A zb7zXSsmH_3G}wIxfLwKuhYy~YB<1e~r0npb9Ti$Eh20U6Io3G(LyZa#>VWj;vHf|KHm14h78T02u_ zS`>xql+#E(Dxn>&1K9wDtTdNCBhk(j!pKZ0JD&ISm&uXe^T7wlD{Ap66`;NV0000< KMNUMnLSTXgOqUM; delta 182 zcmV;n07?J)0>uH47k>~41^@s6AM^iV00001b5ch_0Itp)=>Px#e@R3^R5*=ee7Q9G zKLZlznthI;EY*ks8^9*VgjFR8fCb$KWSW720jFzVfDzdX=uSj72pz!GvEWmL%LQGt z&%q66A=XA*22(E(u>~MW1|T~N*-%0Tvf!0PGn6(7iBvzMt1pK~Be4dddx2mWkQ9j6 k6cb8lEa(dHWoK*v0IM27x3Z?wLjV8(07*qoM6N<$f^Hi^ivR!s diff --git a/assets/minecraft/textures/block/glowstone.png.mcmeta b/assets/minecraft/textures/block/glowstone.png.mcmeta new file mode 100644 index 0000000..73a9a5c --- /dev/null +++ b/assets/minecraft/textures/block/glowstone.png.mcmeta @@ -0,0 +1,10 @@ +{ + "animation": { + "frametime": 7, + "frames": [ + 0, + 1, + 2 + ] + } +} diff --git a/assets/minecraft/textures/block/glowstone_s.png b/assets/minecraft/textures/block/glowstone_s.png index 869330a4499e7c50505b41408602e576aa5b54df..808bf5f8aa07c1f8649513996a6f5f684cd224de 100644 GIT binary patch delta 97 zcmdnTSU*7}nzO(ovY3H^TNs2H8D`CqU|?V{^mK6yvFJ?}N%Z)6-hnY;k&7`i5ODWw xY*lPk>9yl2Uh%joklBq_LWa$NuOg3y;X*Jg|DCH6lYp8TJYD@<);T3K0RY@#8m9mN delta 161 zcmV;S0ABxpz5$RVe*tq+M?wIu&K&6g004MNL_t(IjkS}@4Zt7_LmyQ}Wh@3_tM<}X zkrh6XT65qK%W+I7oqpobXjCc@qS_HM6EN-IZ(!)=LGdG~MK7dycs3)A9JKoY*lx#> z@OL3b0j31JEibwfv}sjD|5>E$%*ubCaaTx3SZ0t4F(R)P8_kqB`_2(ATR$wLERx!E P00000NkvXXu0mjf-8({S diff --git a/assets/minecraft/textures/block/netherrack.png b/assets/minecraft/textures/block/netherrack.png index f1192410fa5aa16527d8a5e913d1b3288f0121b5..c66051e5c7d0211fdefd799eea4d8a0eb007bc5a 100644 GIT binary patch delta 202 zcmV;*05$)>0p3>YP%~Y z%=yd~bpt5GS`y?J%-vK}?QbL(XkAuh-7$kxp@D&k1Bo~=mr?Da{(;q6 zMrT3`&)Mi+R^>2v(Mv-y3C&<2*MxnB%XWqXx2Ek^Qas9(f>kHqJ zgWfBeMO-*lt}R*l{_~mkx^|I!HR_o^)tPTZo{!(REB5)X_xJa$`}+C&wOvv-b}c_2 zx2ELo^z-t^C6eFB%d9Q=`}F9|8?(*W|9OpN#%_~4w@LNSI4l^h0vH0A~aX@-`Y3<_u17!u7G zI5smn+)y)XP_M5xKJYl5xj}Y&&e!;~x%NN}HxlRD?YaNL-no*c!GMtjw4w8I}BWsEIN-X g3V<#dK+w=8ukvF4WrOt0s~}f+y85}Sb4q9e07jP-Bme*a