Merge remote-tracking branch 'origin/upsteam-dev' into dev

# Conflicts:
#	gradle.properties

bukkit/loader/src/main/resources/resources/default/configuration/emoji.yml

@@ -1,8 +1,8 @@
 templates:
   default:emoji/basic:
-    content: "<hover:show_text:'<i18n:emoji.tip>'><white><arg:emoji></white></hover>"
+    content: "<hover:show_text:'<i18n:emoji.tip>'><!shadow><white><arg:emoji></white></!shadow></hover>"
   default:emoji/addition_info:
-    content: "<hover:show_text:'<i18n:emoji.tip>'>{text}<white><arg:emoji></white></hover>"
+    content: "<hover:show_text:'<i18n:emoji.tip>'><!shadow><white><arg:emoji></white></!shadow>{text}</hover>"
 
 emoji:
   default:emoji_location:
@@ -23,4 +23,131 @@ emoji:
       image: "default:icons:0:1"
       permission: emoji.time
       keywords:
-        - ":time:"
+        - ":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: 11
+    ascent: 9
+    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'

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) {

core/src/main/java/net/momirealms/craftengine/core/pack/AbstractPackManager.java

@@ -302,6 +302,7 @@ public abstract class AbstractPackManager implements PackManager {
         plugin.saveResource("resources/default/configuration/templates.yml");
         // emoji
         plugin.saveResource("resources/default/configuration/emoji.yml");
+        plugin.saveResource("resources/default/resourcepack/assets/minecraft/textures/font/image/emojis.png");
         // i18n
         plugin.saveResource("resources/default/configuration/i18n.yml");
         // block_name

gradle.properties

@@ -2,7 +2,7 @@ org.gradle.jvmargs=-Xmx1G
 
 # Project settings
 # Rule: [major update].[feature update].[bug fix]
-project_version=0.0.48
+project_version=1.0.0
 config_version=25
 lang_version=4
 project_group=net.momirealms