diff --git a/backend/src/main/java/net/momirealms/customnameplates/backend/feature/nameplate/NameplateManagerImpl.java b/backend/src/main/java/net/momirealms/customnameplates/backend/feature/nameplate/NameplateManagerImpl.java index 392532f..367d17e 100644 --- a/backend/src/main/java/net/momirealms/customnameplates/backend/feature/nameplate/NameplateManagerImpl.java +++ b/backend/src/main/java/net/momirealms/customnameplates/backend/feature/nameplate/NameplateManagerImpl.java @@ -138,7 +138,7 @@ public class NameplateManagerImpl implements NameplateManager { } private void saveDefaultNameplates() { - String[] png_list = new String[]{"cat", "egg", "cheems", "wither", "xmas", "halloween", "hutao", "starsky", "trident", "rabbit"}; + String[] png_list = new String[]{"egg", "xmas", "halloween", "hutao", "starsky", "trident", "rabbit", "sign", "game", "enter", "panda", "angel", "banner"}; String[] part_list = new String[]{"_left.png", "_middle.png", "_right.png", ".yml"}; for (String name : png_list) { for (String part : part_list) { diff --git a/backend/src/main/resources/configs/custom-placeholders.yml b/backend/src/main/resources/configs/custom-placeholders.yml index 9fb0c9b..6edc8e7 100644 --- a/backend/src/main/resources/configs/custom-placeholders.yml +++ b/backend/src/main/resources/configs/custom-placeholders.yml @@ -131,30 +131,31 @@ switch-text: switch: "%np_equipped_nameplate%" default: "" case: - 'wither': "" 'halloween': "" 'hutao': "" 'rabbit': "" 'starsky': "" 'trident': "" - 'cheems': "" 'egg': "" - 'cat': "" - 'xmas': "" + 'xmas': "" + 'angel': "<#8B4513>" + 'sign': "" + 'banner': "" + 'enter': "" nameplate_color_suffix: switch: "%np_equipped_nameplate%" default: "" case: - 'wither': "" 'halloween': "" 'hutao': "" 'rabbit': "" 'starsky': "" 'trident': "" - 'cheems': "" 'egg': "" - 'cat': "" - 'xmas': "" + 'xmas': "" + 'angel': "" + 'sign': "" + 'enter': "" world: switch: '%player_world%' case: diff --git a/backend/src/main/resources/contents/nameplates/angel.yml b/backend/src/main/resources/contents/nameplates/angel.yml new file mode 100644 index 0000000..a56ed8f --- /dev/null +++ b/backend/src/main/resources/contents/nameplates/angel.yml @@ -0,0 +1,13 @@ +display-name: Angel +left: + image: angel_left + height: 16 + ascent: 14 +middle: + image: angel_middle + height: 16 + ascent: 14 +right: + image: angel_right + height: 16 + ascent: 14 \ No newline at end of file diff --git a/backend/src/main/resources/contents/nameplates/angel_left.png b/backend/src/main/resources/contents/nameplates/angel_left.png new file mode 100644 index 0000000..fff2959 Binary files /dev/null and b/backend/src/main/resources/contents/nameplates/angel_left.png differ diff --git a/backend/src/main/resources/contents/nameplates/angel_middle.png b/backend/src/main/resources/contents/nameplates/angel_middle.png new file mode 100644 index 0000000..54eabe0 Binary files /dev/null and b/backend/src/main/resources/contents/nameplates/angel_middle.png differ diff --git a/backend/src/main/resources/contents/nameplates/angel_right.png b/backend/src/main/resources/contents/nameplates/angel_right.png new file mode 100644 index 0000000..0249c37 Binary files /dev/null and b/backend/src/main/resources/contents/nameplates/angel_right.png differ diff --git a/backend/src/main/resources/contents/nameplates/banner.yml b/backend/src/main/resources/contents/nameplates/banner.yml new file mode 100644 index 0000000..6aa72dd --- /dev/null +++ b/backend/src/main/resources/contents/nameplates/banner.yml @@ -0,0 +1,13 @@ +display-name: Banner +left: + image: banner_left + height: 16 + ascent: 13 +middle: + image: banner_middle + height: 16 + ascent: 13 +right: + image: banner_right + height: 16 + ascent: 13 \ No newline at end of file diff --git a/backend/src/main/resources/contents/nameplates/banner_left.png b/backend/src/main/resources/contents/nameplates/banner_left.png new file mode 100644 index 0000000..58b2150 Binary files /dev/null and b/backend/src/main/resources/contents/nameplates/banner_left.png differ diff --git a/backend/src/main/resources/contents/nameplates/banner_middle.png b/backend/src/main/resources/contents/nameplates/banner_middle.png new file mode 100644 index 0000000..81feb04 Binary files /dev/null and b/backend/src/main/resources/contents/nameplates/banner_middle.png differ diff --git a/backend/src/main/resources/contents/nameplates/banner_right.png b/backend/src/main/resources/contents/nameplates/banner_right.png new file mode 100644 index 0000000..c2d7bae Binary files /dev/null and b/backend/src/main/resources/contents/nameplates/banner_right.png differ diff --git a/backend/src/main/resources/contents/nameplates/cat_left.png b/backend/src/main/resources/contents/nameplates/cat_left.png deleted file mode 100644 index 45275b7..0000000 Binary files a/backend/src/main/resources/contents/nameplates/cat_left.png and /dev/null differ diff --git a/backend/src/main/resources/contents/nameplates/cat_middle.png b/backend/src/main/resources/contents/nameplates/cat_middle.png deleted file mode 100644 index f54fbeb..0000000 Binary files a/backend/src/main/resources/contents/nameplates/cat_middle.png and /dev/null differ diff --git a/backend/src/main/resources/contents/nameplates/cat_right.png b/backend/src/main/resources/contents/nameplates/cat_right.png deleted file mode 100644 index 4a3bbc4..0000000 Binary files a/backend/src/main/resources/contents/nameplates/cat_right.png and /dev/null differ diff --git a/backend/src/main/resources/contents/nameplates/cheems_left.png b/backend/src/main/resources/contents/nameplates/cheems_left.png deleted file mode 100644 index a65b876..0000000 Binary files a/backend/src/main/resources/contents/nameplates/cheems_left.png and /dev/null differ diff --git a/backend/src/main/resources/contents/nameplates/cat.yml b/backend/src/main/resources/contents/nameplates/enter.yml similarity index 54% rename from backend/src/main/resources/contents/nameplates/cat.yml rename to backend/src/main/resources/contents/nameplates/enter.yml index 14c3d0a..29450e2 100644 --- a/backend/src/main/resources/contents/nameplates/cat.yml +++ b/backend/src/main/resources/contents/nameplates/enter.yml @@ -1,13 +1,13 @@ -display-name: Sad Cat +display-name: Enter left: - image: cat_left + image: enter_left height: 16 ascent: 12 middle: - image: cat_middle + image: enter_middle height: 16 ascent: 12 right: - image: cat_right + image: enter_right height: 16 ascent: 12 \ No newline at end of file diff --git a/backend/src/main/resources/contents/nameplates/enter_left.png b/backend/src/main/resources/contents/nameplates/enter_left.png new file mode 100644 index 0000000..5a50261 Binary files /dev/null and b/backend/src/main/resources/contents/nameplates/enter_left.png differ diff --git a/backend/src/main/resources/contents/nameplates/enter_middle.png b/backend/src/main/resources/contents/nameplates/enter_middle.png new file mode 100644 index 0000000..35db360 Binary files /dev/null and b/backend/src/main/resources/contents/nameplates/enter_middle.png differ diff --git a/backend/src/main/resources/contents/nameplates/enter_right.png b/backend/src/main/resources/contents/nameplates/enter_right.png new file mode 100644 index 0000000..60c96ce Binary files /dev/null and b/backend/src/main/resources/contents/nameplates/enter_right.png differ diff --git a/backend/src/main/resources/contents/nameplates/cheems.yml b/backend/src/main/resources/contents/nameplates/game.yml similarity index 50% rename from backend/src/main/resources/contents/nameplates/cheems.yml rename to backend/src/main/resources/contents/nameplates/game.yml index 5e15c40..ebc684e 100644 --- a/backend/src/main/resources/contents/nameplates/cheems.yml +++ b/backend/src/main/resources/contents/nameplates/game.yml @@ -1,13 +1,13 @@ -display-name: Thank you, Cheems +display-name: Video Game Console left: - image: cheems_left + image: game_left height: 16 ascent: 12 middle: - image: cheems_middle + image: game_middle height: 16 ascent: 12 right: - image: cheems_right + image: game_right height: 16 ascent: 12 \ No newline at end of file diff --git a/backend/src/main/resources/contents/nameplates/game_left.png b/backend/src/main/resources/contents/nameplates/game_left.png new file mode 100644 index 0000000..08a62e4 Binary files /dev/null and b/backend/src/main/resources/contents/nameplates/game_left.png differ diff --git a/backend/src/main/resources/contents/nameplates/game_middle.png b/backend/src/main/resources/contents/nameplates/game_middle.png new file mode 100644 index 0000000..d49d40b Binary files /dev/null and b/backend/src/main/resources/contents/nameplates/game_middle.png differ diff --git a/backend/src/main/resources/contents/nameplates/game_right.png b/backend/src/main/resources/contents/nameplates/game_right.png new file mode 100644 index 0000000..1962846 Binary files /dev/null and b/backend/src/main/resources/contents/nameplates/game_right.png differ diff --git a/backend/src/main/resources/contents/nameplates/wither.yml b/backend/src/main/resources/contents/nameplates/panda.yml similarity index 51% rename from backend/src/main/resources/contents/nameplates/wither.yml rename to backend/src/main/resources/contents/nameplates/panda.yml index 3d001ac..02bcbba 100644 --- a/backend/src/main/resources/contents/nameplates/wither.yml +++ b/backend/src/main/resources/contents/nameplates/panda.yml @@ -1,13 +1,13 @@ -display-name: Wither Rose +display-name: Panda left: - image: wither_left + image: panda_left height: 16 ascent: 12 middle: - image: wither_middle + image: panda_middle height: 16 ascent: 12 right: - image: wither_right + image: panda_right height: 16 ascent: 12 \ No newline at end of file diff --git a/backend/src/main/resources/contents/nameplates/cheems_middle.png b/backend/src/main/resources/contents/nameplates/panda_left.png similarity index 64% rename from backend/src/main/resources/contents/nameplates/cheems_middle.png rename to backend/src/main/resources/contents/nameplates/panda_left.png index 81a8ce4..681f519 100644 Binary files a/backend/src/main/resources/contents/nameplates/cheems_middle.png and b/backend/src/main/resources/contents/nameplates/panda_left.png differ diff --git a/backend/src/main/resources/contents/nameplates/cheems_right.png b/backend/src/main/resources/contents/nameplates/panda_middle.png similarity index 62% rename from backend/src/main/resources/contents/nameplates/cheems_right.png rename to backend/src/main/resources/contents/nameplates/panda_middle.png index 4044aac..57c7677 100644 Binary files a/backend/src/main/resources/contents/nameplates/cheems_right.png and b/backend/src/main/resources/contents/nameplates/panda_middle.png differ diff --git a/backend/src/main/resources/contents/nameplates/wither_middle.png b/backend/src/main/resources/contents/nameplates/panda_right.png similarity index 65% rename from backend/src/main/resources/contents/nameplates/wither_middle.png rename to backend/src/main/resources/contents/nameplates/panda_right.png index 058230b..46a4524 100644 Binary files a/backend/src/main/resources/contents/nameplates/wither_middle.png and b/backend/src/main/resources/contents/nameplates/panda_right.png differ diff --git a/backend/src/main/resources/contents/nameplates/sign.yml b/backend/src/main/resources/contents/nameplates/sign.yml new file mode 100644 index 0000000..57a2083 --- /dev/null +++ b/backend/src/main/resources/contents/nameplates/sign.yml @@ -0,0 +1,13 @@ +display-name: Oak Sign +left: + image: sign_left + height: 16 + ascent: 14 +middle: + image: sign_middle + height: 16 + ascent: 14 +right: + image: sign_right + height: 16 + ascent: 14 \ No newline at end of file diff --git a/backend/src/main/resources/contents/nameplates/sign_left.png b/backend/src/main/resources/contents/nameplates/sign_left.png new file mode 100644 index 0000000..b907739 Binary files /dev/null and b/backend/src/main/resources/contents/nameplates/sign_left.png differ diff --git a/backend/src/main/resources/contents/nameplates/sign_middle.png b/backend/src/main/resources/contents/nameplates/sign_middle.png new file mode 100644 index 0000000..579144c Binary files /dev/null and b/backend/src/main/resources/contents/nameplates/sign_middle.png differ diff --git a/backend/src/main/resources/contents/nameplates/sign_right.png b/backend/src/main/resources/contents/nameplates/sign_right.png new file mode 100644 index 0000000..c879e43 Binary files /dev/null and b/backend/src/main/resources/contents/nameplates/sign_right.png differ diff --git a/backend/src/main/resources/contents/nameplates/wither_left.png b/backend/src/main/resources/contents/nameplates/wither_left.png deleted file mode 100644 index 4fc4e15..0000000 Binary files a/backend/src/main/resources/contents/nameplates/wither_left.png and /dev/null differ diff --git a/backend/src/main/resources/contents/nameplates/wither_right.png b/backend/src/main/resources/contents/nameplates/wither_right.png deleted file mode 100644 index d78f9cd..0000000 Binary files a/backend/src/main/resources/contents/nameplates/wither_right.png and /dev/null differ diff --git a/compatibility/src/main/java/net/momirealms/customnameplates/bukkit/compatibility/NameplatesExtraExpansion.java b/compatibility/src/main/java/net/momirealms/customnameplates/bukkit/compatibility/NameplatesExtraExpansion.java index 30e31ed..949ea38 100644 --- a/compatibility/src/main/java/net/momirealms/customnameplates/bukkit/compatibility/NameplatesExtraExpansion.java +++ b/compatibility/src/main/java/net/momirealms/customnameplates/bukkit/compatibility/NameplatesExtraExpansion.java @@ -19,6 +19,7 @@ package net.momirealms.customnameplates.bukkit.compatibility; import me.clip.placeholderapi.PlaceholderAPI; import me.clip.placeholderapi.expansion.PlaceholderExpansion; +import net.kyori.adventure.text.Component; import net.momirealms.customnameplates.api.CustomNameplates; import net.momirealms.customnameplates.api.CustomNameplatesAPI; import net.momirealms.customnameplates.api.feature.OffsetFont; @@ -235,6 +236,9 @@ public class NameplatesExtraExpansion extends PlaceholderExpansion { String minuteStr = (minutes < 10) ? "0" + minutes : String.valueOf(minutes); return hours + ":" + minuteStr; } + case "newline" -> { + return "\n"; + } } return null; } diff --git a/gradle.properties b/gradle.properties index d332dc1..300f989 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ # Project settings # Rule: [major update].[feature update].[bug fix] -project_version=3.0.10.2 +project_version=3.0.11 config_version=32 project_group=net.momirealms