Upstream/Ascension
1
0
Fork 0
mirror of https://github.com/DiscordSRV/Ascension.git synced 2025-02-27 03:32:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Consolidate :common:common-proxy and :common:common-server into :common

Browse Source
This commit is contained in:
Vankka 2022-12-18 23:15:24 +02:00
parent 88fd6f4d5d
commit 26aac4d4e2
No known key found for this signature in database
GPG Key ID: 6E50CB7A29B96AD0
34 changed files with 51 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bukkit/build.gradle
View File

@ -63,8 +63,9 @@ dependencies {
annotationProcessor project(':api')
// Common
compileOnly project(':common:common-server')
implementation project(path: ':common:common-server', configuration: 'runtimeElements')
compileOnly project(':common')
implementation project(':common:common-templates')
implementation project(path: ':common', configuration: 'runtimeElements')
// DependencyDownload
implementation(libs.mcdependencydownload.bukkit.bootstrap)

2
bukkit/src/main/java/com/discordsrv/bukkit/BukkitDiscordSRV.java
View File

@ -39,7 +39,7 @@ import com.discordsrv.common.config.manager.MainConfigManager;
import com.discordsrv.common.debug.data.OnlineMode;
import com.discordsrv.common.messageforwarding.game.MinecraftToDiscordChatModule;
import com.discordsrv.common.plugin.PluginManager;
import com.discordsrv.common.server.ServerDiscordSRV;
import com.discordsrv.common.ServerDiscordSRV;
import com.fasterxml.jackson.databind.JsonNode;
import net.kyori.adventure.platform.bukkit.BukkitAudiences;
import org.bukkit.Server;

4
bukkit/src/main/java/com/discordsrv/bukkit/config/main/BukkitConfig.java
View File

@ -20,8 +20,8 @@ package com.discordsrv.bukkit.config.main;
import com.discordsrv.common.config.main.MainConfig;
import com.discordsrv.common.config.main.channels.base.ChannelConfig;
import com.discordsrv.common.server.config.channels.base.ServerBaseChannelConfig;
import com.discordsrv.common.server.config.channels.base.ServerChannelConfig;
import com.discordsrv.common.config.main.channels.base.server.ServerBaseChannelConfig;
import com.discordsrv.common.config.main.channels.base.server.ServerChannelConfig;
import org.spongepowered.configurate.objectmapping.ConfigSerializable;
@ConfigSerializable

2
bukkit/src/main/java/com/discordsrv/bukkit/config/manager/BukkitConfigManager.java
View File

@ -20,7 +20,7 @@ package com.discordsrv.bukkit.config.manager;
import com.discordsrv.bukkit.config.main.BukkitConfig;
import com.discordsrv.common.DiscordSRV;
import com.discordsrv.common.server.config.manager.ServerConfigManager;
import com.discordsrv.common.config.manager.manager.ServerConfigManager;
public class BukkitConfigManager extends ServerConfigManager<BukkitConfig> {

2
bukkit/src/main/java/com/discordsrv/bukkit/player/BukkitPlayerProvider.java
View File

@ -20,7 +20,7 @@ package com.discordsrv.bukkit.player;
import com.discordsrv.bukkit.BukkitDiscordSRV;
import com.discordsrv.common.player.IOfflinePlayer;
import com.discordsrv.common.server.player.ServerPlayerProvider;
import com.discordsrv.common.player.ServerPlayerProvider;
import org.bukkit.OfflinePlayer;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;

2
bukkit/src/main/java/com/discordsrv/bukkit/scheduler/BukkitScheduler.java
View File

@ -22,7 +22,7 @@ import com.discordsrv.bukkit.BukkitDiscordSRV;
import com.discordsrv.bukkit.DiscordSRVBukkitBootstrap;
import com.discordsrv.common.DiscordSRV;
import com.discordsrv.common.scheduler.StandardScheduler;
import com.discordsrv.common.server.scheduler.ServerScheduler;
import com.discordsrv.common.scheduler.ServerScheduler;
import org.bukkit.plugin.Plugin;
import java.util.function.BiConsumer;

3
bungee/build.gradle
View File

@ -36,7 +36,8 @@ dependencies {
annotationProcessor project(':api')
// Common
implementation project(':common:common-proxy')
implementation project(':common')
implementation project(':common:common-templates')
// DependencyDownload
implementation(libs.mcdependencydownload.bungee.bootstrap)

2
bungee/src/main/java/com/discordsrv/bungee/BungeeDiscordSRV.java
View File

@ -30,7 +30,7 @@ import com.discordsrv.common.config.manager.MainConfigManager;
import com.discordsrv.common.debug.data.OnlineMode;
import com.discordsrv.common.plugin.PluginManager;
import com.discordsrv.common.scheduler.StandardScheduler;
import com.discordsrv.proxy.ProxyDiscordSRV;
import com.discordsrv.common.ProxyDiscordSRV;
import net.kyori.adventure.platform.bungeecord.BungeeAudiences;
import net.md_5.bungee.api.ProxyServer;
import net.md_5.bungee.api.plugin.Plugin;

4
common/proxy/build.gradle
View File

@ -1,4 +0,0 @@
dependencies {
api project(':common')
api project(':common:common-templates')
}

19
common/proxy/src/main/java/com/discordsrv/proxy/config/package-info.java
View File

@ -1,19 +0,0 @@
/*
* This file is part of DiscordSRV, licensed under the GPLv3 License
* Copyright (c) 2016-2022 Austin "Scarsz" Shapiro, Henri "Vankka" Schubin and DiscordSRV 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 <https://www.gnu.org/licenses/>.
*/
package com.discordsrv.proxy.config;

4
common/server/build.gradle
View File

@ -1,4 +0,0 @@
dependencies {
api project(':common')
api project(':common:common-templates')
}

5
common/proxy/src/main/java/com/discordsrv/proxy/ProxyDiscordSRV.java → common/src/main/java/com/discordsrv/common/ProxyDiscordSRV.java
View File

@ -16,13 +16,12 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
package com.discordsrv.proxy;
package com.discordsrv.common;
import com.discordsrv.common.AbstractDiscordSRV;
import com.discordsrv.common.bootstrap.IBootstrap;
import com.discordsrv.common.config.connection.ConnectionConfig;
import com.discordsrv.common.config.main.MainConfig;
import com.discordsrv.proxy.modules.ServerSwitchMessageModule;
import com.discordsrv.common.messageforwarding.game.ServerSwitchMessageModule;
public abstract class ProxyDiscordSRV<B extends IBootstrap, C extends MainConfig, CC extends ConnectionConfig> extends AbstractDiscordSRV<B, C, CC> {

9
common/server/src/main/java/com/discordsrv/common/server/ServerDiscordSRV.java → common/src/main/java/com/discordsrv/common/ServerDiscordSRV.java
View File

@ -16,15 +16,14 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
package com.discordsrv.common.server;
package com.discordsrv.common;
import com.discordsrv.common.AbstractDiscordSRV;
import com.discordsrv.common.bootstrap.IBootstrap;
import com.discordsrv.common.config.connection.ConnectionConfig;
import com.discordsrv.common.config.main.MainConfig;
import com.discordsrv.common.server.modules.DeathMessageModule;
import com.discordsrv.common.server.player.ServerPlayerProvider;
import com.discordsrv.common.server.scheduler.ServerScheduler;
import com.discordsrv.common.messageforwarding.game.DeathMessageModule;
import com.discordsrv.common.player.ServerPlayerProvider;
import com.discordsrv.common.scheduler.ServerScheduler;
import org.jetbrains.annotations.NotNull;
import javax.annotation.OverridingMethodsMustInvokeSuper;

3
common/server/src/main/java/com/discordsrv/common/server/config/channels/DeathMessageConfig.java → common/src/main/java/com/discordsrv/common/config/main/channels/DeathMessageConfig.java
View File

@ -16,12 +16,11 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
package com.discordsrv.common.server.config.channels;
package com.discordsrv.common.config.main.channels;
import com.discordsrv.api.discord.entity.message.DiscordMessageEmbed;
import com.discordsrv.api.discord.entity.message.SendableDiscordMessage;
import com.discordsrv.common.config.annotation.Untranslated;
import com.discordsrv.common.config.main.channels.IMessageConfig;
import org.spongepowered.configurate.objectmapping.ConfigSerializable;
import org.spongepowered.configurate.objectmapping.meta.Comment;

3
common/proxy/src/main/java/com/discordsrv/proxy/config/channels/ServerSwitchMessageConfig.java → common/src/main/java/com/discordsrv/common/config/main/channels/ServerSwitchMessageConfig.java
View File

@ -16,12 +16,11 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
package com.discordsrv.proxy.config.channels;
package com.discordsrv.common.config.main.channels;
import com.discordsrv.api.discord.entity.message.DiscordMessageEmbed;
import com.discordsrv.api.discord.entity.message.SendableDiscordMessage;
import com.discordsrv.common.config.annotation.Untranslated;
import com.discordsrv.common.config.main.channels.IMessageConfig;
import org.spongepowered.configurate.objectmapping.ConfigSerializable;
@ConfigSerializable

4
common/proxy/src/main/java/com/discordsrv/proxy/config/channels/base/ProxyBaseChannelConfig.java → common/src/main/java/com/discordsrv/common/config/main/channels/base/proxy/ProxyBaseChannelConfig.java
View File

@ -16,12 +16,12 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
package com.discordsrv.proxy.config.channels.base;
package com.discordsrv.common.config.main.channels.base.proxy;
import com.discordsrv.common.config.annotation.Order;
import com.discordsrv.common.config.main.channels.JoinMessageConfig;
import com.discordsrv.common.config.main.channels.ServerSwitchMessageConfig;
import com.discordsrv.common.config.main.channels.base.BaseChannelConfig;
import com.discordsrv.proxy.config.channels.ServerSwitchMessageConfig;
import org.spongepowered.configurate.objectmapping.ConfigSerializable;
@ConfigSerializable

2
common/proxy/src/main/java/com/discordsrv/proxy/config/channels/base/ProxyChannelConfig.java → common/src/main/java/com/discordsrv/common/config/main/channels/base/proxy/ProxyChannelConfig.java
View File

@ -16,7 +16,7 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
package com.discordsrv.proxy.config.channels.base;
package com.discordsrv.common.config.main.channels.base.proxy;
import com.discordsrv.common.config.main.channels.base.IChannelConfig;
import com.discordsrv.common.config.main.channels.base.ThreadConfig;

4
common/server/src/main/java/com/discordsrv/common/server/config/channels/base/ServerBaseChannelConfig.java → common/src/main/java/com/discordsrv/common/config/main/channels/base/server/ServerBaseChannelConfig.java
View File

@ -16,11 +16,11 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
package com.discordsrv.common.server.config.channels.base;
package com.discordsrv.common.config.main.channels.base.server;
import com.discordsrv.common.config.annotation.Order;
import com.discordsrv.common.config.main.channels.DeathMessageConfig;
import com.discordsrv.common.config.main.channels.base.BaseChannelConfig;
import com.discordsrv.common.server.config.channels.DeathMessageConfig;
import org.spongepowered.configurate.objectmapping.ConfigSerializable;
@ConfigSerializable

2
common/server/src/main/java/com/discordsrv/common/server/config/channels/base/ServerChannelConfig.java → common/src/main/java/com/discordsrv/common/config/main/channels/base/server/ServerChannelConfig.java
View File

@ -16,7 +16,7 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
package com.discordsrv.common.server.config.channels.base;
package com.discordsrv.common.config.main.channels.base.server;
import com.discordsrv.common.config.main.channels.base.IChannelConfig;
import com.discordsrv.common.config.main.channels.base.ThreadConfig;

2
common/server/src/main/java/com/discordsrv/common/server/config/channels/base/ServerJoinMessageConfig.java → common/src/main/java/com/discordsrv/common/config/main/channels/base/server/ServerJoinMessageConfig.java
View File

@ -16,7 +16,7 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
package com.discordsrv.common.server.config.channels.base;
package com.discordsrv.common.config.main.channels.base.server;
import com.discordsrv.common.config.annotation.Order;
import com.discordsrv.common.config.main.channels.JoinMessageConfig;

6
common/proxy/src/main/java/com/discordsrv/proxy/config/manager/ProxyConfigManager.java → common/src/main/java/com/discordsrv/common/config/manager/manager/ProxyConfigManager.java
View File

@ -16,14 +16,14 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
package com.discordsrv.proxy.config.manager;
package com.discordsrv.common.config.manager.manager;
import com.discordsrv.common.DiscordSRV;
import com.discordsrv.common.config.main.MainConfig;
import com.discordsrv.common.config.main.channels.base.IChannelConfig;
import com.discordsrv.common.config.main.channels.base.proxy.ProxyBaseChannelConfig;
import com.discordsrv.common.config.main.channels.base.proxy.ProxyChannelConfig;
import com.discordsrv.common.config.manager.MainConfigManager;
import com.discordsrv.proxy.config.channels.base.ProxyBaseChannelConfig;
import com.discordsrv.proxy.config.channels.base.ProxyChannelConfig;
import org.spongepowered.configurate.objectmapping.ObjectMapper;
public abstract class ProxyConfigManager<T extends MainConfig> extends MainConfigManager<T> {

6
common/server/src/main/java/com/discordsrv/common/server/config/manager/ServerConfigManager.java → common/src/main/java/com/discordsrv/common/config/manager/manager/ServerConfigManager.java
View File

@ -16,14 +16,14 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
package com.discordsrv.common.server.config.manager;
package com.discordsrv.common.config.manager.manager;
import com.discordsrv.common.DiscordSRV;
import com.discordsrv.common.config.main.MainConfig;
import com.discordsrv.common.config.main.channels.base.IChannelConfig;
import com.discordsrv.common.config.manager.MainConfigManager;
import com.discordsrv.common.server.config.channels.base.ServerBaseChannelConfig;
import com.discordsrv.common.server.config.channels.base.ServerChannelConfig;
import com.discordsrv.common.config.main.channels.base.server.ServerBaseChannelConfig;
import com.discordsrv.common.config.main.channels.base.server.ServerChannelConfig;
import org.spongepowered.configurate.objectmapping.ObjectMapper;
public abstract class ServerConfigManager<T extends MainConfig> extends MainConfigManager<T> {

7
common/server/src/main/java/com/discordsrv/common/server/modules/DeathMessageModule.java → common/src/main/java/com/discordsrv/common/messageforwarding/game/DeathMessageModule.java
View File

@ -16,7 +16,7 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
package com.discordsrv.common.server.modules;
package com.discordsrv.common.messageforwarding.game;
import com.discordsrv.api.discord.entity.message.ReceivedDiscordMessageCluster;
import com.discordsrv.api.event.bus.EventPriority;
@ -24,11 +24,10 @@ import com.discordsrv.api.event.bus.Subscribe;
import com.discordsrv.api.event.events.message.forward.game.DeathMessageForwardedEvent;
import com.discordsrv.api.event.events.message.receive.game.DeathMessageReceiveEvent;
import com.discordsrv.common.DiscordSRV;
import com.discordsrv.common.config.main.channels.DeathMessageConfig;
import com.discordsrv.common.config.main.channels.base.BaseChannelConfig;
import com.discordsrv.common.config.main.channels.base.server.ServerBaseChannelConfig;
import com.discordsrv.common.function.OrDefault;
import com.discordsrv.common.messageforwarding.game.AbstractGameMessageModule;
import com.discordsrv.common.server.config.channels.DeathMessageConfig;
import com.discordsrv.common.server.config.channels.base.ServerBaseChannelConfig;
public class DeathMessageModule extends AbstractGameMessageModule<DeathMessageConfig, DeathMessageReceiveEvent> {

7
common/proxy/src/main/java/com/discordsrv/proxy/modules/ServerSwitchMessageModule.java → common/src/main/java/com/discordsrv/common/messageforwarding/game/ServerSwitchMessageModule.java
View File

@ -16,7 +16,7 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
package com.discordsrv.proxy.modules;
package com.discordsrv.common.messageforwarding.game;
import com.discordsrv.api.discord.entity.message.ReceivedDiscordMessageCluster;
import com.discordsrv.api.event.bus.EventPriority;
@ -24,11 +24,10 @@ import com.discordsrv.api.event.bus.Subscribe;
import com.discordsrv.api.event.events.message.forward.game.ServerSwitchMessageForwardedEvent;
import com.discordsrv.api.event.events.message.receive.game.ServerSwitchMessageReceiveEvent;
import com.discordsrv.common.DiscordSRV;
import com.discordsrv.common.config.main.channels.ServerSwitchMessageConfig;
import com.discordsrv.common.config.main.channels.base.BaseChannelConfig;
import com.discordsrv.common.config.main.channels.base.proxy.ProxyBaseChannelConfig;
import com.discordsrv.common.function.OrDefault;
import com.discordsrv.common.messageforwarding.game.AbstractGameMessageModule;
import com.discordsrv.proxy.config.channels.ServerSwitchMessageConfig;
import com.discordsrv.proxy.config.channels.base.ProxyBaseChannelConfig;
public class ServerSwitchMessageModule extends AbstractGameMessageModule<ServerSwitchMessageConfig, ServerSwitchMessageReceiveEvent> {

4
common/server/src/main/java/com/discordsrv/common/server/player/ServerPlayerProvider.java → common/src/main/java/com/discordsrv/common/player/ServerPlayerProvider.java
View File

@ -16,11 +16,9 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
package com.discordsrv.common.server.player;
package com.discordsrv.common.player;
import com.discordsrv.common.DiscordSRV;
import com.discordsrv.common.player.IOfflinePlayer;
import com.discordsrv.common.player.IPlayer;
import com.discordsrv.common.player.provider.AbstractPlayerProvider;
import java.util.Optional;

3
common/server/src/main/java/com/discordsrv/common/server/scheduler/ServerScheduler.java → common/src/main/java/com/discordsrv/common/scheduler/ServerScheduler.java
View File

@ -16,9 +16,8 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
package com.discordsrv.common.server.scheduler;
package com.discordsrv.common.scheduler;
import com.discordsrv.common.scheduler.Scheduler;
import org.jetbrains.annotations.ApiStatus;
import java.util.concurrent.TimeUnit;

3
i18n/build.gradle
View File

@ -12,8 +12,7 @@ version = null
dependencies {
implementation(project(':common:common-api'))
implementation(project(':common:common-server'))
implementation(project(':common:common-proxy'))
implementation(project(':common'))
// Depend on all platforms for configs
implementation(project(':bukkit')) { transitive = false }

2
settings.gradle
View File

@ -134,7 +134,7 @@ dependencyResolutionManagement {
rootProject.name = 'DiscordSRV2'
[
'common', 'common:api', 'common:server', 'common:proxy', 'common:unrelocate', 'common:templates',
'common', 'common:api', 'common:unrelocate', 'common:templates',
'i18n',
'api',
'bukkit', 'bukkit:loader',

3
sponge/build.gradle
View File

@ -30,7 +30,8 @@ dependencies {
annotationProcessor project(':api')
// Common
implementation project(':common:common-server')
implementation project(':common')
implementation project(':common:common-templates')
// Dependency Download
implementation(libs.dependencydownload.jarinjar.bootstrap)

2
sponge/src/main/java/com/discordsrv/sponge/SpongeDiscordSRV.java
View File

@ -26,7 +26,7 @@ import com.discordsrv.common.config.manager.ConnectionConfigManager;
import com.discordsrv.common.config.manager.MainConfigManager;
import com.discordsrv.common.debug.data.OnlineMode;
import com.discordsrv.common.plugin.PluginManager;
import com.discordsrv.common.server.ServerDiscordSRV;
import com.discordsrv.common.ServerDiscordSRV;
import com.discordsrv.sponge.console.SpongeConsole;
import com.discordsrv.sponge.player.SpongePlayerProvider;
import com.discordsrv.sponge.plugin.SpongePluginManager;

2
sponge/src/main/java/com/discordsrv/sponge/player/SpongePlayerProvider.java
View File

@ -19,7 +19,7 @@
package com.discordsrv.sponge.player;
import com.discordsrv.common.player.IOfflinePlayer;
import com.discordsrv.common.server.player.ServerPlayerProvider;
import com.discordsrv.common.player.ServerPlayerProvider;
import com.discordsrv.sponge.SpongeDiscordSRV;
import org.spongepowered.api.entity.living.player.User;
import org.spongepowered.api.entity.living.player.server.ServerPlayer;

2
sponge/src/main/java/com/discordsrv/sponge/scheduler/SpongeScheduler.java
View File

@ -18,7 +18,7 @@
package com.discordsrv.sponge.scheduler;
import com.discordsrv.common.server.scheduler.ServerScheduler;
import com.discordsrv.common.scheduler.ServerScheduler;
import com.discordsrv.common.scheduler.StandardScheduler;
import com.discordsrv.sponge.SpongeDiscordSRV;
import org.spongepowered.api.scheduler.TaskExecutorService;

3
velocity/build.gradle
View File

@ -24,7 +24,8 @@ dependencies {
implementation project(':common:common-api')
// Common
implementation project(':common:common-proxy')
implementation project(':common')
implementation project(':common:common-templates')
// Platform
annotationProcessor(libs.velocity)

2
velocity/src/main/java/com/discordsrv/velocity/VelocityDiscordSRV.java
View File

@ -26,7 +26,7 @@ import com.discordsrv.common.config.manager.MainConfigManager;
import com.discordsrv.common.debug.data.OnlineMode;
import com.discordsrv.common.plugin.PluginManager;
import com.discordsrv.common.scheduler.StandardScheduler;
import com.discordsrv.proxy.ProxyDiscordSRV;
import com.discordsrv.common.ProxyDiscordSRV;
import com.discordsrv.velocity.command.game.handler.VelocityCommandHandler;
import com.discordsrv.velocity.console.VelocityConsole;
import com.discordsrv.velocity.player.VelocityPlayerProvider;