Skip to content

Commit c27f756

Browse files
henryyuyhyhenryyuyhy
committed
add seat entity option, add zh_tw translation, change an option name
1 parent f00300b commit c27f756

File tree

6 files changed

+105
-8
lines changed

6 files changed

+105
-8
lines changed

‎gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ org.gradle.jvmargs=-Xmx2G
33
# Mod Info
44
maven_group = com.yu
55
archives_base_name = prettyhitboxes_createaddition
6-
mod_version = 1.1.0
6+
mod_version = 1.1.1
77

88
minecraft_version = 1.20.1
99
yarn_mappings=1.20.1+build.10

‎src/main/java/com/yu/prettyhitboxes_createaddition/Config.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,10 @@ public class Config implements ConfigData {
4141
public boolean showThrowableItemHitboxes = true;
4242
@Category("Features")
4343
@Gui.Tooltip
44-
public boolean showCreateEntitiesHitboxes = true; //code added by yu
44+
public boolean showContraptionHitboxes = true; //code added by yu
45+
@Category("Features")
46+
@Gui.Tooltip
47+
public boolean showSeatHitboxes = true;
4548

4649

4750
@Category("Colors")

‎src/main/java/com/yu/prettyhitboxes_createaddition/mixin/EntityRenderDispatcherMixin.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.yu.prettyhitboxes_createaddition.mixin;
22

33
import com.simibubi.create.content.contraptions.AbstractContraptionEntity;
4+
import com.simibubi.create.content.contraptions.actors.seat.SeatEntity;
45
import com.yu.prettyhitboxes_createaddition.Config;
56

67
import me.shedaniel.autoconfig.AutoConfig;
@@ -79,7 +80,11 @@ private static void renderHitbox(MatrixStack matrices, VertexConsumer vertices,
7980
ci.cancel();
8081
return;
8182
}
82-
if (AbstractContraptionEntity.class.isAssignableFrom(entity.getClass()) && !config.showCreateEntitiesHitboxes) {
83+
if (AbstractContraptionEntity.class.isAssignableFrom(entity.getClass()) && !config.showContraptionHitboxes) {
84+
ci.cancel();
85+
return;
86+
}
87+
if (entity instanceof SeatEntity && !config.showSeatHitboxes) {
8388
ci.cancel();
8489
return;
8590
}

‎src/main/resources/assets/prettyhitboxes_createaddition/lang/en_us.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,10 @@
2424
"text.autoconfig.prettyhitboxes_createaddition.option.showBoatHitboxes.@Tooltip": "Shows or hides boat hitboxes",
2525
"text.autoconfig.prettyhitboxes_createaddition.option.showThrowableItemHitboxes": "Show Throwable Hitboxes",
2626
"text.autoconfig.prettyhitboxes_createaddition.option.showThrowableItemHitboxes.@Tooltip": "Shows or hides hitboxes for thrown items (pearls, eggs, snowballs)",
27-
"text.autoconfig.prettyhitboxes_createaddition.option.showCreateEntitiesHitboxes.@Tooltip": "Shows or hides hitboxes for Create mod entities(trains, windmills, etc.)",
28-
"text.autoconfig.prettyhitboxes_createaddition.option.showCreateEntitiesHitboxes": "Show hitboxes for Create mod entities",
27+
"text.autoconfig.prettyhitboxes_createaddition.option.showContraptionHitboxes": "Show hitboxes for contraptions",
28+
"text.autoconfig.prettyhitboxes_createaddition.option.showContraptionHitboxes.@Tooltip": "Shows or hides hitboxes of Create contraptions (trains, windmills, etc.)",
29+
"text.autoconfig.prettyhitboxes_createaddition.option.showSeatHitboxes": "Show hitboxes for seats",
30+
"text.autoconfig.prettyhitboxes_createaddition.option.showSeatHitboxes.@Tooltip": "For some reason an entity appears when you sit on a seat of Create mod",
2931
"text.autoconfig.prettyhitboxes_createaddition.option.boundingBoxColor": "Bounding Box Color",
3032
"text.autoconfig.prettyhitboxes_createaddition.option.boundingBoxColor.red": "Red",
3133
"text.autoconfig.prettyhitboxes_createaddition.option.boundingBoxColor.red.@Tooltip": "Red value of the color's RGB value. Should be a number between 0 and 255, inclusive. Smaller or large values will be clamped.",

‎src/main/resources/assets/prettyhitboxes_createaddition/lang/zh_cn.json

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,10 @@
2424
"text.autoconfig.prettyhitboxes_createaddition.option.showBoatHitboxes.@Tooltip": "是否显示船碰撞箱",
2525
"text.autoconfig.prettyhitboxes_createaddition.option.showThrowableItemHitboxes": "显示投掷物碰撞箱",
2626
"text.autoconfig.prettyhitboxes_createaddition.option.showThrowableItemHitboxes.@Tooltip": "是否显示投掷物碰撞箱（末影珍珠，鸡蛋，雪球等）",
27-
"text.autoconfig.prettyhitboxes_createaddition.option.showCreateEntitiesHitboxes.@Tooltip": "是否显示机械动力相关实体碰撞箱（列车，风车等）",
28-
"text.autoconfig.prettyhitboxes_createaddition.option.showCreateEntitiesHitboxes": "显示机械动力相关实体碰撞箱",
27+
"text.autoconfig.prettyhitboxes_createaddition.option.showContraptionHitboxes": "显示动态结构碰撞箱",
28+
"text.autoconfig.prettyhitboxes_createaddition.option.showContraptionHitboxes.@Tooltip": "是否显示机械动力动态结构碰撞箱（列车，风车等）",
29+
"text.autoconfig.prettyhitboxes_createaddition.option.showSeatHitboxes": "显示坐垫碰撞箱",
30+
"text.autoconfig.prettyhitboxes_createaddition.option.showSeatHitboxes.@Tooltip": "当你坐在坐垫上时，会在坐垫的位置生成一个实体",
2931
"text.autoconfig.prettyhitboxes_createaddition.option.boundingBoxColor": "碰撞箱颜色",
3032
"text.autoconfig.prettyhitboxes_createaddition.option.boundingBoxColor.red": "红",
3133
"text.autoconfig.prettyhitboxes_createaddition.option.boundingBoxColor.red.@Tooltip": "应在0至255之间，超出范围的值会被调整至范围内",
@@ -80,4 +82,4 @@
8082
"text.autoconfig.prettyhitboxes_createaddition.option.itemHitboxColor.blue.@Tooltip": "应在0至255之间，超出范围的值会被调整至范围内",
8183
"text.autoconfig.prettyhitboxes_createaddition.option.itemHitboxColor.alpha": "透明度",
8284
"text.autoconfig.prettyhitboxes_createaddition.option.itemHitboxColor.alpha.@Tooltip": "应在0至100之间，超出范围的值会被调整至范围内"
83-
}
85+
}

‎src/main/resources/assets/prettyhitboxes_createaddition/lang/zh_tw.json

Lines changed: 85 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,85 @@
1+
{
2+
"text.autoconfig.prettyhitboxes_createaddition.title": "可配置的碰撞箱显示-机械动力功能附加",
3+
"text.autoconfig.prettyhitboxes_createaddition.category.Features": "碰撞箱显示配置",
4+
"text.autoconfig.prettyhitboxes_createaddition.category.Colors": "碰撞箱颜色配置",
5+
"text.autoconfig.prettyhitboxes_createaddition.option.hitboxesEnabledByDefault": "默认打开碰撞箱",
6+
"text.autoconfig.prettyhitboxes_createaddition.option.hitboxesEnabledByDefault.@Tooltip": "游戏启动时将“显示碰撞箱”功能打开，免去手动操作的麻烦",
7+
"text.autoconfig.prettyhitboxes_createaddition.option.showBigDragonBox": "显示末影龙边界",
8+
"text.autoconfig.prettyhitboxes_createaddition.option.showBigDragonBox.@Tooltip": "注：那并不是它真正的碰撞箱",
9+
"text.autoconfig.prettyhitboxes_createaddition.option.showBoundingBox": "显示实体碰撞箱方框",
10+
"text.autoconfig.prettyhitboxes_createaddition.option.showBoundingBox.@Tooltip": "实体周围的那个白色方框",
11+
"text.autoconfig.prettyhitboxes_createaddition.option.showEyeHeight": "显示视线高度",
12+
"text.autoconfig.prettyhitboxes_createaddition.option.showEyeHeight.@Tooltip": "与眼睛共平面的红线",
13+
"text.autoconfig.prettyhitboxes_createaddition.option.showEntityRotationVector": "显示视线指向",
14+
"text.autoconfig.prettyhitboxes_createaddition.option.showEntityRotationVector.@Tooltip": "指示生物正在看的方向的蓝线",
15+
"text.autoconfig.prettyhitboxes_createaddition.option.differentColorWhenTargeted": "瞄准指示",
16+
"text.autoconfig.prettyhitboxes_createaddition.option.differentColorWhenTargeted.@Tooltip": "当你将准星对准实体且实体在攻击范围内时改变碰撞箱颜色",
17+
"text.autoconfig.prettyhitboxes_createaddition.option.showItemHitboxes": "显示物品实体碰撞箱",
18+
"text.autoconfig.prettyhitboxes_createaddition.option.showItemHitboxes.@Tooltip": "是否显示物品实体碰撞箱",
19+
"text.autoconfig.prettyhitboxes_createaddition.option.showItemFrameHitboxes": "显示物品展示框碰撞箱",
20+
"text.autoconfig.prettyhitboxes_createaddition.option.showItemFrameHitboxes.@Tooltip": "是否显示物品展示框碰撞箱",
21+
"text.autoconfig.prettyhitboxes_createaddition.option.showPaintingHitboxes": "显示画碰撞箱",
22+
"text.autoconfig.prettyhitboxes_createaddition.option.showPaintingHitboxes.@Tooltip": "是否显示画碰撞箱",
23+
"text.autoconfig.prettyhitboxes_createaddition.option.showBoatHitboxes": "显示船碰撞箱",
24+
"text.autoconfig.prettyhitboxes_createaddition.option.showBoatHitboxes.@Tooltip": "是否显示船碰撞箱",
25+
"text.autoconfig.prettyhitboxes_createaddition.option.showThrowableItemHitboxes": "显示投掷物碰撞箱",
26+
"text.autoconfig.prettyhitboxes_createaddition.option.showThrowableItemHitboxes.@Tooltip": "是否显示投掷物碰撞箱（末影珍珠，鸡蛋，雪球等）",
27+
"text.autoconfig.prettyhitboxes_createaddition.option.showContraptionHitboxes": "显示动态结构碰撞箱",
28+
"text.autoconfig.prettyhitboxes_createaddition.option.showContraptionHitboxes.@Tooltip": "是否显示机械动力动态结构碰撞箱（列车，风车等）",
29+
"text.autoconfig.prettyhitboxes_createaddition.option.showSeatHitboxes": "显示坐垫碰撞箱",
30+
"text.autoconfig.prettyhitboxes_createaddition.option.showSeatHitboxes.@Tooltip": "当你坐在坐垫上时，会在坐垫的位置生成一个实体",
31+
"text.autoconfig.prettyhitboxes_createaddition.option.boundingBoxColor": "碰撞箱颜色",
32+
"text.autoconfig.prettyhitboxes_createaddition.option.boundingBoxColor.red": "红",
33+
"text.autoconfig.prettyhitboxes_createaddition.option.boundingBoxColor.red.@Tooltip": "应在0至255之间，超出范围的值会被调整至范围内",
34+
"text.autoconfig.prettyhitboxes_createaddition.option.boundingBoxColor.green": "绿",
35+
"text.autoconfig.prettyhitboxes_createaddition.option.boundingBoxColor.green.@Tooltip": "应在0至255之间，超出范围的值会被调整至范围内",
36+
"text.autoconfig.prettyhitboxes_createaddition.option.boundingBoxColor.blue": "蓝",
37+
"text.autoconfig.prettyhitboxes_createaddition.option.boundingBoxColor.blue.@Tooltip": "应在0至255之间，超出范围的值会被调整至范围内",
38+
"text.autoconfig.prettyhitboxes_createaddition.option.boundingBoxColor.alpha": "透明度",
39+
"text.autoconfig.prettyhitboxes_createaddition.option.boundingBoxColor.alpha.@Tooltip": "应在0至100之间，超出范围的值会被调整至范围内",
40+
"text.autoconfig.prettyhitboxes_createaddition.option.dragonPartColor": "末影龙碰撞箱颜色",
41+
"text.autoconfig.prettyhitboxes_createaddition.option.dragonPartColor.red": "红",
42+
"text.autoconfig.prettyhitboxes_createaddition.option.dragonPartColor.red.@Tooltip": "应在0至255之间，超出范围的值会被调整至范围内",
43+
"text.autoconfig.prettyhitboxes_createaddition.option.dragonPartColor.green": "绿",
44+
"text.autoconfig.prettyhitboxes_createaddition.option.dragonPartColor.green.@Tooltip": "应在0至255之间，超出范围的值会被调整至范围内",
45+
"text.autoconfig.prettyhitboxes_createaddition.option.dragonPartColor.blue": "蓝",
46+
"text.autoconfig.prettyhitboxes_createaddition.option.dragonPartColor.blue.@Tooltip": "应在0至255之间，超出范围的值会被调整至范围内",
47+
"text.autoconfig.prettyhitboxes_createaddition.option.dragonPartColor.alpha": "透明度",
48+
"text.autoconfig.prettyhitboxes_createaddition.option.dragonPartColor.alpha.@Tooltip": "应在0至100之间，超出范围的值会被调整至范围内",
49+
"text.autoconfig.prettyhitboxes_createaddition.option.eyeHeightColor": "视线高度颜色",
50+
"text.autoconfig.prettyhitboxes_createaddition.option.eyeHeightColor.red": "红",
51+
"text.autoconfig.prettyhitboxes_createaddition.option.eyeHeightColor.red.@Tooltip": "应在0至255之间，超出范围的值会被调整至范围内",
52+
"text.autoconfig.prettyhitboxes_createaddition.option.eyeHeightColor.green": "绿",
53+
"text.autoconfig.prettyhitboxes_createaddition.option.eyeHeightColor.green.@Tooltip": "应在0至255之间，超出范围的值会被调整至范围内",
54+
"text.autoconfig.prettyhitboxes_createaddition.option.eyeHeightColor.blue": "蓝",
55+
"text.autoconfig.prettyhitboxes_createaddition.option.eyeHeightColor.blue.@Tooltip": "应在0至255之间，超出范围的值会被调整至范围内",
56+
"text.autoconfig.prettyhitboxes_createaddition.option.eyeHeightColor.alpha": "透明度",
57+
"text.autoconfig.prettyhitboxes_createaddition.option.eyeHeightColor.alpha.@Tooltip": "应在0至100之间，超出范围的值会被调整至范围内",
58+
"text.autoconfig.prettyhitboxes_createaddition.option.entityRotationVectorColor": "视线指向颜色",
59+
"text.autoconfig.prettyhitboxes_createaddition.option.entityRotationVectorColor.red": "红",
60+
"text.autoconfig.prettyhitboxes_createaddition.option.entityRotationVectorColor.red.@Tooltip": "应在0至255之间，超出范围的值会被调整至范围内",
61+
"text.autoconfig.prettyhitboxes_createaddition.option.entityRotationVectorColor.green": "绿",
62+
"text.autoconfig.prettyhitboxes_createaddition.option.entityRotationVectorColor.green.@Tooltip": "应在0至255之间，超出范围的值会被调整至范围内",
63+
"text.autoconfig.prettyhitboxes_createaddition.option.entityRotationVectorColor.blue": "蓝",
64+
"text.autoconfig.prettyhitboxes_createaddition.option.entityRotationVectorColor.blue.@Tooltip": "应在0至255之间，超出范围的值会被调整至范围内",
65+
"text.autoconfig.prettyhitboxes_createaddition.option.entityRotationVectorColor.alpha": "透明度",
66+
"text.autoconfig.prettyhitboxes_createaddition.option.entityRotationVectorColor.alpha.@Tooltip": "应在0至100之间，超出范围的值会被调整至范围内",
67+
"text.autoconfig.prettyhitboxes_createaddition.option.entityTargetedColor": "被瞄准时碰撞箱颜色",
68+
"text.autoconfig.prettyhitboxes_createaddition.option.entityTargetedColor.red": "红",
69+
"text.autoconfig.prettyhitboxes_createaddition.option.entityTargetedColor.red.@Tooltip": "应在0至255之间，超出范围的值会被调整至范围内",
70+
"text.autoconfig.prettyhitboxes_createaddition.option.entityTargetedColor.green": "绿",
71+
"text.autoconfig.prettyhitboxes_createaddition.option.entityTargetedColor.green.@Tooltip": "应在0至255之间，超出范围的值会被调整至范围内",
72+
"text.autoconfig.prettyhitboxes_createaddition.option.entityTargetedColor.blue": "蓝",
73+
"text.autoconfig.prettyhitboxes_createaddition.option.entityTargetedColor.blue.@Tooltip": "应在0至255之间，超出范围的值会被调整至范围内",
74+
"text.autoconfig.prettyhitboxes_createaddition.option.entityTargetedColor.alpha": "透明度",
75+
"text.autoconfig.prettyhitboxes_createaddition.option.entityTargetedColor.alpha.@Tooltip": "应在0至100之间，超出范围的值会被调整至范围内",
76+
"text.autoconfig.prettyhitboxes_createaddition.option.itemHitboxColor": "物品碰撞箱颜色",
77+
"text.autoconfig.prettyhitboxes_createaddition.option.itemHitboxColor.red": "红",
78+
"text.autoconfig.prettyhitboxes_createaddition.option.itemHitboxColor.red.@Tooltip": "应在0至255之间，超出范围的值会被调整至范围内",
79+
"text.autoconfig.prettyhitboxes_createaddition.option.itemHitboxColor.green": "绿",
80+
"text.autoconfig.prettyhitboxes_createaddition.option.itemHitboxColor.green.@Tooltip": "应在0至255之间，超出范围的值会被调整至范围内",
81+
"text.autoconfig.prettyhitboxes_createaddition.option.itemHitboxColor.blue": "蓝",
82+
"text.autoconfig.prettyhitboxes_createaddition.option.itemHitboxColor.blue.@Tooltip": "应在0至255之间，超出范围的值会被调整至范围内",
83+
"text.autoconfig.prettyhitboxes_createaddition.option.itemHitboxColor.alpha": "透明度",
84+
"text.autoconfig.prettyhitboxes_createaddition.option.itemHitboxColor.alpha.@Tooltip": "应在0至100之间，超出范围的值会被调整至范围内"
85+
}

0 commit comments

Comments
 (0)