9
0
mirror of https://github.com/Xiao-MoMi/craft-engine.git synced 2025-12-25 09:59:20 +00:00
Commit Graph

540 Commits

Author SHA1 Message Date
XiaoMoMi
034182fb61 改进伤害免疫 2025-06-12 16:20:16 +08:00
jhqwqmc
79c12f793b Merge branch 'Xiao-MoMi:dev' into dev 2025-06-12 05:38:23 +08:00
XiaoMoMi
963e8e2c22 客户端侧material 2025-06-12 05:35:07 +08:00
jhqwqmc
59087369c8 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	bukkit/src/main/java/net/momirealms/craftengine/bukkit/item/listener/ItemEventListener.java
#	core/src/main/java/net/momirealms/craftengine/core/item/ItemSettings.java
#	gradle.properties
2025-06-12 05:23:18 +08:00
jhqwqmc
536fccb08c feat(item): 添加物品invulnerable设置
- 物品: hhh我无敌了
2025-06-12 05:22:12 +08:00
XiaoMoMi
f9adaeff00 完美点火 2025-06-12 02:32:23 +08:00
XiaoMoMi
a56d94a803 初步打火石音效补全 2025-06-12 02:09:06 +08:00
XiaoMoMi
2187362984 添加配方物品返还 2025-06-11 21:31:33 +08:00
XiaoMoMi
2c06db83af 添加简易的迁移指令 2025-06-11 20:28:09 +08:00
XiaoMoMi
6adf7de9a4 模板重构 2025-06-11 19:02:48 +08:00
XiaoMoMi
65852ee0a2 回退家具注入修改 2025-06-11 04:04:31 +08:00
XiaoMoMi
899a42026c fix interacting decorated pot 2025-06-11 02:19:13 +08:00
XiaoMoMi
51bb540857 应当忽略#开头的材质 2025-06-11 02:10:17 +08:00
XiaoMoMi
5e56ad3db1 添加深度合并map的选项 2025-06-10 21:15:17 +08:00
XiaoMoMi
3a06814a68 添加基础验证器 2025-06-10 05:32:36 +08:00
XiaoMoMi
614f482a1e 资源包验证一阶段 2025-06-10 04:04:33 +08:00
XiaoMoMi
6a71ef957d 添加冲突键警告 2025-06-09 21:31:20 +08:00
XiaoMoMi
a48164fca3 修复参数转义 2025-06-09 20:22:55 +08:00
XiaoMoMi
43b2cd3093 优化落地弹射物 2025-06-09 19:31:58 +08:00
XiaoMoMi
7f35c9cdfc Update AbstractItemManager.java 2025-06-09 19:07:25 +08:00
XiaoMoMi
ca021229a6 参数默认值 2025-06-09 04:25:50 +08:00
jhqwqmc
82018259fc Merge remote-tracking branch 'upstream/dev' into dev
# Conflicts:
#	bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/network/PacketConsumers.java
#	gradle.properties
2025-06-09 00:30:37 +08:00
XiaoMoMi
b362dc03d3 修复1.20-1.20.6碰撞 2025-06-08 22:36:56 +08:00
XiaoMoMi
959515d023 food和返还物品 2025-06-08 19:54:25 +08:00
XiaoMoMi
a5d6ce8107 添加dyed-color 2025-06-08 19:33:57 +08:00
jhqwqmc
4f9dc2aa7b Merge remote-tracking branch 'upstream/dev' into dev
# Conflicts:
#	bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/reflection/minecraft/NetworkReflections.java
2025-06-08 13:55:15 +08:00
XiaoMoMi
b2c76d9ff0 过时方块破坏修复 2025-06-08 04:58:11 +08:00
XiaoMoMi
2a0618122a 综合优化 2025-06-08 04:40:59 +08:00
jhqwqmc
0d39388022 Merge remote-tracking branch 'upstream/dev' into dev 2025-06-08 00:34:54 +08:00
XiaoMoMi
26edc960a2 优化熔炉性能,保证线程安全 2025-06-07 19:49:47 +08:00
XiaoMoMi
b0e1305427 新增动态lore 2025-06-07 16:11:37 +08:00
jhqwqmc
665924d1b1 perf(entity): 优化投射物发包过多 2025-06-07 15:39:34 +08:00
jhqwqmc
ed86e76ec2 Merge branch 'Xiao-MoMi:dev' into dev 2025-06-07 09:28:06 +08:00
XiaoMoMi
c5d471ca0a config还是太慢了 2025-06-07 05:10:51 +08:00
XiaoMoMi
8189760a3e translation还是太慢了 2025-06-07 04:40:04 +08:00
XiaoMoMi
9ff52ed15e 改进模板系统 2025-06-07 03:33:43 +08:00
jhqwqmc
95e0674af5 refactor(bukkit): 优化反射代码 2025-06-05 22:49:08 +08:00
jhqwqmc
d83b39d886 Merge remote-tracking branch 'origin/dev' into dev 2025-06-05 22:37:30 +08:00
jhqwqmc
8d6f8d6d66 refactor(core): 优化反射工具类异常处理 2025-06-05 22:36:52 +08:00
jhqwqmc
c932d5bf3b Merge branch 'Xiao-MoMi:dev' into dev 2025-06-05 22:34:19 +08:00
XiaoMoMi
04b1f7873d 修复难绷的bug 2025-06-05 22:28:34 +08:00
XiaoMoMi
cb7548a193 难绷 2025-06-05 22:16:15 +08:00
XiaoMoMi
fb49db6547 重构前最终的准备 2025-06-05 21:48:31 +08:00
XiaoMoMi
755be24182 改善模板性能 2025-06-05 21:19:43 +08:00
jhqwqmc
3d64db54be perf(entity): 优化反射操作 2025-06-05 21:06:43 +08:00
XiaoMoMi
3352b2d26e 修复一些bug 2025-06-05 20:22:03 +08:00
XiaoMoMi
ff59cd9db9 强化模板参数替换 2025-06-05 19:46:24 +08:00
XiaoMoMi
54c29cff46 应用merges 2025-06-05 16:03:54 +08:00
XiaoMoMi
818b61e92e 多重合并模板 2025-06-05 15:56:15 +08:00
XiaoMoMi
182b5c93d3 深度list值合并 2025-06-05 14:48:09 +08:00