From bacad56714ac6b62591ad3f0ee8ff72315b5b3a3 Mon Sep 17 00:00:00 2001 From: XiaoMoMi Date: Sat, 12 Apr 2025 20:52:30 +0800 Subject: [PATCH 1/3] Update ExplosionUtils.java --- .../net/momirealms/craftengine/bukkit/util/ExplosionUtils.java | 1 + 1 file changed, 1 insertion(+) diff --git a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/util/ExplosionUtils.java b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/util/ExplosionUtils.java index e3de0e969..3d8de7149 100644 --- a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/util/ExplosionUtils.java +++ b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/util/ExplosionUtils.java @@ -4,6 +4,7 @@ import org.bukkit.ExplosionResult; import org.bukkit.event.block.BlockExplodeEvent; import org.bukkit.event.entity.EntityExplodeEvent; +@SuppressWarnings("UnstableApiUsage") public class ExplosionUtils { public static boolean isDroppingItems(BlockExplodeEvent event) { From b5ca0383d8398ff2848f73aceaa60b01896462f0 Mon Sep 17 00:00:00 2001 From: XiaoMoMi Date: Sat, 12 Apr 2025 21:36:11 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=B7=BB=E5=8A=A0emoji=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/default/configuration/emoji.yml | 133 +++++++++++++++++- .../minecraft/textures/font/image/emojis.png | Bin 0 -> 1537 bytes .../core/pack/AbstractPackManager.java | 1 + gradle.properties | 2 +- 4 files changed, 132 insertions(+), 4 deletions(-) create mode 100644 bukkit/loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/font/image/emojis.png diff --git a/bukkit/loader/src/main/resources/resources/default/configuration/emoji.yml b/bukkit/loader/src/main/resources/resources/default/configuration/emoji.yml index 755db9585..a6e520f09 100644 --- a/bukkit/loader/src/main/resources/resources/default/configuration/emoji.yml +++ b/bukkit/loader/src/main/resources/resources/default/configuration/emoji.yml @@ -1,8 +1,8 @@ templates: default:emoji/basic: - content: "'>" + content: "'>" default:emoji/addition_info: - content: "'>{text}" + content: "'>{text}" emoji: default:emoji_location: @@ -23,4 +23,131 @@ emoji: image: "default:icons:0:1" permission: emoji.time keywords: - - ":time:" \ No newline at end of file + - ":time:" + + default:emoji_smiley: + template: "default:emoji/basic" + overrides: + image: "default:emojis:0:0" + permission: emoji.smile + keywords: + - ":)" + - ":smiley:" + - ":smile:" + default:emoji_angry: + template: "default:emoji/basic" + overrides: + image: "default:emojis:0:1" + permission: emoji.angry + keywords: + - ":angry:" + default:emoji_grin: + template: "default:emoji/basic" + overrides: + image: "default:emojis:0:2" + permission: emoji.grin + keywords: + - ":grin:" + default:emoji_sob: + template: "default:emoji/basic" + overrides: + image: "default:emojis:0:3" + permission: emoji.sob + keywords: + - ":sob:" + default:emoji_sweat_smile: + template: "default:emoji/basic" + overrides: + image: "default:emojis:1:0" + permission: emoji.sweat_smile + keywords: + - ":sweat_smile:" + default:emoji_blush: + template: "default:emoji/basic" + overrides: + image: "default:emojis:1:1" + permission: emoji.blush + keywords: + - ":blush:" + default:emoji_joy: + template: "default:emoji/basic" + overrides: + image: "default:emojis:1:2" + permission: emoji.joy + keywords: + - ":joy:" + default:emoji_slight_frown: + template: "default:emoji/basic" + overrides: + image: "default:emojis:1:3" + permission: emoji.slight_frown + keywords: + - ":slight_frown:" + default:emoji_unamused: + template: "default:emoji/basic" + overrides: + image: "default:emojis:2:0" + permission: emoji.unamused + keywords: + - ":unamused:" + default:emoji_laughing: + template: "default:emoji/basic" + overrides: + image: "default:emojis:2:1" + permission: emoji.laughing + keywords: + - ":laughing:" + default:emoji_sunglasses: + template: "default:emoji/basic" + overrides: + image: "default:emojis:2:2" + permission: emoji.sunglasses + keywords: + - ":sunglasses:" + default:emoji_innocent: + template: "default:emoji/basic" + overrides: + image: "default:emojis:2:3" + permission: emoji.innocent + keywords: + - ":innocent:" + default:emoji_face_vomiting: + template: "default:emoji/basic" + overrides: + image: "default:emojis:3:0" + permission: emoji.face_vomiting + keywords: + - ":face_vomiting:" + default:emoji_rolling_eyes: + template: "default:emoji/basic" + overrides: + image: "default:emojis:3:1" + permission: emoji.rolling_eyes + keywords: + - ":rolling_eyes:" + default:emoji_yum: + template: "default:emoji/basic" + overrides: + image: "default:emojis:3:2" + permission: emoji.yum + keywords: + - ":yum:" + default:emoji_confounded: + template: "default:emoji/basic" + overrides: + image: "default:emojis:3:2" + permission: emoji.confounded + keywords: + - ":confounded:" + +images: + default:emojis: + height: 10 + ascent: 8 + font: minecraft:emoji + file: minecraft:font/image/emojis.png + chars: + - '\ub000\ub001\ub002\ub003' + - '\ub004\ub005\ub006\ub007' + - '\ub008\ub009\ub00a\ub00b' + - '\ub00c\ub00d\ub00e\ub00f' \ No newline at end of file diff --git a/bukkit/loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/font/image/emojis.png b/bukkit/loader/src/main/resources/resources/default/resourcepack/assets/minecraft/textures/font/image/emojis.png new file mode 100644 index 0000000000000000000000000000000000000000..59efa8e7851ffef869db90e1b1ea9c9327cdb25c GIT binary patch literal 1537 zcmV+c2LAbpP)Px)yGcYrRCt{2TTe(FR~Y|o5*8G-E4C~4plC%26f4E)rjkQ@Fcmyhs2HRT*hALK zKpQFakW&eP9;`idDeU&pfI<&7U@3xW4{brVTBX5c&HK&wy*F=W-}ifOfDpk(gfG-|^_gBs#oStivL8nNF`j(?t1bXQ zw5^dOmhw9QfcO|pF^I#;KO$CAk=>5%B|ka1CE1gMTl?bw2vs54l(GfEm)#u1`d1L^ zUy+V6yBnYR;r;VAFMRgl`RpU|r4axCYSvaiv)FFg#nEN!0Ctb?Wy+?)UhrAqnZLm!!H< z2LOORVIY;JY~BI@APqG?TmZPVx?n4Nxee!*3)TqWJCgT3w_LDsY#mVCG*HtKLnNrDIZqz4)j6iN8fiBY+QrI_8GrChg3v@q6WeZn=Or>+M&a z{T8o2Aaua>&;I}bJlA%IJo%q_HqnZb$DcI++()kg0B*OD6GfcMmyciJ_<^4ahX@fO z*a-YX(6=6N=3xp~lBW(#K3^^0mmYBDVG027M&>(ZZ$A}!fGPk0wroq~K-2{I@_y?9 zfImG$8UaoLu*N%eLacuUMmAx~{aKk3N+?vS2Qc{2Ge|u^6~Ol=hcUNYz}cRD@b89c|-CD<|8^24Pm>k@~#{FFcc*5p(I;MnO5<1R0ZfG8;gr*}#y7Y2A~k7{dce);b*r8VGxa)j(0YJM)S%#1 zk0A8`C<0)0L=7CGC~Z{{z?0T(^s z)VITEJAa?N1uM}bNIgImfLlI(^yPUJH(_-mb?)bf4PaG$j>oM>DD{93U$j@e{n?!Z zuLo4Z5ByX(M2HZO@!RiO}F*EC&91j>N6j0ILxjXzp4EFXalJ2*34pV zEn@2cw!Y86GCRtq3Xsjgsbq++0p5F0@q+iU*5?GHFCdP3l*!XZM02sQ%$5DdH?aNyn-h>zuz%j;sg?Bqk_tNcrP zKqdJ+&yO~hH&KjhL$=iT|EaOA~m=~zv z<$VITI&3e37{9n@fkE0Iz&BQ0pHB{Md46A@w5?nG(zZ_4QSn&}d Date: Sat, 12 Apr 2025 21:49:17 +0800 Subject: [PATCH 3/3] Update emoji.yml --- .../main/resources/resources/default/configuration/emoji.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bukkit/loader/src/main/resources/resources/default/configuration/emoji.yml b/bukkit/loader/src/main/resources/resources/default/configuration/emoji.yml index a6e520f09..996057731 100644 --- a/bukkit/loader/src/main/resources/resources/default/configuration/emoji.yml +++ b/bukkit/loader/src/main/resources/resources/default/configuration/emoji.yml @@ -142,8 +142,8 @@ emoji: images: default:emojis: - height: 10 - ascent: 8 + height: 11 + ascent: 9 font: minecraft:emoji file: minecraft:font/image/emojis.png chars: