From 34eea10754f9f890a723111782ef37f09b1f1876 Mon Sep 17 00:00:00 2001 From: C-H716 <1536152356@qq.com> Date: Wed, 22 Oct 2025 23:07:26 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E8=B0=83=E6=95=B4=E5=AE=9E=E4=BD=93?= =?UTF-8?q?=E5=8A=A0=E9=80=9F=E5=99=A8=E6=A8=A1=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ae/parts/EntitySpeedTickerPart.java | 6 +- .../models/item/entity_speed_ticker.json | 192 +++++++++++++++++- .../models/part/entity_speed_ticker_part.json | 186 ++++++++++++++++- .../textures/part/monitor_sides_status.png | Bin 0 -> 261 bytes 4 files changed, 369 insertions(+), 15 deletions(-) create mode 100644 src/main/resources/assets/extendedae_plus/textures/part/monitor_sides_status.png diff --git a/src/main/java/com/extendedae_plus/ae/parts/EntitySpeedTickerPart.java b/src/main/java/com/extendedae_plus/ae/parts/EntitySpeedTickerPart.java index 1867e6a..b48008d 100644 --- a/src/main/java/com/extendedae_plus/ae/parts/EntitySpeedTickerPart.java +++ b/src/main/java/com/extendedae_plus/ae/parts/EntitySpeedTickerPart.java @@ -26,9 +26,9 @@ import com.extendedae_plus.ae.menu.EntitySpeedTickerMenu; import com.extendedae_plus.config.ModConfig; import com.extendedae_plus.init.ModItems; import com.extendedae_plus.init.ModMenuTypes; +import com.extendedae_plus.util.Logger; import com.extendedae_plus.util.entitySpeed.ConfigParsingUtils; import com.extendedae_plus.util.entitySpeed.PowerUtils; -import com.extendedae_plus.util.Logger; import net.minecraft.core.BlockPos; import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; @@ -194,8 +194,8 @@ public class EntitySpeedTickerPart extends UpgradeablePart implements IGridTicka */ @Override public void getBoxes(IPartCollisionHelper bch) { - bch.addBox(2, 2, 14, 14, 14, 16); - bch.addBox(5, 5, 12, 11, 11, 14); + bch.addBox(3, 3, 14, 13, 13, 16); + bch.addBox(5, 5, 11, 11, 11, 14); } /** diff --git a/src/main/resources/assets/extendedae_plus/models/item/entity_speed_ticker.json b/src/main/resources/assets/extendedae_plus/models/item/entity_speed_ticker.json index 51789c2..2f2e74c 100644 --- a/src/main/resources/assets/extendedae_plus/models/item/entity_speed_ticker.json +++ b/src/main/resources/assets/extendedae_plus/models/item/entity_speed_ticker.json @@ -1,7 +1,189 @@ { - "parent": "ae2:item/cable_interface", - "textures": { - "front": "extendedae_plus:part/entity_speed_ticker_font", - "back": "extendedae_plus:part/entity_speed_ticker_back" - } + "parent": "ae2:item/cable_interface", + "textures": { + "sides": "extendedae_plus:part/entity_speed_ticker_sides", + "front": "extendedae_plus:part/entity_speed_ticker_font", + "back": "extendedae_plus:part/entity_speed_ticker_back", + "particle": "extendedae_plus:part/monitor_sides_status" + }, + "elements": [ + { + "from": [4, 4, 7], + "to": [12, 12, 9], + "rotation": {"angle": 0, "axis": "y", "origin": [0, 0, 7]}, + "faces": { + "north": {"uv": [3, 3, 13, 13], "texture": "#front"}, + "south": {"uv": [3, 3, 13, 13], "texture": "#back"} + } + }, + { + "from": [5, 5, 10], + "to": [11, 11, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [0, 0, 7]}, + "faces": { + "east": {"uv": [12, 5, 13, 11], "texture": "#sides"}, + "south": {"uv": [5, 5, 11, 11], "texture": "#back"}, + "west": {"uv": [3, 5, 4, 11], "texture": "#sides"}, + "up": {"uv": [5, 3, 11, 4], "texture": "#sides"}, + "down": {"uv": [5, 12, 11, 13], "texture": "#sides"} + } + }, + { + "from": [5, 5, 9], + "to": [11, 11, 10], + "rotation": {"angle": 0, "axis": "y", "origin": [0, 0, 7]}, + "faces": { + "east": {"uv": [13, 5, 14, 11], "texture": "#particle"}, + "south": {"uv": [11, 5, 5, 11], "texture": "#back"}, + "west": {"uv": [2, 5, 3, 11], "texture": "#particle"}, + "up": {"uv": [5, 2, 11, 3], "texture": "#particle"}, + "down": {"uv": [5, 13, 11, 14], "texture": "#particle"} + } + }, + { + "from": [5, 5, 11], + "to": [6, 7, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [0, 0, 7]}, + "faces": { + "east": {"uv": [1, 5, 2, 7], "texture": "#particle"}, + "south": {"uv": [1, 5, 2, 7], "texture": "#particle"}, + "west": {"uv": [1, 5, 2, 7], "texture": "#particle"}, + "up": {"uv": [1, 5, 2, 6], "texture": "#particle"}, + "down": {"uv": [1, 5, 2, 6], "texture": "#particle"} + } + }, + { + "from": [6, 10, 11], + "to": [7, 11, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [0, 0, 7]}, + "faces": { + "east": {"uv": [1, 5, 2, 6], "texture": "#particle"}, + "south": {"uv": [1, 5, 2, 6], "texture": "#particle"}, + "up": {"uv": [1, 5, 2, 6], "texture": "#particle"}, + "down": {"uv": [1, 5, 2, 6], "texture": "#particle"} + } + }, + { + "from": [9, 5, 11], + "to": [10, 6, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [0, 0, 7]}, + "faces": { + "south": {"uv": [14, 9, 15, 10], "texture": "#particle"}, + "west": {"uv": [14, 9, 15, 10], "texture": "#particle"}, + "up": {"uv": [14, 9, 15, 10], "texture": "#particle"}, + "down": {"uv": [14, 10, 15, 11], "texture": "#particle"} + } + }, + { + "from": [10, 5, 11], + "to": [11, 7, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [0, 0, 7]}, + "faces": { + "east": {"uv": [14, 9, 15, 11], "texture": "#particle"}, + "south": {"uv": [14, 9, 15, 11], "texture": "#particle"}, + "west": {"uv": [14, 9, 15, 11], "texture": "#particle"}, + "up": {"uv": [14, 5, 15, 6], "texture": "#particle"}, + "down": {"uv": [14, 6, 15, 7], "texture": "#particle"} + } + }, + { + "from": [10, 9, 11], + "to": [11, 11, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [0, 0, 7]}, + "faces": { + "east": {"uv": [14, 5, 15, 7], "texture": "#particle"}, + "south": {"uv": [14, 5, 15, 7], "texture": "#particle"}, + "west": {"uv": [14, 5, 15, 7], "texture": "#particle"}, + "up": {"uv": [14, 5, 15, 6], "texture": "#particle"}, + "down": {"uv": [14, 6, 15, 7], "texture": "#particle"} + } + }, + { + "from": [9, 10, 11], + "to": [10, 11, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [0, 0, 7]}, + "faces": { + "south": {"uv": [14, 5, 15, 6], "texture": "#particle"}, + "west": {"uv": [14, 5, 15, 6], "texture": "#particle"}, + "up": {"uv": [14, 5, 15, 6], "texture": "#particle"}, + "down": {"uv": [14, 6, 15, 7], "texture": "#particle"} + } + }, + { + "from": [5, 9, 11], + "to": [6, 11, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [0, 0, 7]}, + "faces": { + "east": {"uv": [1, 5, 2, 7], "texture": "#particle"}, + "south": {"uv": [1, 5, 2, 7], "texture": "#particle"}, + "west": {"uv": [1, 5, 2, 7], "texture": "#particle"}, + "up": {"uv": [1, 5, 2, 6], "texture": "#particle"}, + "down": {"uv": [1, 5, 2, 6], "texture": "#particle"} + } + }, + { + "from": [6, 5, 11], + "to": [7, 6, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [0, 0, 7]}, + "faces": { + "east": {"uv": [1, 5, 2, 6], "texture": "#particle"}, + "south": {"uv": [1, 5, 2, 6], "texture": "#particle"}, + "up": {"uv": [1, 5, 2, 6], "texture": "#particle"}, + "down": {"uv": [1, 5, 2, 6], "texture": "#particle"} + } + }, + { + "from": [3, 4, 7], + "to": [4, 12, 9], + "rotation": {"angle": 0, "axis": "y", "origin": [0, 0, 7]}, + "faces": { + "north": {"uv": [2, 4, 3, 12], "texture": "#front"}, + "south": {"uv": [2, 4, 3, 12], "texture": "#back"}, + "west": {"uv": [0, 4, 2, 12], "texture": "#sides"}, + "up": {"uv": [2, 0, 3, 2], "texture": "#sides"}, + "down": {"uv": [13, 14, 14, 16], "texture": "#sides"} + } + }, + { + "from": [4, 12, 7], + "to": [12, 13, 9], + "rotation": {"angle": 0, "axis": "y", "origin": [0, 0, 7]}, + "faces": { + "north": {"uv": [4, 2, 12, 3], "texture": "#front"}, + "east": {"uv": [14, 2, 16, 3], "texture": "#sides"}, + "south": {"uv": [4, 2, 12, 3], "texture": "#back"}, + "west": {"uv": [0, 2, 2, 3], "texture": "#sides"}, + "up": {"uv": [4, 0, 12, 2], "texture": "#sides"} + } + }, + { + "from": [4, 3, 7], + "to": [12, 4, 9], + "rotation": {"angle": 0, "axis": "y", "origin": [0, 0, 7]}, + "faces": { + "north": {"uv": [4, 13, 12, 14], "texture": "#front"}, + "east": {"uv": [14, 2, 16, 3], "texture": "#sides"}, + "south": {"uv": [4, 13, 12, 14], "texture": "#back"}, + "west": {"uv": [0, 13, 2, 14], "texture": "#sides"}, + "down": {"uv": [4, 14, 12, 16], "texture": "#sides"} + } + }, + { + "from": [12, 4, 7], + "to": [13, 12, 9], + "rotation": {"angle": 0, "axis": "y", "origin": [0, 0, 7]}, + "faces": { + "north": {"uv": [13, 4, 14, 12], "texture": "#front"}, + "east": {"uv": [14, 4, 16, 12], "texture": "#sides"}, + "south": {"uv": [13, 4, 14, 12], "texture": "#back"}, + "up": {"uv": [2, 0, 3, 2], "texture": "#sides"}, + "down": {"uv": [2, 14, 3, 16], "texture": "#sides"} + } + } + ], + "display": { + "thirdperson_righthand": { + "scale": [2, 2, 2] + } + } } \ No newline at end of file diff --git a/src/main/resources/assets/extendedae_plus/models/part/entity_speed_ticker_part.json b/src/main/resources/assets/extendedae_plus/models/part/entity_speed_ticker_part.json index df7a2d4..72bb202 100644 --- a/src/main/resources/assets/extendedae_plus/models/part/entity_speed_ticker_part.json +++ b/src/main/resources/assets/extendedae_plus/models/part/entity_speed_ticker_part.json @@ -1,9 +1,181 @@ { - "parent": "ae2:part/interface_base", - "textures": { - "front": "extendedae_plus:part/entity_speed_ticker_font", - "sides": "extendedae_plus:part/entity_speed_ticker_sides", - "back": "extendedae_plus:part/entity_speed_ticker_back", - "particle": "extendedae_plus:part/entity_speed_ticker_back" - } + "parent": "ae2:item/cable_interface", + "textures": { + "sides": "extendedae_plus:part/entity_speed_ticker_sides", + "front": "extendedae_plus:part/entity_speed_ticker_font", + "back": "extendedae_plus:part/entity_speed_ticker_back", + "particle": "extendedae_plus:part/monitor_sides_status" + }, + "elements": [ + { + "from": [4, 4, 0], + "to": [12, 12, 2], + "faces": { + "north": {"uv": [3, 3, 13, 13], "texture": "#front"}, + "south": {"uv": [3, 3, 13, 13], "texture": "#back"} + } + }, + { + "from": [5, 5, 3], + "to": [11, 11, 4], + "faces": { + "east": {"uv": [12, 5, 13, 11], "texture": "#sides"}, + "south": {"uv": [5, 5, 11, 11], "texture": "#back"}, + "west": {"uv": [3, 5, 4, 11], "texture": "#sides"}, + "up": {"uv": [5, 3, 11, 4], "texture": "#sides"}, + "down": {"uv": [5, 12, 11, 13], "texture": "#sides"} + } + }, + { + "from": [5, 5, 2], + "to": [11, 11, 3], + "faces": { + "east": {"uv": [13, 5, 14, 11], "texture": "#particle"}, + "south": {"uv": [11, 5, 5, 11], "texture": "#back"}, + "west": {"uv": [2, 5, 3, 11], "texture": "#particle"}, + "up": {"uv": [5, 2, 11, 3], "texture": "#particle"}, + "down": {"uv": [5, 13, 11, 14], "texture": "#particle"} + } + }, + { + "from": [5, 5, 4], + "to": [6, 7, 5], + "rotation": {"angle": 0, "axis": "y", "origin": [4, 5, 3]}, + "faces": { + "east": {"uv": [1, 5, 2, 7], "texture": "#particle"}, + "south": {"uv": [1, 5, 2, 7], "texture": "#particle"}, + "west": {"uv": [1, 5, 2, 7], "texture": "#particle"}, + "up": {"uv": [1, 5, 2, 6], "texture": "#particle"}, + "down": {"uv": [1, 5, 2, 6], "texture": "#particle"} + } + }, + { + "from": [6, 10, 4], + "to": [7, 11, 5], + "rotation": {"angle": 0, "axis": "y", "origin": [6, 10, 3]}, + "faces": { + "east": {"uv": [1, 5, 2, 6], "texture": "#particle"}, + "south": {"uv": [1, 5, 2, 6], "texture": "#particle"}, + "up": {"uv": [1, 5, 2, 6], "texture": "#particle"}, + "down": {"uv": [1, 5, 2, 6], "texture": "#particle"} + } + }, + { + "from": [9, 5, 4], + "to": [10, 6, 5], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 5, 3]}, + "faces": { + "south": {"uv": [14, 9, 15, 10], "texture": "#particle"}, + "west": {"uv": [14, 9, 15, 10], "texture": "#particle"}, + "up": {"uv": [14, 9, 15, 10], "texture": "#particle"}, + "down": {"uv": [14, 10, 15, 11], "texture": "#particle"} + } + }, + { + "from": [10, 5, 4], + "to": [11, 7, 5], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 5, 3]}, + "faces": { + "east": {"uv": [14, 9, 15, 11], "texture": "#particle"}, + "south": {"uv": [14, 9, 15, 11], "texture": "#particle"}, + "west": {"uv": [14, 9, 15, 11], "texture": "#particle"}, + "up": {"uv": [14, 5, 15, 6], "texture": "#particle"}, + "down": {"uv": [14, 6, 15, 7], "texture": "#particle"} + } + }, + { + "from": [10, 9, 4], + "to": [11, 11, 5], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 9, 3]}, + "faces": { + "east": {"uv": [14, 5, 15, 7], "texture": "#particle"}, + "south": {"uv": [14, 5, 15, 7], "texture": "#particle"}, + "west": {"uv": [14, 5, 15, 7], "texture": "#particle"}, + "up": {"uv": [14, 5, 15, 6], "texture": "#particle"}, + "down": {"uv": [14, 6, 15, 7], "texture": "#particle"} + } + }, + { + "from": [9, 10, 4], + "to": [10, 11, 5], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 10, 3]}, + "faces": { + "south": {"uv": [14, 5, 15, 6], "texture": "#particle"}, + "west": {"uv": [14, 5, 15, 6], "texture": "#particle"}, + "up": {"uv": [14, 5, 15, 6], "texture": "#particle"}, + "down": {"uv": [14, 6, 15, 7], "texture": "#particle"} + } + }, + { + "from": [5, 9, 4], + "to": [6, 11, 5], + "rotation": {"angle": 0, "axis": "y", "origin": [4, 9, 3]}, + "faces": { + "east": {"uv": [1, 5, 2, 7], "texture": "#particle"}, + "south": {"uv": [1, 5, 2, 7], "texture": "#particle"}, + "west": {"uv": [1, 5, 2, 7], "texture": "#particle"}, + "up": {"uv": [1, 5, 2, 6], "texture": "#particle"}, + "down": {"uv": [1, 5, 2, 6], "texture": "#particle"} + } + }, + { + "from": [6, 5, 4], + "to": [7, 6, 5], + "rotation": {"angle": 0, "axis": "y", "origin": [6, 5, 3]}, + "faces": { + "east": {"uv": [1, 5, 2, 6], "texture": "#particle"}, + "south": {"uv": [1, 5, 2, 6], "texture": "#particle"}, + "up": {"uv": [1, 5, 2, 6], "texture": "#particle"}, + "down": {"uv": [1, 5, 2, 6], "texture": "#particle"} + } + }, + { + "from": [3, 4, 0], + "to": [4, 12, 2], + "rotation": {"angle": 0, "axis": "y", "origin": [2, 5, 0]}, + "faces": { + "north": {"uv": [2, 4, 3, 12], "texture": "#front"}, + "south": {"uv": [2, 4, 3, 12], "texture": "#back"}, + "west": {"uv": [0, 4, 2, 12], "texture": "#sides"}, + "up": {"uv": [2, 0, 3, 2], "texture": "#sides"}, + "down": {"uv": [13, 14, 14, 16], "texture": "#sides"} + } + }, + { + "from": [4, 12, 0], + "to": [12, 13, 2], + "rotation": {"angle": 0, "axis": "y", "origin": [4, 12, 0]}, + "faces": { + "north": {"uv": [4, 2, 12, 3], "texture": "#front"}, + "east": {"uv": [14, 2, 16, 3], "texture": "#sides"}, + "south": {"uv": [4, 2, 12, 3], "texture": "#back"}, + "west": {"uv": [0, 2, 2, 3], "texture": "#sides"}, + "up": {"uv": [4, 0, 12, 2], "texture": "#sides"} + } + }, + { + "from": [4, 3, 0], + "to": [12, 4, 2], + "rotation": {"angle": 0, "axis": "y", "origin": [4, 2, 0]}, + "faces": { + "north": {"uv": [4, 13, 12, 14], "texture": "#front"}, + "east": {"uv": [14, 2, 16, 3], "texture": "#sides"}, + "south": {"uv": [4, 13, 12, 14], "texture": "#back"}, + "west": {"uv": [0, 13, 2, 14], "texture": "#sides"}, + "down": {"uv": [4, 14, 12, 16], "texture": "#sides"} + } + }, + { + "from": [12, 4, 0], + "to": [13, 12, 2], + "rotation": {"angle": 0, "axis": "y", "origin": [12, 4, 0]}, + "faces": { + "north": {"uv": [13, 4, 14, 12], "texture": "#front"}, + "east": {"uv": [14, 4, 16, 12], "texture": "#sides"}, + "south": {"uv": [13, 4, 14, 12], "texture": "#back"}, + "up": {"uv": [2, 0, 3, 2], "texture": "#sides"}, + "down": {"uv": [2, 14, 3, 16], "texture": "#sides"} + } + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/extendedae_plus/textures/part/monitor_sides_status.png b/src/main/resources/assets/extendedae_plus/textures/part/monitor_sides_status.png new file mode 100644 index 0000000000000000000000000000000000000000..142f38511c2f61f1c9ec3acfbebd6bf52ec420f1 GIT binary patch literal 261 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6-E$sR$z z3=CCj3=9n|3=F@3LJcn%7)lKo7+xhXFj&oCU=S~uvn$XBD8X6a5n0T@z_$#98Qbry z%m)femAFQf1m~xflqVLYG6W=M=9TFAxrQi|8S9zq85+8Ob}|R53iWhx46*RPdS;{G z0Rs-_K(}PZZ3|M_&BEU}&D9Vx?|UDYTzG$%^yIHO!P0ZtS8)lmU2zj0KWubJpVf>@xgS)7+U46*K1mEnx6;^>bP0l+XkKpixU1 literal 0 HcmV?d00001