From 5849bf06e60f91cfa67b117f0fbd66d0bcc6a3bf Mon Sep 17 00:00:00 2001 From: Nassim Jahnke Date: Thu, 30 May 2024 22:21:49 +0200 Subject: [PATCH] Move Bungee and Sponge modules to separate plugins --- .github/ISSUE_TEMPLATE/bug_report.yml | 6 +- .../kotlin/vb.base-conventions.gradle.kts | 2 +- build.gradle.kts | 6 +- bungee/build.gradle.kts | 4 -- .../viaversion/viabackwards/BungeePlugin.java | 38 ----------- bungee/src/main/resources/bungee.yml | 5 -- gradle/libs.versions.toml | 4 -- settings.gradle.kts | 4 -- sponge/build.gradle.kts | 4 -- .../viaversion/viabackwards/SpongePlugin.java | 64 ------------------- .../resources/META-INF/sponge_plugins.json | 54 ---------------- universal/build.gradle.kts | 4 +- 12 files changed, 7 insertions(+), 188 deletions(-) delete mode 100644 bungee/build.gradle.kts delete mode 100644 bungee/src/main/java/com/viaversion/viabackwards/BungeePlugin.java delete mode 100644 bungee/src/main/resources/bungee.yml delete mode 100644 sponge/build.gradle.kts delete mode 100644 sponge/src/main/java/com/viaversion/viabackwards/SpongePlugin.java delete mode 100644 sponge/src/main/resources/META-INF/sponge_plugins.json diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml index 62d5052b..fbd63578 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yml +++ b/.github/ISSUE_TEMPLATE/bug_report.yml @@ -69,9 +69,9 @@ body: attributes: label: Additional Server Info description: | - Do you use a proxy (eg. BungeeCord)? What software do you use and what plugins? + Do you use a proxy (eg. Velocity)? What software do you use and what plugins? placeholder: | - Example: "I also use BungeeCord with the following plugins: x, y, z" + Example: "I also use Velocity with the following plugins: x, y, z" validations: required: false @@ -80,7 +80,7 @@ body: label: Checklist description: Make sure you have followed each of the steps outlined here. options: - - label: Via plugins are only running on **EITHER** the backend servers (e.g. Paper) **OR** the proxy (e.g. BungeeCord), **not on both**. + - label: Via plugins are only running on **EITHER** the backend servers (e.g. Paper) **OR** the proxy (e.g. Velocity), **not on both**. required: true - label: I have included a ViaVersion dump. required: true diff --git a/build-logic/src/main/kotlin/vb.base-conventions.gradle.kts b/build-logic/src/main/kotlin/vb.base-conventions.gradle.kts index 8cbe49d9..10801d73 100644 --- a/build-logic/src/main/kotlin/vb.base-conventions.gradle.kts +++ b/build-logic/src/main/kotlin/vb.base-conventions.gradle.kts @@ -6,7 +6,7 @@ plugins { tasks { // Variable replacements processResources { - filesMatching(listOf("plugin.yml", "META-INF/sponge_plugins.json", "fabric.mod.json", "bungee.yml")) { + filesMatching(listOf("plugin.yml", "fabric.mod.json")) { expand("version" to project.version, "description" to project.description, "url" to "https://viaversion.com/backwards") } } diff --git a/build.gradle.kts b/build.gradle.kts index d1e94fc5..b3dc0d94 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -13,10 +13,8 @@ val main = setOf( projects.viabackwards, projects.viabackwardsCommon, projects.viabackwardsBukkit, - projects.viabackwardsBungee, - projects.viabackwardsFabric, - projects.viabackwardsSponge, - projects.viabackwardsVelocity + projects.viabackwardsVelocity, + projects.viabackwardsFabric ).map { it.dependencyProject } subprojects { diff --git a/bungee/build.gradle.kts b/bungee/build.gradle.kts deleted file mode 100644 index bad9a0d6..00000000 --- a/bungee/build.gradle.kts +++ /dev/null @@ -1,4 +0,0 @@ -dependencies { - compileOnlyApi(projects.viabackwardsCommon) - compileOnly(libs.bungee) -} diff --git a/bungee/src/main/java/com/viaversion/viabackwards/BungeePlugin.java b/bungee/src/main/java/com/viaversion/viabackwards/BungeePlugin.java deleted file mode 100644 index c77df56b..00000000 --- a/bungee/src/main/java/com/viaversion/viabackwards/BungeePlugin.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards - * Copyright (C) 2016-2024 ViaVersion and contributors - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.viaversion.viabackwards; - -import com.viaversion.viabackwards.api.ViaBackwardsPlatform; -import com.viaversion.viaversion.api.Via; -import net.md_5.bungee.api.plugin.Plugin; - -import java.io.File; - -public class BungeePlugin extends Plugin implements ViaBackwardsPlatform { - - @Override - public void onLoad() { - Via.getManager().addEnableListener(() -> this.init(new File(getDataFolder(), "config.yml"))); - } - - - @Override - public void disable() { - } -} diff --git a/bungee/src/main/resources/bungee.yml b/bungee/src/main/resources/bungee.yml deleted file mode 100644 index ce4e5548..00000000 --- a/bungee/src/main/resources/bungee.yml +++ /dev/null @@ -1,5 +0,0 @@ -name: ViaBackwards -main: com.viaversion.viabackwards.BungeePlugin -author: "Matsv, kennytv, Gerrygames, creeper123123321, ForceUpdate1, EnZaXD" -version: ${version} -depends: [ViaVersion] \ No newline at end of file diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index e398a0e5..ffdb3e16 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -14,8 +14,6 @@ checkerQual = "3.39.0" # Platforms paper = "1.16.5-R0.1-SNAPSHOT" -bungee = "1.19-R0.1-SNAPSHOT" -sponge = "8.0.0" velocity = "3.1.1" fabricLoader = "0.11.6" @@ -31,7 +29,5 @@ log4j = { group = "org.apache.logging.log4j", name = "log4j-api", version.ref = checkerQual = { group = "org.checkerframework", name = "checker-qual", version.ref = "checkerQual" } paper = { group = "com.destroystokyo.paper", name = "paper-api", version.ref = "paper" } -bungee = { group = "net.md-5", name = "bungeecord-api", version.ref = "bungee" } -sponge = { group = "org.spongepowered", name = "spongeapi", version.ref = "sponge" } velocity = { group = "com.velocitypowered", name = "velocity-api", version.ref = "velocity" } fabricLoader = { group = "net.fabricmc", name = "fabric-loader", version.ref = "fabricLoader" } diff --git a/settings.gradle.kts b/settings.gradle.kts index 8ac5a9e9..440aa545 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -6,8 +6,6 @@ dependencyResolutionManagement { repositories { maven("https://repo.viaversion.com") maven("https://repo.papermc.io/repository/maven-public/") - maven("https://oss.sonatype.org/content/repositories/snapshots/") - maven("https://repo.spongepowered.org/maven") mavenCentral() } repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) @@ -25,9 +23,7 @@ includeBuild("build-logic") setupViaSubproject("common") setupViaSubproject("bukkit") -setupViaSubproject("bungee") setupViaSubproject("velocity") -setupViaSubproject("sponge") setupViaSubproject("fabric") setupViaSubproject("template") diff --git a/sponge/build.gradle.kts b/sponge/build.gradle.kts deleted file mode 100644 index a4a1a55d..00000000 --- a/sponge/build.gradle.kts +++ /dev/null @@ -1,4 +0,0 @@ -dependencies { - compileOnlyApi(projects.viabackwardsCommon) - compileOnly(libs.sponge) -} diff --git a/sponge/src/main/java/com/viaversion/viabackwards/SpongePlugin.java b/sponge/src/main/java/com/viaversion/viabackwards/SpongePlugin.java deleted file mode 100644 index 13a6b061..00000000 --- a/sponge/src/main/java/com/viaversion/viabackwards/SpongePlugin.java +++ /dev/null @@ -1,64 +0,0 @@ -/* - * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards - * Copyright (C) 2016-2024 ViaVersion and contributors - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.viaversion.viabackwards; - -import com.google.inject.Inject; -import com.viaversion.viabackwards.api.ViaBackwardsPlatform; -import com.viaversion.viaversion.api.Via; -import com.viaversion.viaversion.sponge.util.LoggerWrapper; -import java.io.File; -import java.nio.file.Path; -import java.util.logging.Logger; -import org.spongepowered.api.config.ConfigDir; -import org.spongepowered.api.event.Listener; -import org.spongepowered.api.event.lifecycle.ConstructPluginEvent; -import org.spongepowered.plugin.builtin.jvm.Plugin; - -@Plugin("viabackwards") -public class SpongePlugin implements ViaBackwardsPlatform { - @SuppressWarnings("SpongeLogging") - private final Logger logger; - @Inject - @ConfigDir(sharedRoot = false) - private Path configPath; - - @Inject - SpongePlugin(final org.apache.logging.log4j.Logger logger) { - this.logger = new LoggerWrapper(logger); - } - - @Listener - public void constructPlugin(ConstructPluginEvent event) { - Via.getManager().addEnableListener(() -> this.init(new File(getDataFolder(), "config.yml"))); - } - - @Override - public void disable() { - } - - @Override - public File getDataFolder() { - return configPath.toFile(); - } - - @Override - public Logger getLogger() { - return logger; - } -} diff --git a/sponge/src/main/resources/META-INF/sponge_plugins.json b/sponge/src/main/resources/META-INF/sponge_plugins.json deleted file mode 100644 index 8d77fe9c..00000000 --- a/sponge/src/main/resources/META-INF/sponge_plugins.json +++ /dev/null @@ -1,54 +0,0 @@ -{ - "loader": { - "name": "java_plain", - "version": "1.0" - }, - "license": "GNU GPLv3", - "global": { - "version": "${version}", - "links": { - "source": "https://github.com/ViaVersion/ViaBackwards", - "issues": "https://github.com/ViaVersion/ViaBackwards/issues" - }, - "contributors": [ - { - "name": "Matsv", - "description": "Maintainer" - }, - { - "name": "kennytv", - "description": "Maintainer" - }, - { - "name": "Gerrygames", - "description": "Contributor" - }, - { - "name": "creeper123123321", - "description": "Contributor" - }, - { - "name": "EnZaXD", - "description": "Contributor" - } - ], - "dependencies": [ - { - "id": "spongeapi", - "version": "8.0.0" - }, - { - "id": "viaversion", - "version": "[4.6.0,)" - } - ] - }, - "plugins": [ - { - "id": "viabackwards", - "name": "ViaBackwards", - "entrypoint": "com.viaversion.viabackwards.SpongePlugin", - "description": "${description}" - } - ] -} \ No newline at end of file diff --git a/universal/build.gradle.kts b/universal/build.gradle.kts index 2a8ae914..938f1825 100644 --- a/universal/build.gradle.kts +++ b/universal/build.gradle.kts @@ -6,10 +6,8 @@ plugins { dependencies { api(projects.viabackwardsCommon) api(projects.viabackwardsBukkit) - api(projects.viabackwardsBungee) - api(projects.viabackwardsFabric) - api(projects.viabackwardsSponge) api(projects.viabackwardsVelocity) + api(projects.viabackwardsFabric) } tasks {