diff --git a/LICENSE b/LICENSE index 3c29024..9d944f1 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2022-2024 DivineMC +Copyright (c) 2022-2025 BX Team Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/README.md b/README.md index 4812878..dc549b3 100644 --- a/README.md +++ b/README.md @@ -1,13 +1,13 @@ -DivineMC Face +DivineMC Face

DivineMC

Fork of Purpur compatible with Spigot plugins, offering the best performance for your server.


- [![GitHub Workflow Status](https://img.shields.io/github/actions/workflow/status/DivineMC/DivineMC/build.yml?logo=GoogleAnalytics&logoColor=ffffff&style=for-the-badge)](https://github.com/DivineMC/DivineMC/actions) + [![GitHub Workflow Status](https://img.shields.io/github/actions/workflow/status/BX-Team/DivineMC/build.yml?logo=GoogleAnalytics&logoColor=ffffff&style=for-the-badge)](https://github.com/BX-Team/DivineMC/actions) [![Discord](https://img.shields.io/discord/931595732752953375?color=5865F2&label=discord&style=for-the-badge)](https://discord.gg/p7cxhw7E2M) - [![Download](https://img.shields.io/github/downloads/DivineMC/DivineMC/total?style=for-the-badge)](https://github.com/DivineMC/DivineMC/releases/latest) + [![Download](https://img.shields.io/github/downloads/BX-Team/DivineMC/total?style=for-the-badge)](https://github.com/BX-Team/DivineMC/releases/latest)
## ⚙️ Features @@ -23,7 +23,7 @@ ## ⬇️ Downloads -In normal case, you can download the latest JAR file from releases tab [here](https://github.com/DivineMC/DivineMC/releases/latest) +In normal case, you can download the latest JAR file from releases tab [here](https://github.com/BX-Team/DivineMC/releases/latest) **Please note:** Java >= 21 is required. @@ -77,7 +77,7 @@ First, clone this repository (do not download it) and the run the following comm After that, project is ready to use and editing it. ### Creating a patch -Patches are effectively just commits in either `paper-api`, `paper-server`, `purpur-api`, `purpur-server` or `divinemc-server`. If you want to learn how to work with patch system, you can read our [contributing documentation](https://docs.bxteam.org/documentation/divinemc/development/contributing). +Patches are effectively just commits in either `paper-api`, `paper-server`, `purpur-api`, `purpur-server` or `divinemc-server`. If you want to learn how to work with patch system, you can read our [contributing documentation](https://bxteam.org/docs/divinemc/development/contributing). ### Compiling Use the command `./gradlew build` to build the API and server. Compiled JARs will be placed under `divinemc-api/build/libs` and `divinemc-server/build/libs`. **These JARs are not used to start a server**. diff --git a/divinemc-api/paper-patches/files/src/main/java/io/papermc/paper/ServerBuildInfo.java.patch b/divinemc-api/paper-patches/files/src/main/java/io/papermc/paper/ServerBuildInfo.java.patch index 739b397..a20507f 100644 --- a/divinemc-api/paper-patches/files/src/main/java/io/papermc/paper/ServerBuildInfo.java.patch +++ b/divinemc-api/paper-patches/files/src/main/java/io/papermc/paper/ServerBuildInfo.java.patch @@ -9,7 +9,7 @@ + /** + * The brand id for DivineMC. + */ -+ Key BRAND_DIVINEMC_ID = Key.key("divinemc", "divinemc"); ++ Key BRAND_DIVINEMC_ID = Key.key("bxteam", "divinemc"); + // DivineMC end + /** diff --git a/divinemc-server/build.gradle.kts.patch b/divinemc-server/build.gradle.kts.patch index a1103cb..10256b7 100644 --- a/divinemc-server/build.gradle.kts.patch +++ b/divinemc-server/build.gradle.kts.patch @@ -104,7 +104,7 @@ - "Brand-Id" to "purpurmc:purpur", // Purpur - "Brand-Name" to "Purpur", // Purpur + "Specification-Vendor" to "BX Team", // DivineMC -+ "Brand-Id" to "divinemc:divinemc", // DivineMC ++ "Brand-Id" to "bxteam:divinemc", // DivineMC + "Brand-Name" to "DivineMC", // DivineMC "Build-Number" to (build ?: ""), "Build-Time" to buildTime.toString(), diff --git a/divinemc-server/paper-patches/features/0001-Rebrand.patch b/divinemc-server/paper-patches/features/0001-Rebrand.patch index 91d6ac9..3ac9f3b 100644 --- a/divinemc-server/paper-patches/features/0001-Rebrand.patch +++ b/divinemc-server/paper-patches/features/0001-Rebrand.patch @@ -27,7 +27,7 @@ index be1bb14dca9367b9685841985b6198376986c496..58f16cdf593dbf874652a46799ecfa5c metrics.addCustomChart(new Metrics.DrilldownPie("java_version", () -> { Map> map = new HashMap<>(); diff --git a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java -index fe66e43c27e0798770e102d1385bacbaa90bda07..6e11b6d871a1122ac324ad19aa45a3dbecdc52e8 100644 +index fe66e43c27e0798770e102d1385bacbaa90bda07..8c72ac3376ee1ea6f2c98de4d4fdbea91df2cfd7 100644 --- a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java +++ b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java @@ -36,13 +36,13 @@ public class PaperVersionFetcher implements VersionFetcher { @@ -35,7 +35,7 @@ index fe66e43c27e0798770e102d1385bacbaa90bda07..6e11b6d871a1122ac324ad19aa45a3db private static final int DISTANCE_UNKNOWN = -2; // Purpur start - Rebrand - private static final String DOWNLOAD_PAGE = "https://purpurmc.org/downloads"; -+ private static final String DOWNLOAD_PAGE = "https://github.com/DivineMC/DivineMC/releases/latest"; // DivineMC - Rebrand ++ private static final String DOWNLOAD_PAGE = "https://github.com/BX-Team/DivineMC/releases/latest"; // DivineMC - Rebrand private static int distance = DISTANCE_UNKNOWN; public int distance() { return distance; } // Purpur end - Rebrand @@ -51,7 +51,7 @@ index fe66e43c27e0798770e102d1385bacbaa90bda07..6e11b6d871a1122ac324ad19aa45a3db updateMessage = text("You are running a development version without access to version information", color(0xFF5300)); } else { - updateMessage = getUpdateStatusMessage("PurpurMC/Purpur", build); // Purpur - Rebrand -+ updateMessage = getUpdateStatusMessage("DivineMC/DivineMC", build); // DivineMC - Branding ++ updateMessage = getUpdateStatusMessage("BX-Team/DivineMC", build); // DivineMC - Branding } final @Nullable Component history = this.getHistory(); @@ -171,7 +171,7 @@ index 99eb04643fce44c37fd96c99756837ccafe7b559..4aef151bd162c4c99a3eaec1854b5463 if (stream != null) { diff --git a/src/main/java/org/spigotmc/WatchdogThread.java b/src/main/java/org/spigotmc/WatchdogThread.java -index 776bc01784b53e3f1d9a35046109c3b9ee4f0882..ce6c05dd9a83a4f169496e53e28398ec5e73b068 100644 +index 776bc01784b53e3f1d9a35046109c3b9ee4f0882..26a3a0ab93ffd4d0a172e47fafeb26485c8d87ab 100644 --- a/src/main/java/org/spigotmc/WatchdogThread.java +++ b/src/main/java/org/spigotmc/WatchdogThread.java @@ -77,14 +77,14 @@ public class WatchdogThread extends ca.spottedleaf.moonrise.common.util.TickThre @@ -185,7 +185,7 @@ index 776bc01784b53e3f1d9a35046109c3b9ee4f0882..ce6c05dd9a83a4f169496e53e28398ec logger.log(Level.SEVERE, "If you see a world save or edit, then it means you did far more than your server can handle at once"); logger.log(Level.SEVERE, "\t If this is the case, consider increasing timeout-time in spigot.yml but note that this will replace the crash with LARGE lag spikes"); - logger.log(Level.SEVERE, "If you are unsure or still think this is a Purpur bug, please report this to https://github.com/PurpurMC/Purpur/issues"); // Purpur - Rebrand -+ logger.log(Level.SEVERE, "If you are unsure or still think this is a DivineMC bug, please report this to https://github.com/DivineMC/DivineMC/issues"); // DivineMC - Rebrand ++ logger.log(Level.SEVERE, "If you are unsure or still think this is a DivineMC bug, please report this to https://github.com/BX-Team/DivineMC/issues"); // DivineMC - Rebrand logger.log(Level.SEVERE, "Be sure to include ALL relevant console errors and Minecraft crash reports"); - logger.log(Level.SEVERE, "Purpur version: " + Bukkit.getServer().getVersion()); // Purpur - Rebrand + logger.log(Level.SEVERE, "DivineMC version: " + Bukkit.getServer().getVersion()); // DivineMC - Rebrand diff --git a/divinemc-server/src/main/java/org/bxteam/divinemc/configuration/DivineConfig.java b/divinemc-server/src/main/java/org/bxteam/divinemc/configuration/DivineConfig.java index 1190be9..2e6a9d0 100644 --- a/divinemc-server/src/main/java/org/bxteam/divinemc/configuration/DivineConfig.java +++ b/divinemc-server/src/main/java/org/bxteam/divinemc/configuration/DivineConfig.java @@ -26,8 +26,8 @@ public class DivineConfig { + "join us in our Discord server.\n" + "\n" + "Discord: https://discord.gg/p7cxhw7E2M \n" - + "Docs: https://docs.bxteam.org/documentation/divinemc/about \n" - + "New builds: https://github.com/DivineMC/DivineMC/releases/latest"; + + "Docs: https://bxteam.org/docs/divinemc \n" + + "New builds: https://github.com/BX-Team/DivineMC/releases/latest"; private static File CONFIG_FILE; public static YamlConfiguration config; diff --git a/scripts/releaseInfo.sh b/scripts/releaseInfo.sh index d227747..ac82895 100644 --- a/scripts/releaseInfo.sh +++ b/scripts/releaseInfo.sh @@ -39,7 +39,7 @@ mv divinemc-server/build/libs/divinemc-paperclip-"$version"-mojmap.jar "$jarName } >> "$GITHUB_ENV" { - echo "$divinemcid [![download](https://img.shields.io/github/downloads/DivineMC/DivineMC/$tagid/total?color=0)](https://github.com/DivineMC/DivineMC/releases/download/$tagid/$jarName)" + echo "$divinemcid [![download](https://img.shields.io/github/downloads/BX-Team/DivineMC/$tagid/total?color=0)](https://github.com/BX-Team/DivineMC/releases/download/$tagid/$jarName)" echo "=====" echo "" if [ "$experimental" = "true" ]; then diff --git a/settings.gradle.kts b/settings.gradle.kts index 880544d..5b5579b 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -23,7 +23,7 @@ if (!file(".git").exists()) { zip from GitHub. Built Gale jars are available for download at - https://github.com/DivineMC/DivineMC/actions + https://github.com/BX-Team/DivineMC/actions See https://github.com/PaperMC/Paper/blob/main/CONTRIBUTING.md for further information on building and modifying Paper forks. @@ -38,4 +38,4 @@ for (name in listOf("divinemc-api", "divinemc-server")) { val projName = name.lowercase(Locale.ENGLISH) include(projName) findProject(":$projName")!!.projectDir = file(name) -} \ No newline at end of file +}