Skip to content

Commit

Permalink
Update 1.2.21, Support 1.21
Browse files Browse the repository at this point in the history
  • Loading branch information
Happyuky7 committed Jul 29, 2024
1 parent fee136a commit be760e4
Show file tree
Hide file tree
Showing 18 changed files with 85 additions and 82 deletions.
12 changes: 6 additions & 6 deletions Code/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<groupId>com.github.happyrogelio7</groupId>
<groupId>com.github.happyuky7</groupId>
<artifactId>SepareWorldItems</artifactId>
<version>1.2.20</version>
<version>1.2.21</version>
<packaging>jar</packaging>

<name>SepareWorldItems</name>
Expand All @@ -16,7 +16,7 @@
<java.version>1.8</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<url>https://github.com/HappyRogelio7</url>
<url>https://github.com/Happyuky7</url>

<repositories>
<repository>
Expand All @@ -33,16 +33,16 @@
<dependency>
<groupId>org.spigotmc</groupId>
<artifactId>spigot-api</artifactId>
<version>1.20-R0.1-SNAPSHOT</version>
<version>1.21-R0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>

<distributionManagement>
<repository>
<id>github</id>
<name>GitHub OWNER Apache Maven Packages</name>
<url>https://maven.pkg.github.com/HappyRogelio7/SEPARE-WORLD-ITEMS</url>
<name>Happyuky7</name>
<url>https://maven.pkg.github.com/Happyuky7/SEPARE-WORLD-ITEMS</url>
</repository>
</distributionManagement>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
package com.github.happyrogelio7.separeworlditems;
package com.github.happyuky7.separeworlditems;

/*
* Code by: HappyRogelio7
* Github: https://github.com/happyrogelio7
* Code by: Happyuky7
* Github: https://github.com/Happyuky7
* License: Custom
* Link: https://github.com/HappyRogelio7/SEPARE-WORLD-ITEMS
* Link: https://github.com/Happyuky7/SEPARE-WORLD-ITEMS
*/

import com.github.happyrogelio7.separeworlditems.commands.SepareWorldItemsCMD;
import com.github.happyrogelio7.separeworlditems.filemanagers.FileManager;
import com.github.happyrogelio7.separeworlditems.listeners.WorldChangeEvent;
import com.github.happyrogelio7.separeworlditems.utils.MessageColors;
import com.github.happyuky7.separeworlditems.commands.SepareWorldItemsCMD;
import com.github.happyuky7.separeworlditems.filemanagers.FileManager;
import com.github.happyuky7.separeworlditems.listeners.WorldChangeEvent;
import com.github.happyuky7.separeworlditems.utils.MessageColors;
import org.bukkit.Bukkit;
import org.bukkit.event.Listener;
import org.bukkit.plugin.Plugin;
Expand Down Expand Up @@ -58,12 +58,12 @@ public void onEnable() {
Bukkit.getConsoleSender().sendMessage(MessageColors.getMsgColor("&a On SepareWorldItems &b"+version));
Bukkit.getConsoleSender().sendMessage(MessageColors.getMsgColor("&r "));
Bukkit.getConsoleSender().sendMessage(MessageColors.getMsgColor("&a Thanks for using SepareWorldItems :D"));
Bukkit.getConsoleSender().sendMessage(MessageColors.getMsgColor("&2 Created By: HappyRogelio7"));
Bukkit.getConsoleSender().sendMessage(MessageColors.getMsgColor("&2 Created By: Happyuky7"));
Bukkit.getConsoleSender().sendMessage(MessageColors.getMsgColor("&r "));
Bukkit.getConsoleSender().sendMessage(MessageColors.getMsgColor("&a Version Server:&f "+Bukkit.getVersion()));
Bukkit.getConsoleSender().sendMessage(MessageColors.getMsgColor("&r "));
Bukkit.getConsoleSender().sendMessage(MessageColors.getMsgColor("&9&l Discord: &fhttps://discord.gg/3EebYUyeUX"));
Bukkit.getConsoleSender().sendMessage(MessageColors.getMsgColor("&d&l GitHub: &fhttps://github.com/HappyRogelio7/SEPARE-WORLD-ITEMS"));
Bukkit.getConsoleSender().sendMessage(MessageColors.getMsgColor("&d&l GitHub: &fhttps://github.com/Happyuky7/SEPARE-WORLD-ITEMS"));
Bukkit.getConsoleSender().sendMessage(MessageColors.getMsgColor("&7&m------------------------------------"));

Bukkit.getConsoleSender().sendMessage(MessageColors.getMsgColor("&r "));
Expand Down Expand Up @@ -102,7 +102,7 @@ public void onEnable() {
Bukkit.getConsoleSender().sendMessage(MessageColors.getMsgColor("&3&m------------------------------------"));

// Verify config version.
if (!getConfig().getString("general.config").equals("1.2.20")) {
if (!getConfig().getString("general.config").equals("1.2.21")) {
Bukkit.getConsoleSender().sendMessage(MessageColors.getMsgColor("&3&m------------------------------------"));
Bukkit.getConsoleSender().sendMessage(MessageColors.getMsgColor("&f [Error]: &cConfig Version ERROR."));
getLogger().log(Level.SEVERE, "[Error]: Config Version ERROR.");
Expand All @@ -120,12 +120,12 @@ public void onDisable() {
Bukkit.getConsoleSender().sendMessage(MessageColors.getMsgColor("&c OFF SepareWorldItems &b"+version));
Bukkit.getConsoleSender().sendMessage(MessageColors.getMsgColor("&r "));
Bukkit.getConsoleSender().sendMessage(MessageColors.getMsgColor("&a Thanks for using SepareWorldItems :D"));
Bukkit.getConsoleSender().sendMessage(MessageColors.getMsgColor("&2 Created By: HappyRogelio7"));
Bukkit.getConsoleSender().sendMessage(MessageColors.getMsgColor("&2 Created By: Happyuky7"));
Bukkit.getConsoleSender().sendMessage(MessageColors.getMsgColor("&r "));
Bukkit.getConsoleSender().sendMessage(MessageColors.getMsgColor("&a Version Server:&f "+Bukkit.getVersion()));
Bukkit.getConsoleSender().sendMessage(MessageColors.getMsgColor("&r "));
Bukkit.getConsoleSender().sendMessage(MessageColors.getMsgColor("&9&l Discord: &fhttps://discord.gg/3EebYUyeUX"));
Bukkit.getConsoleSender().sendMessage(MessageColors.getMsgColor("&d&l GitHub: &fhttps://github.com/HappyRogelio7/SEPARE-WORLD-ITEMS"));
Bukkit.getConsoleSender().sendMessage(MessageColors.getMsgColor("&d&l GitHub: &fhttps://github.com/Happyuky7/SEPARE-WORLD-ITEMS"));
Bukkit.getConsoleSender().sendMessage(MessageColors.getMsgColor("&7&m------------------------------------"));
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
package com.github.happyrogelio7.separeworlditems.commands;
package com.github.happyuky7.separeworlditems.commands;

/*
* Code by: HappyRogelio7
* Github: https://github.com/happyrogelio7
* Code by: Happyuky7
* Github: https://github.com/Happyuky7
* License: Custom
* Link: https://github.com/HappyRogelio7/SEPARE-WORLD-ITEMS
* Link: https://github.com/Happyuky7/SEPARE-WORLD-ITEMS
*/

import com.github.happyrogelio7.separeworlditems.SepareWorldItems;
import com.github.happyrogelio7.separeworlditems.managers.MessageManager;
import com.github.happyrogelio7.separeworlditems.utils.MessageColors;
import com.github.happyuky7.separeworlditems.SepareWorldItems;
import com.github.happyuky7.separeworlditems.managers.MessageManager;
import com.github.happyuky7.separeworlditems.utils.MessageColors;
import org.bukkit.command.Command;
import org.bukkit.command.CommandExecutor;
import org.bukkit.command.CommandSender;
Expand Down Expand Up @@ -68,8 +68,8 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
p.sendMessage(MessageColors.getMsgColor("&r "));
p.sendMessage(MessageColors.getMsgColor("&f * &9version: &f" + plugin.version));
p.sendMessage(MessageColors.getMsgColor("&f * &aCreated: &fHappyRogelio7"));
p.sendMessage(MessageColors.getMsgColor("&f * &dGitHub: &fhttps://github.com/HappyRogelio7"));
p.sendMessage(MessageColors.getMsgColor("&f * &6Website: &fhttps://happyrogelio7.github.io/index.html"));
p.sendMessage(MessageColors.getMsgColor("&f * &dGitHub: &fhttps://github.com/Happyuky7"));
p.sendMessage(MessageColors.getMsgColor("&f * &6Website: &fhttps://happyuky7.github.io/"));
p.sendMessage(MessageColors.getMsgColor("&r "));
return true;

Expand All @@ -83,7 +83,7 @@ public boolean onCommand(CommandSender sender, Command command, String label, St

//API link using, add, etc.
p.sendMessage(MessageColors.getMsgColor("&r "));
p.sendMessage(MessageColors.getMsgColor("&8[&aSepareWorldItems&8]&r https://github.com/HappyRogelio7/SEPARE-WORLD-ITEMS/wiki/API"));
p.sendMessage(MessageColors.getMsgColor("&8[&aSepareWorldItems&8]&r https://github.com/Happyuky7/SEPARE-WORLD-ITEMS/wiki/API"));
p.sendMessage(MessageColors.getMsgColor("&r "));

return true;
Expand All @@ -98,7 +98,7 @@ public boolean onCommand(CommandSender sender, Command command, String label, St

//update link msg cmd
p.sendMessage(MessageColors.getMsgColor("&r "));
p.sendMessage(MessageColors.getMsgColor("&8[&aSepareWorldItems&8]&r https://github.com/HappyRogelio7/SEPARE-WORLD-ITEMS/wiki#download"));
p.sendMessage(MessageColors.getMsgColor("&8[&aSepareWorldItems&8]&r https://github.com/Happyuky7/SEPARE-WORLD-ITEMS/wiki#download"));
p.sendMessage(MessageColors.getMsgColor("&r "));
return true;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package com.github.happyrogelio7.separeworlditems.filemanagers;
package com.github.happyuky7.separeworlditems.filemanagers;

/*
* Code by: HappyRogelio7
* Github: https://github.com/happyrogelio7
* Code by: Happyuky7
* Github: https://github.com/Happyuky7
* License: Custom
* Link: https://github.com/HappyRogelio7/SEPARE-WORLD-ITEMS
* Link: https://github.com/Happyuky7/SEPARE-WORLD-ITEMS
*/

import java.io.File;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package com.github.happyrogelio7.separeworlditems.filemanagers;
package com.github.happyuky7.separeworlditems.filemanagers;

/*
* Code by: HappyRogelio7
* Github: https://github.com/happyrogelio7
* Code by: Happyuky7
* Github: https://github.com/Happyuky7
* License: Custom
* Link: https://github.com/HappyRogelio7/SEPARE-WORLD-ITEMS
* Link: https://github.com/Happyuky7/SEPARE-WORLD-ITEMS
*/

import org.bukkit.configuration.file.FileConfiguration;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
package com.github.happyrogelio7.separeworlditems.listeners;
package com.github.happyuky7.separeworlditems.listeners;

/*
* Code by: HappyRogelio7
* Github: https://github.com/happyrogelio7
* Code by: Happyuky7
* Github: https://github.com/Happyuky7
* License: Custom
* Link: https://github.com/HappyRogelio7/SEPARE-WORLD-ITEMS
* Link: https://github.com/Happyuky7/SEPARE-WORLD-ITEMS
*/

import com.github.happyrogelio7.separeworlditems.SepareWorldItems;
import com.github.happyrogelio7.separeworlditems.filemanagers.FileManager2;
import com.github.happyrogelio7.separeworlditems.utils.MessageColors;
import com.github.happyuky7.separeworlditems.SepareWorldItems;
import com.github.happyuky7.separeworlditems.filemanagers.FileManager2;
import com.github.happyuky7.separeworlditems.utils.MessageColors;
import org.bukkit.GameMode;
import org.bukkit.Material;
import org.bukkit.configuration.file.FileConfiguration;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
package com.github.happyrogelio7.separeworlditems.managers;
package com.github.happyuky7.separeworlditems.managers;

import com.github.happyrogelio7.separeworlditems.SepareWorldItems;
import com.github.happyrogelio7.separeworlditems.utils.MessageColors;
import com.github.happyuky7.separeworlditems.SepareWorldItems;
import com.github.happyuky7.separeworlditems.utils.MessageColors;


/*
* Code by: HappyRogelio7
* Github: https://github.com/happyrogelio7/
* Github: https://github.com/Happyuky7/
* License: Custom
* Link: https://github.com/HappyRogelio7/SEPARE-WORLD-ITEMS
* Link: https://github.com/Happyuky7/SEPARE-WORLD-ITEMS
*/

public class MessageManager {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.github.happyrogelio7.separeworlditems.utils;
package com.github.happyuky7.separeworlditems.utils;

import net.md_5.bungee.api.ChatColor;
import org.bukkit.Bukkit;
Expand All @@ -9,10 +9,10 @@
public class MessageColors {

/*
Code by: HappyRogelio7
Github: https://github.com/HappyRogelio7
Code by: Happyuky7
Github: https://github.com/Happyuky7
License: Custom
Link: https://github.com/HappyRogelio7/getMsgColorSpigotClass1
Link: https://github.com/Happyuky7/getMsgColorSpigotClass1
*/

public static String getMsgColor(String text) {
Expand All @@ -25,8 +25,12 @@ public static String getMsgColor(String text) {
|| Bukkit.getVersion().contains("1.18.2") || Bukkit.getVersion().contains("1.19")
|| Bukkit.getVersion().contains("1.19.1") || Bukkit.getVersion().contains("1.19.2")
|| Bukkit.getVersion().contains("1.19.3") || Bukkit.getVersion().contains("1.19.4")
|| Bukkit.getVersion().contains("1.20")
|| Bukkit.getVersion().contains("1.20") || Bukkit.getVersion().contains("1.20.1")
|| Bukkit.getVersion().contains("1.20.2") || Bukkit.getVersion().contains("1.20.3")
|| Bukkit.getVersion().contains("1.20.4") || Bukkit.getVersion().contains("1.20.5")
|| Bukkit.getVersion().contains("1.20.6") || Bukkit.getVersion().contains("1.21")
) {

Pattern pattern = Pattern.compile("#[a-fA-F0-9]{6}");
Matcher matcher = pattern.matcher(text);

Expand Down
8 changes: 4 additions & 4 deletions Code/src/main/resources/config.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
#
# SepareWorldItems 1.2.20
# SepareWorldItems 1.2.21
# Tutorial: https://github.com/HappyRogelio7/SEPARE-WORLD-ITEMS/wiki
# Discord OR Support: https://discord.gg/3EebYUyeUX
# Config Plugin SepareWorldItems 1.2.20
# Config Plugin SepareWorldItems 1.2.21
# Update = true
# Config = 1.2.20
# Config = 1.2.21
#
general:
update: true
update-link: "https://github.com/HappyRogelio7/SEPARE-WORLD-ITEMS/" #Do not change.
config: 1.2.20 #Do not change
config: 1.2.21 #Do not change

experimental:
lang: en_US #Change the language of the plugin.
Expand Down
6 changes: 3 additions & 3 deletions Code/src/main/resources/langs.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# Config Langs
# Config = 1.2.20
# Config = 1.2.21
# Prefix Value: %prefix%
# Lang: EN
# Here you can find the list of languages to which the plugin is already translated:
# Github: https://github.com/HappyRogelio7/SEPARE-WORLD-ITEMS/tree/master/langs
# Translate by: https://github.com/HappyRogelio7/
# Github: https://github.com/HHappyuky7/SEPARE-WORLD-ITEMS/tree/master/langs
# Translate by: https://github.com/Happyuky7/
general:
prefix: "&8[&aSepareWorldItems&8]&r" #Value: %prefix%
reload: |-
Expand Down
6 changes: 3 additions & 3 deletions Code/src/main/resources/langs/en_US.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# Config Langs
# Config = 1.2.20
# Config = 1.2.21
# Prefix Value: %prefix%
# Lang: EN
# Here you can find the list of languages to which the plugin is already translated:
# Github: https://github.com/HappyRogelio7/SEPARE-WORLD-ITEMS/tree/master/langs
# Translate by: https://github.com/HappyRogelio7/
# Github: https://github.com/Happyuky7/SEPARE-WORLD-ITEMS/tree/master/langs
# Translate by: https://github.com/Happyuky7/
general:
prefix: "&8[&aSepareWorldItems&8]&r" #Value: %prefix%
reload: |-
Expand Down
6 changes: 3 additions & 3 deletions Code/src/main/resources/langs/es_ES.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# Config Langs
# Config = 1.2.20
# Config = 1.2.21
# Prefix Value: %prefix%
# Lang: EN
# Here you can find the list of languages to which the plugin is already translated:
# Github: https://github.com/HappyRogelio7/SEPARE-WORLD-ITEMS/tree/master/langs
# Translate by: https://github.com/HappyRogelio7/
# Github: https://github.com/Happyuky7/SEPARE-WORLD-ITEMS/tree/master/langs
# Translate by: https://github.com/Happyuky7/
general:
prefix: "&8[&aSepareWorldItems&8]&r" #Value: %prefix%
reload: |-
Expand Down
6 changes: 3 additions & 3 deletions Code/src/main/resources/plugin.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
name: SepareWorldItems
version: '${project.version}'
main: com.github.happyrogelio7.separeworlditems.SepareWorldItems
main: com.github.happyuky7.separeworlditems.SepareWorldItems
api-version: 1.16
authors: [ HappyRogelio7 ]
authors: [ Happyuky7 ]
description: Separe World Items
website: https://github.com/HappyRogelio7
website: https://github.com/Happyuky7
commands:
separeworlditems:
aliases: [swi, swis]
Expand Down
4 changes: 2 additions & 2 deletions LICENSE.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
License

Copyright (c) 2017-2024 Happyuky7
Copyright (c) 2017-2023 HappyRogelio7

He use of this Repository is Free but its Sale or distribution is not allowed as you created it.

Expand All @@ -22,4 +22,4 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.

Web: https://happyuky7.github.io/
Web: https://happyrogelio7.github.io/
Loading

0 comments on commit be760e4

Please sign in to comment.