From 1fa5b53847b73db740f97451b0dfe73123e2d310 Mon Sep 17 00:00:00 2001 From: XiaoMoMi <972454774@qq.com> Date: Fri, 10 Oct 2025 04:38:46 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=A4=A7=E5=AE=9D=E8=B4=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../models/block/custom/large_mushroom.json | 36 +----- .../block/custom/magma_plant_stage_0.json | 34 ++++++ .../block/custom/magma_plant_stage_1.json | 34 ++++++ .../block/custom/magma_plant_stage_2.json | 34 ++++++ .../block/custom/magma_plant_stage_3.json | 112 ++++++++++++++++++ .../models/block/custom/medium_mushroom.json | 36 +----- .../models/block/custom/small_mushroom.json | 36 +----- .../textures/block/custom/magma_plant.png | Bin 0 -> 449 bytes .../block/custom/magma_plant.png.mcmeta | 6 + .../textures/item/custom/magma_fruit.png | Bin 0 -> 513 bytes .../item/custom/magma_fruit.png.mcmeta | 5 + gradle.properties | 2 +- 12 files changed, 229 insertions(+), 106 deletions(-) create mode 100644 common-files/src/main/resources/resources/default/resourcepack/assets/minecraft/models/block/custom/magma_plant_stage_0.json create mode 100644 common-files/src/main/resources/resources/default/resourcepack/assets/minecraft/models/block/custom/magma_plant_stage_1.json create mode 100644 common-files/src/main/resources/resources/default/resourcepack/assets/minecraft/models/block/custom/magma_plant_stage_2.json create mode 100644 common-files/src/main/resources/resources/default/resourcepack/assets/minecraft/models/block/custom/magma_plant_stage_3.json create mode 100644 common-files/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/block/custom/magma_plant.png create mode 100644 common-files/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/block/custom/magma_plant.png.mcmeta create mode 100644 common-files/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/magma_fruit.png create mode 100644 common-files/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/magma_fruit.png.mcmeta diff --git a/common-files/src/main/resources/resources/default/resourcepack/assets/minecraft/models/block/custom/large_mushroom.json b/common-files/src/main/resources/resources/default/resourcepack/assets/minecraft/models/block/custom/large_mushroom.json index 356812b0e..95171c848 100644 --- a/common-files/src/main/resources/resources/default/resourcepack/assets/minecraft/models/block/custom/large_mushroom.json +++ b/common-files/src/main/resources/resources/default/resourcepack/assets/minecraft/models/block/custom/large_mushroom.json @@ -134,39 +134,5 @@ "down": {"uv": [2.5, 13.5, 0, 15], "texture": "#0"} } } - ], - "display": { - "ground": { - "translation": [0, 2.25, 0], - "scale": [0.5, 0.5, 0.5] - }, - "gui": { - "rotation": [30, -150, 0], - "translation": [3.75, -2.5, 0] - }, - "fixed": { - "translation": [0, 0, -16], - "scale": [2, 2, 2] - }, - "thirdperson_righthand": { - "rotation": [75, 45, 0], - "translation": [0, 2.5, 0], - "scale": [0.375, 0.375, 0.375] - }, - "thirdperson_lefthand": { - "rotation": [75, 45, 0], - "translation": [0, 2.5, 0], - "scale": [0.375, 0.375, 0.375] - }, - "firstperson_righthand": { - "rotation": [0, 45, 0], - "translation": [-1.5, 2.5, 1], - "scale": [0.4, 0.4, 0.4] - }, - "firstperson_lefthand": { - "rotation": [0, 45, 0], - "translation": [-1.5, 2.5, 1], - "scale": [0.4, 0.4, 0.4] - } - } + ] } \ No newline at end of file diff --git a/common-files/src/main/resources/resources/default/resourcepack/assets/minecraft/models/block/custom/magma_plant_stage_0.json b/common-files/src/main/resources/resources/default/resourcepack/assets/minecraft/models/block/custom/magma_plant_stage_0.json new file mode 100644 index 000000000..012bd99d2 --- /dev/null +++ b/common-files/src/main/resources/resources/default/resourcepack/assets/minecraft/models/block/custom/magma_plant_stage_0.json @@ -0,0 +1,34 @@ +{ + "textures": { + "0": "block/custom/magma_plant", + "particle": "block/custom/magma_plant" + }, + "elements": [ + { + "from": [8, 0, 0], + "to": [8, 8, 16], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 8, 8]}, + "faces": { + "north": {"uv": [0, 0, 0, 4], "texture": "#0"}, + "east": {"uv": [0, 4, 8, 8], "texture": "#0"}, + "south": {"uv": [0, 0, 0, 4], "texture": "#0"}, + "west": {"uv": [0, 4, 8, 8], "texture": "#0"}, + "up": {"uv": [0, 4, 0, 0], "texture": "#0"}, + "down": {"uv": [0, 0, 0, 4], "texture": "#0"} + } + }, + { + "from": [8, 0, 0], + "to": [8, 8, 16], + "rotation": {"angle": -45, "axis": "y", "origin": [8, 8, 8]}, + "faces": { + "north": {"uv": [0, 0, 0, 4], "texture": "#0"}, + "east": {"uv": [0, 4, 8, 8], "texture": "#0"}, + "south": {"uv": [0, 0, 0, 4], "texture": "#0"}, + "west": {"uv": [0, 4, 8, 8], "texture": "#0"}, + "up": {"uv": [0, 4, 0, 0], "texture": "#0"}, + "down": {"uv": [0, 0, 0, 4], "texture": "#0"} + } + } + ] +} \ No newline at end of file diff --git a/common-files/src/main/resources/resources/default/resourcepack/assets/minecraft/models/block/custom/magma_plant_stage_1.json b/common-files/src/main/resources/resources/default/resourcepack/assets/minecraft/models/block/custom/magma_plant_stage_1.json new file mode 100644 index 000000000..35fe79caa --- /dev/null +++ b/common-files/src/main/resources/resources/default/resourcepack/assets/minecraft/models/block/custom/magma_plant_stage_1.json @@ -0,0 +1,34 @@ +{ + "textures": { + "0": "block/custom/magma_plant", + "particle": "block/custom/magma_plant" + }, + "elements": [ + { + "from": [8, 0, 0], + "to": [8, 16, 16], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 8, 8]}, + "faces": { + "north": {"uv": [0, 0, 0, 4], "texture": "#0"}, + "east": {"uv": [16, 0, 8, 8], "texture": "#0"}, + "south": {"uv": [0, 0, 0, 4], "texture": "#0"}, + "west": {"uv": [8, 0, 16, 8], "texture": "#0"}, + "up": {"uv": [0, 4, 0, 0], "texture": "#0"}, + "down": {"uv": [0, 0, 0, 4], "texture": "#0"} + } + }, + { + "from": [0, 0, 8], + "to": [16, 16, 8], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 8, 8]}, + "faces": { + "north": {"uv": [16, 0, 8, 8], "texture": "#0"}, + "east": {"uv": [0, 0, 0, 4], "texture": "#0"}, + "south": {"uv": [8, 0, 16, 8], "texture": "#0"}, + "west": {"uv": [0, 0, 0, 4], "texture": "#0"}, + "up": {"uv": [0, 4, 0, 0], "rotation": 270, "texture": "#0"}, + "down": {"uv": [0, 0, 0, 4], "rotation": 90, "texture": "#0"} + } + } + ] +} \ No newline at end of file diff --git a/common-files/src/main/resources/resources/default/resourcepack/assets/minecraft/models/block/custom/magma_plant_stage_2.json b/common-files/src/main/resources/resources/default/resourcepack/assets/minecraft/models/block/custom/magma_plant_stage_2.json new file mode 100644 index 000000000..e790af66a --- /dev/null +++ b/common-files/src/main/resources/resources/default/resourcepack/assets/minecraft/models/block/custom/magma_plant_stage_2.json @@ -0,0 +1,34 @@ +{ + "textures": { + "0": "block/custom/magma_plant", + "particle": "block/custom/magma_plant" + }, + "elements": [ + { + "from": [8, 0, 0], + "to": [8, 16, 16], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 8, 8]}, + "faces": { + "north": {"uv": [0, 0, 0, 4], "texture": "#0"}, + "east": {"uv": [8, 8, 0, 16], "texture": "#0"}, + "south": {"uv": [0, 0, 0, 4], "texture": "#0"}, + "west": {"uv": [0, 8, 8, 16], "texture": "#0"}, + "up": {"uv": [0, 4, 0, 0], "texture": "#0"}, + "down": {"uv": [0, 0, 0, 4], "texture": "#0"} + } + }, + { + "from": [8, 0, 0], + "to": [8, 16, 16], + "rotation": {"angle": -45, "axis": "y", "origin": [8, 8, 8]}, + "faces": { + "north": {"uv": [0, 0, 0, 4], "texture": "#0"}, + "east": {"uv": [8, 8, 0, 16], "texture": "#0"}, + "south": {"uv": [0, 0, 0, 4], "texture": "#0"}, + "west": {"uv": [0, 8, 8, 16], "texture": "#0"}, + "up": {"uv": [0, 4, 0, 0], "texture": "#0"}, + "down": {"uv": [0, 0, 0, 4], "texture": "#0"} + } + } + ] +} \ No newline at end of file diff --git a/common-files/src/main/resources/resources/default/resourcepack/assets/minecraft/models/block/custom/magma_plant_stage_3.json b/common-files/src/main/resources/resources/default/resourcepack/assets/minecraft/models/block/custom/magma_plant_stage_3.json new file mode 100644 index 000000000..21035cdfe --- /dev/null +++ b/common-files/src/main/resources/resources/default/resourcepack/assets/minecraft/models/block/custom/magma_plant_stage_3.json @@ -0,0 +1,112 @@ +{ + "textures": { + "0": "block/custom/magma_plant", + "particle": "block/custom/magma_plant" + }, + "elements": [ + { + "from": [6.1, 11.1, 6.1], + "to": [3.9, 8.9, 3.9], + "rotation": {"angle": 0, "axis": "y", "origin": [4, 9, 6]}, + "faces": { + "north": {"uv": [1, 2, 0, 1], "texture": "#0"}, + "east": {"uv": [1, 2, 0, 1], "texture": "#0"}, + "south": {"uv": [0, 2, 1, 1], "texture": "#0"}, + "west": {"uv": [0, 2, 1, 1], "texture": "#0"}, + "up": {"uv": [1, 2, 0, 1], "texture": "#0"}, + "down": {"uv": [1, 2, 0, 1], "texture": "#0"} + } + }, + { + "from": [4, 9, 4], + "to": [6, 11, 6], + "rotation": {"angle": 0, "axis": "y", "origin": [4, 9, 6]}, + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "east": {"uv": [1, 0, 2, 1], "texture": "#0"}, + "south": {"uv": [2, 0, 1, 1], "texture": "#0"}, + "west": {"uv": [1, 0, 0, 1], "texture": "#0"}, + "up": {"uv": [2, 1, 3, 0], "texture": "#0"}, + "down": {"uv": [3, 1, 4, 0], "texture": "#0"} + } + }, + { + "from": [11.1, 9.1, 11.1], + "to": [8.9, 6.9, 8.9], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 7, 9]}, + "faces": { + "north": {"uv": [0, 2, 1, 1], "texture": "#0"}, + "east": {"uv": [0, 2, 1, 1], "texture": "#0"}, + "south": {"uv": [1, 2, 0, 1], "texture": "#0"}, + "west": {"uv": [1, 2, 0, 1], "texture": "#0"}, + "up": {"uv": [0, 1, 1, 2], "texture": "#0"}, + "down": {"uv": [0, 1, 1, 2], "texture": "#0"} + } + }, + { + "from": [9, 7, 9], + "to": [11, 9, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 7, 9]}, + "faces": { + "north": {"uv": [2, 0, 1, 1], "texture": "#0"}, + "east": {"uv": [1, 0, 0, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "west": {"uv": [1, 0, 2, 1], "texture": "#0"}, + "up": {"uv": [3, 0, 2, 1], "texture": "#0"}, + "down": {"uv": [4, 0, 3, 1], "texture": "#0"} + } + }, + { + "from": [6.1, 13.1, 12.1], + "to": [3.9, 10.9, 9.9], + "rotation": {"angle": 0, "axis": "y", "origin": [4, 11, 10]}, + "faces": { + "north": {"uv": [1, 2, 0, 1], "texture": "#0"}, + "east": {"uv": [0, 2, 1, 1], "texture": "#0"}, + "south": {"uv": [0, 2, 1, 1], "texture": "#0"}, + "west": {"uv": [1, 2, 0, 1], "texture": "#0"}, + "up": {"uv": [1, 1, 0, 2], "texture": "#0"}, + "down": {"uv": [1, 1, 0, 2], "texture": "#0"} + } + }, + { + "from": [4, 11, 10], + "to": [6, 13, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [4, 11, 10]}, + "faces": { + "north": {"uv": [1, 0, 2, 1], "texture": "#0"}, + "east": {"uv": [2, 0, 1, 1], "texture": "#0"}, + "south": {"uv": [1, 0, 0, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "up": {"uv": [2, 0, 3, 1], "texture": "#0"}, + "down": {"uv": [3, 0, 4, 1], "texture": "#0"} + } + }, + { + "from": [8, 0, 0], + "to": [8, 16, 16], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 8, 8]}, + "faces": { + "north": {"uv": [12, 0, 12, 4], "texture": "#0"}, + "east": {"uv": [16, 8, 8, 16], "texture": "#0"}, + "south": {"uv": [12, 0, 12, 4], "texture": "#0"}, + "west": {"uv": [8, 8, 16, 16], "texture": "#0"}, + "up": {"uv": [12, 4, 12, 0], "texture": "#0"}, + "down": {"uv": [12, 0, 12, 4], "texture": "#0"} + } + }, + { + "from": [8, 0, 0], + "to": [8, 16, 16], + "rotation": {"angle": -45, "axis": "y", "origin": [8, 8, 8]}, + "faces": { + "north": {"uv": [12, 0, 12, 4], "texture": "#0"}, + "east": {"uv": [16, 8, 8, 16], "texture": "#0"}, + "south": {"uv": [12, 0, 12, 4], "texture": "#0"}, + "west": {"uv": [8, 8, 16, 16], "texture": "#0"}, + "up": {"uv": [12, 4, 12, 0], "texture": "#0"}, + "down": {"uv": [12, 0, 12, 4], "texture": "#0"} + } + } + ] +} \ No newline at end of file diff --git a/common-files/src/main/resources/resources/default/resourcepack/assets/minecraft/models/block/custom/medium_mushroom.json b/common-files/src/main/resources/resources/default/resourcepack/assets/minecraft/models/block/custom/medium_mushroom.json index e00ea901d..6f50752fc 100644 --- a/common-files/src/main/resources/resources/default/resourcepack/assets/minecraft/models/block/custom/medium_mushroom.json +++ b/common-files/src/main/resources/resources/default/resourcepack/assets/minecraft/models/block/custom/medium_mushroom.json @@ -69,39 +69,5 @@ "down": {"uv": [2.5, 13.5, 0, 15], "texture": "#0"} } } - ], - "display": { - "ground": { - "translation": [0, 2.25, 0], - "scale": [0.5, 0.5, 0.5] - }, - "gui": { - "rotation": [30, -150, 0], - "translation": [3.75, -2.5, 0] - }, - "fixed": { - "translation": [0, 0, -16], - "scale": [2, 2, 2] - }, - "thirdperson_righthand": { - "rotation": [75, 45, 0], - "translation": [0, 2.5, 0], - "scale": [0.375, 0.375, 0.375] - }, - "thirdperson_lefthand": { - "rotation": [75, 45, 0], - "translation": [0, 2.5, 0], - "scale": [0.375, 0.375, 0.375] - }, - "firstperson_righthand": { - "rotation": [0, 45, 0], - "translation": [-1.5, 2.5, 1], - "scale": [0.4, 0.4, 0.4] - }, - "firstperson_lefthand": { - "rotation": [0, 45, 0], - "translation": [-1.5, 2.5, 1], - "scale": [0.4, 0.4, 0.4] - } - } + ] } \ No newline at end of file diff --git a/common-files/src/main/resources/resources/default/resourcepack/assets/minecraft/models/block/custom/small_mushroom.json b/common-files/src/main/resources/resources/default/resourcepack/assets/minecraft/models/block/custom/small_mushroom.json index bbc245d23..a48e42e24 100644 --- a/common-files/src/main/resources/resources/default/resourcepack/assets/minecraft/models/block/custom/small_mushroom.json +++ b/common-files/src/main/resources/resources/default/resourcepack/assets/minecraft/models/block/custom/small_mushroom.json @@ -57,39 +57,5 @@ "down": {"uv": [3.5, 2, 0, 4], "texture": "#0"} } } - ], - "display": { - "ground": { - "translation": [0, 2.25, 0], - "scale": [0.5, 0.5, 0.5] - }, - "gui": { - "rotation": [30, -150, 0], - "translation": [3.75, -2.5, 0] - }, - "fixed": { - "translation": [0, 0, -16.25], - "scale": [2, 2, 2] - }, - "thirdperson_righthand": { - "rotation": [75, 45, 0], - "translation": [0, 2.5, 0], - "scale": [0.375, 0.375, 0.375] - }, - "thirdperson_lefthand": { - "rotation": [75, 45, 0], - "translation": [0, 2.5, 0], - "scale": [0.375, 0.375, 0.375] - }, - "firstperson_righthand": { - "rotation": [0, 45, 0], - "translation": [-1.5, 2.5, 1], - "scale": [0.4, 0.4, 0.4] - }, - "firstperson_lefthand": { - "rotation": [0, 45, 0], - "translation": [-1.5, 2.5, 1], - "scale": [0.4, 0.4, 0.4] - } - } + ] } \ No newline at end of file diff --git a/common-files/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/block/custom/magma_plant.png b/common-files/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/block/custom/magma_plant.png new file mode 100644 index 0000000000000000000000000000000000000000..507120d4b4e7f668a40a75b648ad5136cd4202c7 GIT binary patch literal 449 zcmeAS@N?(olHy`uVBq!ia0vp^3P7B|!3-q5|1_)uQj#UE5hcO-X(i=}MX3yqDfvmM z3ZA)%>8U}fi7AzZCsS>Jiqr#qLR`;<@NWwhI_|=`#)f->CcBZbZLkve^EK{P)*iR( z)nj5}{Js5wYUeb|)B-8qk|4j}|44wr_JvX#0|TSDr;B4q#jQ6Xo<&C#ctqIxul?U| zE_6dp#-KeWh%=-z^Ge26X^F;}j5(Va?sVk0oIf6SeOAJ^^&B0K?H)TM)V;aE)^I|! z;o;GWI}17ujJjLS+FFD@wFuDO!%UOQY*sggrz-6iX2?I*A`rQC zR+^%p5z{<@SDsft%Q%0DGoCQ>!giTMYNzi0Us<;F0*6nMk&EEeX-)!5+(dTSdT1*L zO?Y;2d6LTZm5(dJnvS)#-QUf5#n9#YQjtYLOZpTxSbfuGIO41M`;&9-9p*A8uY1?0 z?Afi!ns_9^^7o&uXYJEB2U+Q<+MQd=A1y!aS3>vw`}3A8XKLE;HSzV~Ywi12@}D;P l*v_=+>qGNbho>_zGu$t1jPkj5TO1g644$rjF6*2UngHkez6$^V literal 0 HcmV?d00001 diff --git a/common-files/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/block/custom/magma_plant.png.mcmeta b/common-files/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/block/custom/magma_plant.png.mcmeta new file mode 100644 index 000000000..a331d73c2 --- /dev/null +++ b/common-files/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/block/custom/magma_plant.png.mcmeta @@ -0,0 +1,6 @@ +{ + "animation": { + "interpolate": true, + "frametime": 5 + } +} diff --git a/common-files/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/magma_fruit.png b/common-files/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/magma_fruit.png new file mode 100644 index 0000000000000000000000000000000000000000..957e006c69baf909655178f010d5a11374120074 GIT binary patch literal 513 zcmV+c0{;DpP)VT5Ly`7M#QiA|iFHvwuM6+Re$mvug`>5Y)|~ox~;0P>L~v z(13v|msW+sbI^-Pnlw~I1p7fCFS+;bd-v{rcffDsW@m!zc4*K5<4X~T?Hgb(E|GY| zw?=M(#u9T579)PnhleWw08`drbRMXrw%J%>?u$k7IXDGV)*SZ1=_E{9!+gHZ`Z6#& zA(*lTuIK;&DY=bo62w~^``3#A>eg6hcNF;+YA-Ak4HE!#W2*pw@>!XoANJxBHH&F# z7Skl0lc{w|rq-wz1d8zU19)6wp<)mX=)n*adb;()8Qhk7v7gCD^==VG)7up3d=00000NkvXXu0mjf Dy)Wf1 literal 0 HcmV?d00001 diff --git a/common-files/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/magma_fruit.png.mcmeta b/common-files/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/magma_fruit.png.mcmeta new file mode 100644 index 000000000..ceecb036f --- /dev/null +++ b/common-files/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/item/custom/magma_fruit.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 2 + } +} \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index b0243bdc8..0e2efe3d6 100644 --- a/gradle.properties +++ b/gradle.properties @@ -39,7 +39,7 @@ zstd_version=1.5.7-4 commons_io_version=2.20.0 commons_imaging_version=1.0.0-alpha6 commons_lang3_version=3.19.0 -sparrow_nbt_version=0.10.3 +sparrow_nbt_version=0.10.5 sparrow_util_version=0.52 fastutil_version=8.5.16 netty_version=4.1.127.Final