From 06504fda2458a424270c6a45f7ebde59bb9870b8 Mon Sep 17 00:00:00 2001 From: Kevin Turner <83819+keturn@users.noreply.github.com> Date: Sat, 6 Mar 2021 20:08:47 -0800 Subject: [PATCH] refactor: move DiscordRPC to org.terasology.subsystem (#4562) to indicate it is not in engine itself Co-authored-by: Michael Pollind --- facades/PC/src/main/java/org/terasology/engine/Terasology.java | 2 +- .../{engine => }/subsystem/discordrpc/DiscordRPCBuffer.java | 2 +- .../{engine => }/subsystem/discordrpc/DiscordRPCSubSystem.java | 2 +- .../{engine => }/subsystem/discordrpc/DiscordRPCSystem.java | 2 +- .../{engine => }/subsystem/discordrpc/DiscordRPCThread.java | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) rename subsystems/DiscordRPC/src/main/java/org/terasology/{engine => }/subsystem/discordrpc/DiscordRPCBuffer.java (98%) rename subsystems/DiscordRPC/src/main/java/org/terasology/{engine => }/subsystem/discordrpc/DiscordRPCSubSystem.java (98%) rename subsystems/DiscordRPC/src/main/java/org/terasology/{engine => }/subsystem/discordrpc/DiscordRPCSystem.java (98%) rename subsystems/DiscordRPC/src/main/java/org/terasology/{engine => }/subsystem/discordrpc/DiscordRPCThread.java (99%) diff --git a/facades/PC/src/main/java/org/terasology/engine/Terasology.java b/facades/PC/src/main/java/org/terasology/engine/Terasology.java index 608b9fd22..5b4135af9 100644 --- a/facades/PC/src/main/java/org/terasology/engine/Terasology.java +++ b/facades/PC/src/main/java/org/terasology/engine/Terasology.java @@ -18,7 +18,6 @@ import org.terasology.engine.subsystem.common.ConfigurationSubsystem; import org.terasology.engine.subsystem.common.ThreadManager; import org.terasology.engine.subsystem.common.hibernation.HibernationSubsystem; import org.terasology.engine.subsystem.config.BindsSubsystem; -import org.terasology.engine.subsystem.discordrpc.DiscordRPCSubSystem; import org.terasology.engine.subsystem.headless.HeadlessAudio; import org.terasology.engine.subsystem.headless.HeadlessGraphics; import org.terasology.engine.subsystem.headless.HeadlessInput; @@ -36,6 +35,7 @@ import org.terasology.rendering.nui.layers.mainMenu.savedGames.GameInfo; import org.terasology.rendering.nui.layers.mainMenu.savedGames.GameProvider; import org.terasology.splash.SplashScreen; import org.terasology.splash.SplashScreenBuilder; +import org.terasology.subsystem.discordrpc.DiscordRPCSubSystem; import java.awt.GraphicsEnvironment; import java.io.IOException; diff --git a/subsystems/DiscordRPC/src/main/java/org/terasology/engine/subsystem/discordrpc/DiscordRPCBuffer.java b/subsystems/DiscordRPC/src/main/java/org/terasology/subsystem/discordrpc/DiscordRPCBuffer.java similarity index 98% rename from subsystems/DiscordRPC/src/main/java/org/terasology/engine/subsystem/discordrpc/DiscordRPCBuffer.java rename to subsystems/DiscordRPC/src/main/java/org/terasology/subsystem/discordrpc/DiscordRPCBuffer.java index 9e5428cba..3ed3c9654 100644 --- a/subsystems/DiscordRPC/src/main/java/org/terasology/engine/subsystem/discordrpc/DiscordRPCBuffer.java +++ b/subsystems/DiscordRPC/src/main/java/org/terasology/subsystem/discordrpc/DiscordRPCBuffer.java @@ -1,7 +1,7 @@ // Copyright 2020 The Terasology Foundation // SPDX-License-Identifier: Apache-2.0 -package org.terasology.engine.subsystem.discordrpc; +package org.terasology.subsystem.discordrpc; import java.time.OffsetDateTime; diff --git a/subsystems/DiscordRPC/src/main/java/org/terasology/engine/subsystem/discordrpc/DiscordRPCSubSystem.java b/subsystems/DiscordRPC/src/main/java/org/terasology/subsystem/discordrpc/DiscordRPCSubSystem.java similarity index 98% rename from subsystems/DiscordRPC/src/main/java/org/terasology/engine/subsystem/discordrpc/DiscordRPCSubSystem.java rename to subsystems/DiscordRPC/src/main/java/org/terasology/subsystem/discordrpc/DiscordRPCSubSystem.java index d9b13e824..2e495dde1 100644 --- a/subsystems/DiscordRPC/src/main/java/org/terasology/engine/subsystem/discordrpc/DiscordRPCSubSystem.java +++ b/subsystems/DiscordRPC/src/main/java/org/terasology/subsystem/discordrpc/DiscordRPCSubSystem.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.terasology.engine.subsystem.discordrpc; +package org.terasology.subsystem.discordrpc; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/subsystems/DiscordRPC/src/main/java/org/terasology/engine/subsystem/discordrpc/DiscordRPCSystem.java b/subsystems/DiscordRPC/src/main/java/org/terasology/subsystem/discordrpc/DiscordRPCSystem.java similarity index 98% rename from subsystems/DiscordRPC/src/main/java/org/terasology/engine/subsystem/discordrpc/DiscordRPCSystem.java rename to subsystems/DiscordRPC/src/main/java/org/terasology/subsystem/discordrpc/DiscordRPCSystem.java index ccd210c80..eb178ea84 100644 --- a/subsystems/DiscordRPC/src/main/java/org/terasology/engine/subsystem/discordrpc/DiscordRPCSystem.java +++ b/subsystems/DiscordRPC/src/main/java/org/terasology/subsystem/discordrpc/DiscordRPCSystem.java @@ -1,6 +1,6 @@ // Copyright 2020 The Terasology Foundation // SPDX-License-Identifier: Apache-2.0 -package org.terasology.engine.subsystem.discordrpc; +package org.terasology.subsystem.discordrpc; import org.terasology.entitySystem.entity.EntityManager; import org.terasology.entitySystem.entity.EntityRef; diff --git a/subsystems/DiscordRPC/src/main/java/org/terasology/engine/subsystem/discordrpc/DiscordRPCThread.java b/subsystems/DiscordRPC/src/main/java/org/terasology/subsystem/discordrpc/DiscordRPCThread.java similarity index 99% rename from subsystems/DiscordRPC/src/main/java/org/terasology/engine/subsystem/discordrpc/DiscordRPCThread.java rename to subsystems/DiscordRPC/src/main/java/org/terasology/subsystem/discordrpc/DiscordRPCThread.java index 85f651f41..89b67ddb9 100644 --- a/subsystems/DiscordRPC/src/main/java/org/terasology/engine/subsystem/discordrpc/DiscordRPCThread.java +++ b/subsystems/DiscordRPC/src/main/java/org/terasology/subsystem/discordrpc/DiscordRPCThread.java @@ -1,7 +1,7 @@ // Copyright 2020 The Terasology Foundation // SPDX-License-Identifier: Apache-2.0 -package org.terasology.engine.subsystem.discordrpc; +package org.terasology.subsystem.discordrpc; import com.jagrosh.discordipc.IPCClient; import com.jagrosh.discordipc.IPCListener;