v1.7.0-release

jonagamerpro1234 · Oct 7, 2021 · 07fa541 · 07fa541
1 parent 1f0e10d
commit 07fa541
Show file tree

Hide file tree

Showing 6 changed files with 210 additions and 107 deletions.
diff --git a/CustomJoinAndQuitMessages/config.yml b/CustomJoinAndQuitMessages/config.yml
@@ -26,7 +26,7 @@ Config:
   Debug: false
 
   # |Type| the type is a way of knowing what is being used whether in the [normal] | [group] | [default] | [none] format
-  Type: normal
+  Type: group
 
 #
 # | Join |
@@ -39,7 +39,7 @@ Join:
   Text: '&b[<#83FF6F>+&b] <#A157FF><name>'
 
   # |Type| Here you can find two types that are [ normal | modify ]
-  Type: normal
+  Type: modify
 
   # |HoverEvent| This section allows you to modify the hover events in the chat
   HoverEvent:
@@ -91,7 +91,7 @@ Join:
     Pitch: 1
 
     # |Volume| This is the volume of the sound that you will hear when the chat mentions it
-    Volume: 10
+    Volume: 20
 
   # |Title| In this section you can configure the title of the join
   Title:
@@ -100,7 +100,7 @@ Join:
     Enabled: true
 
     # |Title| here you can set the title text
-    Title: '<RAINBOW:1>Welcome to Server'
+    Title: '<RAINBOW:1>Welcome to Server</RAINBOW>'
 
     # |SubTitle| here you can set the subtitle text
     SubTitle: '<GRADIENT:FF0000><name></GRADIENT:00AAFF>'
@@ -130,7 +130,7 @@ Quit:
   Enabled: true
 
   # |Text| This is where Join customizable message is located
-  Text: '&b[<#83FF6F>+&b] <#A157FF><name>'
+  Text: '&b[<#FF8E8E>+&b] <#A157FF><name>'
 
   # |Type| Here you can find two types that are [ normal | modify ]
   Type: normal
@@ -186,22 +186,23 @@ Quit:
 
     # |Volume| This is the volume of the sound that you will hear when the chat mentions it
     Volume: 10
-
+#
+# |Welcome|    
 Welcome:
 
   # |Enabled| Here you can enable or disable this feature
   Enabled: true
 
   # |Text|
   Text:
-    - '&b&m=========================================&r'
+    - '<GRADIENT:8200FC>&m=========================================</GRADIENT:00FC95>&r'
     - '<0>'
     - '&e> &7Welcome To The Server &b<name>'
     - '<0>'
     - '&e> &cShop: shop-example.com'
     - '&e> &7Use &b/skin to put on a skin'
     - '<0>'
-    - '&b&m=========================================&r'
+    - '<GRADIENT:8200FC>&m=========================================</GRADIENT:00FC95>&r'
 #  
 # |Groups|
 # currently only join and quit functions are available for the group system
@@ -210,13 +211,16 @@ Groups:
   Default:
 
     # |Join-Text| This is where Join customizable message is located
-    Join-Text: ''
+    Join-Text: '&b[<#83FF6F>+&b] <#A157FF><name>'
 
     # |Quit-Text| This is where Quit customizable message is located
-    Quit-Text: ''
+    Quit-Text: '&b[<#FF8E8E>+&b] <#A157FF><name>'
+
+    # |Permission| Here the group permission is defined so that the player can use it
+    Permission: 'my.group.default'
 
     # |Type| Here you can find two types that are [ normal | modify ]
-    Type: normal
+    Type: modify
 
     # |HoverEvent| This section allows you to modify the hover events in the chat
     HoverEvent:
@@ -277,7 +281,102 @@ Groups:
       Enabled: true
 
       # |Title| here you can set the title text
-      Title: '<RAINBOW:1>Welcome to Server'
+      Title: '<RAINBOW:1>Welcome to Server</RAINBOW>'
+
+      # |SubTitle| here you can set the subtitle text
+      SubTitle: '<GRADIENT:FF0000><name></GRADIENT:00AAFF>'
+
+      # |FadeIn| here you can set the input time of the title
+      FadeIn: 20
+
+      # |Stay| here you can set how long the title stays
+      Stay: 40
+
+      # |FadeOut| here you can set the title output time
+      FadeOut: 20
+
+    # |ActionBar| In this section you can configure the Actionbar of the join
+    ActionBar:
+
+      # |Enabled| Here you can enable or disable this feature
+      Enabled: true
+
+      # |Text|
+      Text: '<GRADIENT:FF8700>Welcome to the server</GRADIENT:00FFAA>'
+  Admin:
+
+    # |Join-Text| This is where Join customizable message is located
+    Join-Text: '&b[<#83FF6F>+&b] <#A157FF><name>'
+
+    # |Quit-Text| This is where Quit customizable message is located
+    Quit-Text: '&b[<#FF8E8E>+&b] <#A157FF><name>'
+
+    # |Permission| Here the group permission is defined so that the player can use it
+    Permission: 'my.group.admin'
+
+    # |Type| Here you can find two types that are [ normal | modify ]
+    Type: normal
+
+    # |HoverEvent| This section allows you to modify the hover events in the chat
+    HoverEvent:
+
+      # |Enabled| Here you can enable or disable this feature
+      Enabled: true
+
+      # |Hover| This section allows you to define the hover text
+      Hover:
+        - '&6> &aHello &b<name> [Admin0]'
+        - '&6> &e%player_exp_to_level%'
+        - '&6> &dadd more lines like these'
+
+    # |ClickEvent| This section allows you to modify chat click events
+    ClickEvent:
+
+      # |Enabled| Here you can enable or disable this feature
+      Enabled: true
+
+      # |Mode| there are three different modes which are [ command | suggest | url ]
+      Mode: command
+
+      # |Actions| This is where are the available events that you can use
+      Actions:
+
+        # |Command| Clicking on the chat will execute the command defined in the config
+        Command: '/say <name> hello server'
+
+        # |Url| Clicking on the chat opens a link
+        Url: 'https://www.spigotmc.org/resources/custom-join-and-quit-message-1-7-x-1-17-x.57006/'
+
+        # |Suggest-Command| Clicking on the chat suggests a command that you define in the config
+        Suggest-Command: '/msg <name>'
+
+    # |Sound| In this section you can configure the sound of the join
+    # |Sound list: https://www.spigotmc.org/wiki/cc-sounds-list/ 
+    Sound:
+
+      # |Enabled| Here you can enable or disable this feature
+      Enabled: true
+
+      # |Send-To-All| When active, the sound will be sent to all players connected to the server
+      Send-To-All: true
+
+      # |Name| This is the name of the sound you will hear when it is mentioned to you in chat.
+      Name: 'BLOCK_NOTE_BLOCK_PLING'
+
+      # |Pitch| This is the pitch of the sound that you will hear when mentioned in the chat
+      Pitch: 1
+
+      # |Volume| This is the volume of the sound that you will hear when the chat mentions it
+      Volume: 10
+
+    # |Title| In this section you can configure the title of the join
+    Title:
+
+      # |Enabled| Here you can enable or disable this feature
+      Enabled: true
+
+      # |Title| here you can set the title text
+      Title: '<RAINBOW:1>Welcome to Server</RAINBOW>'
 
       # |SubTitle| here you can set the subtitle text
       SubTitle: '<GRADIENT:FF0000><name></GRADIENT:00AAFF>'
@@ -299,6 +398,7 @@ Groups:
 
       # |Text|
       Text: '<GRADIENT:FF8700>Welcome to the server</GRADIENT:00FFAA>'
+
 #
 # |> This is the end of the configuration ... [-_-] more things coming soon
 # 

diff --git a/CustomJoinAndQuitMessages/src/com/iridium/iridiumcolorapi/patterns/SolidPattern.java b/CustomJoinAndQuitMessages/src/com/iridium/iridiumcolorapi/patterns/SolidPattern.java
@@ -7,7 +7,7 @@
 
 public class SolidPattern implements IPattern {
 
-    Pattern pattern = Pattern.compile("<#([0-9A-Fa-f]{6})>");
+    Pattern pattern = Pattern.compile("<SOLID:([0-9A-Fa-f]{6})>");
 
     public String process(String string) {
         Matcher matcher = pattern.matcher(string);

diff --git a/...mJoinAndQuitMessages/src/jss/customjoinandquitmessages/commands/CustomJoinAndQuitCmd.java b/...mJoinAndQuitMessages/src/jss/customjoinandquitmessages/commands/CustomJoinAndQuitCmd.java
@@ -38,7 +38,7 @@ public boolean onCommand(CommandSender sender, Command cmd, String label, String
 				}else if(args[0].equalsIgnoreCase("reload")) {
 					plugin.getPreConfigLoader().loadConfig();
 					plugin.getPreConfigLoader().loadLangs();
-					plugin.reloadConfig();
+					plugin.getConfigFile().reloadConfig();
 					Utils.sendColorMessage(EventsUtils.getConsoleSender(), Utils.getPrefix() + " " + plugin.Locale().reload);
 				}else if(args[0].equalsIgnoreCase("info")) {
 					Utils.sendColorMessage(EventsUtils.getConsoleSender(), "&5 <||=-=-=-=-="+Utils.getPrefix()+"&5=-=-=-=-=-=-");
@@ -75,7 +75,7 @@ public boolean onCommand(CommandSender sender, Command cmd, String label, String
 				if((j.isOp()) || (j.hasPermission("Cjm.Reload"))) {
 					plugin.getPreConfigLoader().loadConfig();
 					plugin.getPreConfigLoader().loadLangs();
-					plugin.reloadConfig();
+					plugin.getConfigFile().reloadConfig();
 					Utils.sendColorMessage(j, Utils.getPrefixPlayer() + " " + plugin.Locale().reload);
 				}else {
 					Utils.sendTextComponent116Hover(j, "TEXT", plugin.Locale().No_Permission, plugin.Locale().No_Permission_Label);