From 52bfd46ebd5737aeaf5e3baaa479d70fea7eac90 Mon Sep 17 00:00:00 2001 From: DmitriyMX Date: Thu, 21 Mar 2019 17:45:38 +0300 Subject: [PATCH] move classes --- src/main/java/{ => dmx}/lwjake2/UnpackLoader.java | 2 +- src/main/java/{ => dmx}/lwjake2/UnpackTool.java | 3 +-- .../java/{ => dmx}/lwjake2/logger/log4j2/QConsoleAppender.java | 2 +- src/main/java/lwjake2/client/CL.java | 2 +- src/main/java/lwjake2/client/CL_parse.java | 3 +-- src/main/java/lwjake2/client/Menu.java | 2 +- src/main/java/lwjake2/client/SCR.java | 2 +- src/main/java/lwjake2/game/Cmd.java | 2 +- src/main/java/lwjake2/qcommon/CM.java | 2 +- src/main/java/lwjake2/qcommon/Qcommon.java | 2 +- src/main/java/lwjake2/render/lwjgl/Image.java | 2 +- src/main/java/lwjake2/render/lwjgl/Model.java | 3 +-- src/main/java/lwjake2/server/SV_CCMDS.java | 2 +- src/main/java/lwjake2/server/SV_USER.java | 2 +- src/main/java/lwjake2/sound/WaveLoader.java | 2 +- src/main/java/lwjake2/sound/lwjgl/LWJGLSoundImpl.java | 2 +- src/main/resources/log4j2.xml | 2 +- 17 files changed, 17 insertions(+), 20 deletions(-) rename src/main/java/{ => dmx}/lwjake2/UnpackLoader.java (98%) rename src/main/java/{ => dmx}/lwjake2/UnpackTool.java (98%) rename src/main/java/{ => dmx}/lwjake2/logger/log4j2/QConsoleAppender.java (97%) diff --git a/src/main/java/lwjake2/UnpackLoader.java b/src/main/java/dmx/lwjake2/UnpackLoader.java similarity index 98% rename from src/main/java/lwjake2/UnpackLoader.java rename to src/main/java/dmx/lwjake2/UnpackLoader.java index 40da0ee..ec1a9da 100644 --- a/src/main/java/lwjake2/UnpackLoader.java +++ b/src/main/java/dmx/lwjake2/UnpackLoader.java @@ -1,4 +1,4 @@ -package lwjake2; +package dmx.lwjake2; import lombok.Getter; import lombok.Setter; diff --git a/src/main/java/lwjake2/UnpackTool.java b/src/main/java/dmx/lwjake2/UnpackTool.java similarity index 98% rename from src/main/java/lwjake2/UnpackTool.java rename to src/main/java/dmx/lwjake2/UnpackTool.java index 8528d45..72ac096 100644 --- a/src/main/java/lwjake2/UnpackTool.java +++ b/src/main/java/dmx/lwjake2/UnpackTool.java @@ -1,4 +1,4 @@ -package lwjake2; +package dmx.lwjake2; import lombok.Value; import lombok.experimental.UtilityClass; @@ -6,7 +6,6 @@ import lombok.extern.slf4j.Slf4j; import java.io.FileNotFoundException; import java.io.IOException; -import java.io.InputStream; import java.io.RandomAccessFile; import java.util.*; diff --git a/src/main/java/lwjake2/logger/log4j2/QConsoleAppender.java b/src/main/java/dmx/lwjake2/logger/log4j2/QConsoleAppender.java similarity index 97% rename from src/main/java/lwjake2/logger/log4j2/QConsoleAppender.java rename to src/main/java/dmx/lwjake2/logger/log4j2/QConsoleAppender.java index aca5cee..ae3fd21 100644 --- a/src/main/java/lwjake2/logger/log4j2/QConsoleAppender.java +++ b/src/main/java/dmx/lwjake2/logger/log4j2/QConsoleAppender.java @@ -2,7 +2,7 @@ * DmitriyMX * 2017-05-12 */ -package lwjake2.logger.log4j2; +package dmx.lwjake2.logger.log4j2; import lwjake2.client.Console; import org.apache.logging.log4j.core.Filter; diff --git a/src/main/java/lwjake2/client/CL.java b/src/main/java/lwjake2/client/CL.java index 589b2be..461a1e8 100644 --- a/src/main/java/lwjake2/client/CL.java +++ b/src/main/java/lwjake2/client/CL.java @@ -31,7 +31,7 @@ import lwjake2.qcommon.CM; import lwjake2.qcommon.Cbuf; import lwjake2.qcommon.Com; import lwjake2.qcommon.Cvar; -import lwjake2.UnpackLoader; +import dmx.lwjake2.UnpackLoader; import lwjake2.qcommon.MSG; import lwjake2.qcommon.Netchan; import lwjake2.qcommon.SZ; diff --git a/src/main/java/lwjake2/client/CL_parse.java b/src/main/java/lwjake2/client/CL_parse.java index 560a0dd..02d66ac 100644 --- a/src/main/java/lwjake2/client/CL_parse.java +++ b/src/main/java/lwjake2/client/CL_parse.java @@ -29,8 +29,7 @@ import lwjake2.qcommon.CM; import lwjake2.qcommon.Cbuf; import lwjake2.qcommon.Com; import lwjake2.qcommon.Cvar; -import lwjake2.qcommon.FileSystem; -import lwjake2.UnpackLoader; +import dmx.lwjake2.UnpackLoader; import lwjake2.qcommon.MSG; import lwjake2.qcommon.SZ; import lwjake2.render.model_t; diff --git a/src/main/java/lwjake2/client/Menu.java b/src/main/java/lwjake2/client/Menu.java index a648eb1..01c63bc 100644 --- a/src/main/java/lwjake2/client/Menu.java +++ b/src/main/java/lwjake2/client/Menu.java @@ -19,7 +19,7 @@ package lwjake2.client; import lwjake2.Globals; -import lwjake2.UnpackLoader; +import dmx.lwjake2.UnpackLoader; import lwjake2.game.Cmd; import lwjake2.game.cvar_t; import lwjake2.qcommon.*; diff --git a/src/main/java/lwjake2/client/SCR.java b/src/main/java/lwjake2/client/SCR.java index 46c7665..3d1edbf 100644 --- a/src/main/java/lwjake2/client/SCR.java +++ b/src/main/java/lwjake2/client/SCR.java @@ -21,7 +21,7 @@ package lwjake2.client; import lombok.extern.slf4j.Slf4j; import lwjake2.Defines; import lwjake2.Globals; -import lwjake2.UnpackLoader; +import dmx.lwjake2.UnpackLoader; import lwjake2.game.Cmd; import lwjake2.game.cvar_t; import lwjake2.qcommon.*; diff --git a/src/main/java/lwjake2/game/Cmd.java b/src/main/java/lwjake2/game/Cmd.java index a556cf8..531477b 100644 --- a/src/main/java/lwjake2/game/Cmd.java +++ b/src/main/java/lwjake2/game/Cmd.java @@ -21,7 +21,7 @@ package lwjake2.game; import lombok.extern.slf4j.Slf4j; import lwjake2.Defines; import lwjake2.Globals; -import lwjake2.UnpackLoader; +import dmx.lwjake2.UnpackLoader; import lwjake2.game.monsters.M_Player; import lwjake2.qcommon.*; import lwjake2.server.SV_GAME; diff --git a/src/main/java/lwjake2/qcommon/CM.java b/src/main/java/lwjake2/qcommon/CM.java index 07b4821..5cd56e9 100644 --- a/src/main/java/lwjake2/qcommon/CM.java +++ b/src/main/java/lwjake2/qcommon/CM.java @@ -21,7 +21,7 @@ package lwjake2.qcommon; import lwjake2.Defines; import lwjake2.ErrorCode; import lwjake2.Globals; -import lwjake2.UnpackLoader; +import dmx.lwjake2.UnpackLoader; import lwjake2.game.cmodel_t; import lwjake2.game.cplane_t; import lwjake2.game.cvar_t; diff --git a/src/main/java/lwjake2/qcommon/Qcommon.java b/src/main/java/lwjake2/qcommon/Qcommon.java index 3ba914a..38dca74 100644 --- a/src/main/java/lwjake2/qcommon/Qcommon.java +++ b/src/main/java/lwjake2/qcommon/Qcommon.java @@ -20,7 +20,7 @@ package lwjake2.qcommon; import lombok.extern.slf4j.Slf4j; import lwjake2.Globals; -import lwjake2.UnpackLoader; +import dmx.lwjake2.UnpackLoader; import lwjake2.client.CL; import lwjake2.client.Key; import lwjake2.client.SCR; diff --git a/src/main/java/lwjake2/render/lwjgl/Image.java b/src/main/java/lwjake2/render/lwjgl/Image.java index 0e93436..8cf2aec 100644 --- a/src/main/java/lwjake2/render/lwjgl/Image.java +++ b/src/main/java/lwjake2/render/lwjgl/Image.java @@ -20,7 +20,7 @@ package lwjake2.render.lwjgl; import lwjake2.Defines; import lwjake2.ErrorCode; -import lwjake2.UnpackLoader; +import dmx.lwjake2.UnpackLoader; import lwjake2.client.VID; import lwjake2.client.particle_t; import lwjake2.game.cvar_t; diff --git a/src/main/java/lwjake2/render/lwjgl/Model.java b/src/main/java/lwjake2/render/lwjgl/Model.java index 5d68418..d29f21e 100644 --- a/src/main/java/lwjake2/render/lwjgl/Model.java +++ b/src/main/java/lwjake2/render/lwjgl/Model.java @@ -25,8 +25,7 @@ import lwjake2.game.cplane_t; import lwjake2.game.cvar_t; import lwjake2.qcommon.Com; import lwjake2.qcommon.Cvar; -import lwjake2.qcommon.FileSystem; -import lwjake2.UnpackLoader; +import dmx.lwjake2.UnpackLoader; import lwjake2.qcommon.lump_t; import lwjake2.qcommon.qfiles; import lwjake2.qcommon.texinfo_t; diff --git a/src/main/java/lwjake2/server/SV_CCMDS.java b/src/main/java/lwjake2/server/SV_CCMDS.java index 24d588a..46712b4 100644 --- a/src/main/java/lwjake2/server/SV_CCMDS.java +++ b/src/main/java/lwjake2/server/SV_CCMDS.java @@ -31,7 +31,7 @@ import lwjake2.qcommon.CM; import lwjake2.qcommon.Com; import lwjake2.qcommon.Cvar; import lwjake2.qcommon.FileSystem; -import lwjake2.UnpackLoader; +import dmx.lwjake2.UnpackLoader; import lwjake2.qcommon.MSG; import lwjake2.qcommon.Netchan; import lwjake2.qcommon.SZ; diff --git a/src/main/java/lwjake2/server/SV_USER.java b/src/main/java/lwjake2/server/SV_USER.java index 4332a03..f2461ea 100644 --- a/src/main/java/lwjake2/server/SV_USER.java +++ b/src/main/java/lwjake2/server/SV_USER.java @@ -21,7 +21,7 @@ package lwjake2.server; import lwjake2.Defines; import lwjake2.ErrorCode; import lwjake2.Globals; -import lwjake2.UnpackLoader; +import dmx.lwjake2.UnpackLoader; import lwjake2.game.Cmd; import lwjake2.game.GameBase; import lwjake2.game.Info; diff --git a/src/main/java/lwjake2/sound/WaveLoader.java b/src/main/java/lwjake2/sound/WaveLoader.java index ab472dd..1bfdf07 100644 --- a/src/main/java/lwjake2/sound/WaveLoader.java +++ b/src/main/java/lwjake2/sound/WaveLoader.java @@ -21,7 +21,7 @@ package lwjake2.sound; import lombok.extern.slf4j.Slf4j; import lwjake2.Defines; import lwjake2.ErrorCode; -import lwjake2.UnpackLoader; +import dmx.lwjake2.UnpackLoader; import lwjake2.qcommon.Com; /** diff --git a/src/main/java/lwjake2/sound/lwjgl/LWJGLSoundImpl.java b/src/main/java/lwjake2/sound/lwjgl/LWJGLSoundImpl.java index 7297347..6c9f683 100644 --- a/src/main/java/lwjake2/sound/lwjgl/LWJGLSoundImpl.java +++ b/src/main/java/lwjake2/sound/lwjgl/LWJGLSoundImpl.java @@ -22,7 +22,7 @@ import lombok.extern.slf4j.Slf4j; import lwjake2.Defines; import lwjake2.ErrorCode; import lwjake2.Globals; -import lwjake2.UnpackLoader; +import dmx.lwjake2.UnpackLoader; import lwjake2.game.Cmd; import lwjake2.game.GameBase; import lwjake2.game.cvar_t; diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml index 2692573..60fc599 100644 --- a/src/main/resources/log4j2.xml +++ b/src/main/resources/log4j2.xml @@ -1,5 +1,5 @@  - +