diff --git a/lombok.config b/lombok.config index f0040bf9..53612095 100644 --- a/lombok.config +++ b/lombok.config @@ -1,3 +1,3 @@ lombok.getter.noIsPrefix=true lombok.log.fieldName=log -lombok.log.custom.declaration=org.slf4j.Logger dev.zenfyr.andromeda.util.Util.logger() \ No newline at end of file +lombok.log.custom.declaration=org.slf4j.Logger dev.zenfyr.andromeda.bootstrap.util.Util.logger() \ No newline at end of file diff --git a/src/main/java/dev/zenfyr/andromeda/bootstrap/ModuleManager.java b/src/main/java/dev/zenfyr/andromeda/bootstrap/ModuleManager.java index c515480e..3ce23d5b 100644 --- a/src/main/java/dev/zenfyr/andromeda/bootstrap/ModuleManager.java +++ b/src/main/java/dev/zenfyr/andromeda/bootstrap/ModuleManager.java @@ -6,9 +6,7 @@ import dev.zenfyr.andromeda.bootstrap.config.handler.ModConfigHandler; import dev.zenfyr.andromeda.bootstrap.event.BootstrapConfigEvent; import dev.zenfyr.andromeda.bootstrap.event.PostBootstrapEvent; import dev.zenfyr.andromeda.bootstrap.event.PostModuleInitEvent; -import dev.zenfyr.andromeda.bootstrap.util.Debug; -import dev.zenfyr.andromeda.bootstrap.util.Environment; -import dev.zenfyr.andromeda.bootstrap.util.NetUtils; +import dev.zenfyr.andromeda.bootstrap.util.*; import dev.zenfyr.andromeda.bootstrap.util.mixin.AndromedaMixinPlugin; import dev.zenfyr.andromeda.modules.ModuleDiscovery; import dev.zenfyr.andromeda.util.*; diff --git a/src/main/java/dev/zenfyr/andromeda/bootstrap/config/handler/BootstrapConfigHandler.java b/src/main/java/dev/zenfyr/andromeda/bootstrap/config/handler/BootstrapConfigHandler.java index 579e244f..8e2c37aa 100644 --- a/src/main/java/dev/zenfyr/andromeda/bootstrap/config/handler/BootstrapConfigHandler.java +++ b/src/main/java/dev/zenfyr/andromeda/bootstrap/config/handler/BootstrapConfigHandler.java @@ -9,7 +9,7 @@ import com.google.gson.JsonParser; import dev.zenfyr.andromeda.bootstrap.Module; import dev.zenfyr.andromeda.bootstrap.ModuleHelper; import dev.zenfyr.andromeda.bootstrap.config.BootstrapConfig; -import dev.zenfyr.andromeda.util.Util; +import dev.zenfyr.andromeda.bootstrap.util.Util; import dev.zenfyr.pulsar.api.platform.Platform; import java.io.IOException; import java.nio.file.Files; diff --git a/src/main/java/dev/zenfyr/andromeda/bootstrap/config/handler/ModConfigHandler.java b/src/main/java/dev/zenfyr/andromeda/bootstrap/config/handler/ModConfigHandler.java index caf8fab8..a9594d93 100644 --- a/src/main/java/dev/zenfyr/andromeda/bootstrap/config/handler/ModConfigHandler.java +++ b/src/main/java/dev/zenfyr/andromeda/bootstrap/config/handler/ModConfigHandler.java @@ -9,7 +9,7 @@ import dev.zenfyr.andromeda.bootstrap.config.BaseConfig; import dev.zenfyr.andromeda.bootstrap.config.ModInitConfig; import dev.zenfyr.andromeda.bootstrap.util.Debug; import dev.zenfyr.andromeda.bootstrap.util.NetUtils; -import dev.zenfyr.andromeda.util.Util; +import dev.zenfyr.andromeda.bootstrap.util.Util; import dev.zenfyr.pulsar.api.platform.Platform; import java.io.IOException; import java.lang.reflect.InvocationTargetException; diff --git a/src/main/java/dev/zenfyr/andromeda/bootstrap/util/Debug.java b/src/main/java/dev/zenfyr/andromeda/bootstrap/util/Debug.java index bb05e930..d28a592e 100644 --- a/src/main/java/dev/zenfyr/andromeda/bootstrap/util/Debug.java +++ b/src/main/java/dev/zenfyr/andromeda/bootstrap/util/Debug.java @@ -4,7 +4,6 @@ import dev.zenfyr.andromeda.bootstrap.Module; import dev.zenfyr.andromeda.bootstrap.ModuleHelper; import dev.zenfyr.andromeda.bootstrap.config.BaseConfig; import dev.zenfyr.andromeda.bootstrap.config.handler.ModConfigHandler; -import dev.zenfyr.andromeda.util.Util; import dev.zenfyr.pulsar.api.platform.Platform; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/dev/zenfyr/andromeda/util/InstanceDataHolder.java b/src/main/java/dev/zenfyr/andromeda/bootstrap/util/InstanceDataHolder.java similarity index 98% rename from src/main/java/dev/zenfyr/andromeda/util/InstanceDataHolder.java rename to src/main/java/dev/zenfyr/andromeda/bootstrap/util/InstanceDataHolder.java index b9280e42..573f27cb 100644 --- a/src/main/java/dev/zenfyr/andromeda/util/InstanceDataHolder.java +++ b/src/main/java/dev/zenfyr/andromeda/bootstrap/util/InstanceDataHolder.java @@ -1,4 +1,4 @@ -package dev.zenfyr.andromeda.util; +package dev.zenfyr.andromeda.bootstrap.util; import com.google.gson.*; import dev.zenfyr.pulsar.api.util.MakeSure; diff --git a/src/main/java/dev/zenfyr/andromeda/bootstrap/util/NetUtils.java b/src/main/java/dev/zenfyr/andromeda/bootstrap/util/NetUtils.java index 4742eba4..04534fee 100644 --- a/src/main/java/dev/zenfyr/andromeda/bootstrap/util/NetUtils.java +++ b/src/main/java/dev/zenfyr/andromeda/bootstrap/util/NetUtils.java @@ -4,7 +4,6 @@ import dev.zenfyr.andromeda.bootstrap.ModuleManager; import dev.zenfyr.andromeda.bootstrap.config.BaseConfig; import dev.zenfyr.andromeda.bootstrap.config.handler.ModConfigHandler; import dev.zenfyr.andromeda.util.AndromedaConstants; -import dev.zenfyr.andromeda.util.Util; import java.net.http.HttpClient; import java.time.Duration; import lombok.CustomLog; diff --git a/src/main/java/dev/zenfyr/andromeda/util/Util.java b/src/main/java/dev/zenfyr/andromeda/bootstrap/util/Util.java similarity index 97% rename from src/main/java/dev/zenfyr/andromeda/util/Util.java rename to src/main/java/dev/zenfyr/andromeda/bootstrap/util/Util.java index a296e179..eafb7de7 100644 --- a/src/main/java/dev/zenfyr/andromeda/util/Util.java +++ b/src/main/java/dev/zenfyr/andromeda/bootstrap/util/Util.java @@ -1,4 +1,4 @@ -package dev.zenfyr.andromeda.util; +package dev.zenfyr.andromeda.bootstrap.util; import static dev.zenfyr.andromeda.util.AndromedaConstants.MODID; diff --git a/src/main/java/dev/zenfyr/andromeda/bootstrap/util/mixin/AndromedaMixinPlugin.java b/src/main/java/dev/zenfyr/andromeda/bootstrap/util/mixin/AndromedaMixinPlugin.java index 7881c858..0c5cb271 100644 --- a/src/main/java/dev/zenfyr/andromeda/bootstrap/util/mixin/AndromedaMixinPlugin.java +++ b/src/main/java/dev/zenfyr/andromeda/bootstrap/util/mixin/AndromedaMixinPlugin.java @@ -1,7 +1,7 @@ package dev.zenfyr.andromeda.bootstrap.util.mixin; import dev.zenfyr.andromeda.bootstrap.ModuleManager; -import dev.zenfyr.andromeda.util.Util; +import dev.zenfyr.andromeda.bootstrap.util.Util; import dev.zenfyr.pulsar.api.mixin.AsmUtil; import dev.zenfyr.pulsar.api.platform.Platform; import java.io.IOException; diff --git a/src/main/java/dev/zenfyr/andromeda/common/config/DataConfigs.java b/src/main/java/dev/zenfyr/andromeda/common/config/DataConfigs.java index 4df9e49b..7c9bddec 100644 --- a/src/main/java/dev/zenfyr/andromeda/common/config/DataConfigs.java +++ b/src/main/java/dev/zenfyr/andromeda/common/config/DataConfigs.java @@ -7,9 +7,9 @@ import dev.zenfyr.andromeda.bootstrap.Module; import dev.zenfyr.andromeda.bootstrap.ModuleManager; import dev.zenfyr.andromeda.bootstrap.config.BaseConfig; import dev.zenfyr.andromeda.bootstrap.config.ConfigDefinition; +import dev.zenfyr.andromeda.bootstrap.util.Util; import dev.zenfyr.andromeda.common.Andromeda; import dev.zenfyr.andromeda.common.config.handler.GameConfigHandler; -import dev.zenfyr.andromeda.util.Util; import dev.zenfyr.pulsar.api.codec.JsonCodecDataLoader; import dev.zenfyr.pulsar.api.resources.ReloadListenerType; import dev.zenfyr.pulsar.api.resources.ServerReloadListenersEvent; diff --git a/src/main/java/dev/zenfyr/andromeda/common/config/handler/AbstractConfigHandler.java b/src/main/java/dev/zenfyr/andromeda/common/config/handler/AbstractConfigHandler.java index 0699bc83..4e52ca58 100644 --- a/src/main/java/dev/zenfyr/andromeda/common/config/handler/AbstractConfigHandler.java +++ b/src/main/java/dev/zenfyr/andromeda/common/config/handler/AbstractConfigHandler.java @@ -11,8 +11,8 @@ import dev.zenfyr.andromeda.bootstrap.config.BaseConfig; import dev.zenfyr.andromeda.bootstrap.config.ConfigDefinition; import dev.zenfyr.andromeda.bootstrap.config.RegisterConfigEvent; import dev.zenfyr.andromeda.bootstrap.event.EventMarker; +import dev.zenfyr.andromeda.bootstrap.util.Util; import dev.zenfyr.andromeda.common.Andromeda; -import dev.zenfyr.andromeda.util.Util; import java.io.IOException; import java.lang.reflect.InvocationTargetException; import java.nio.file.Files; diff --git a/src/main/java/dev/zenfyr/andromeda/modules/misc/translations/Client.java b/src/main/java/dev/zenfyr/andromeda/modules/misc/translations/Client.java index c10f8585..3fd1887c 100644 --- a/src/main/java/dev/zenfyr/andromeda/modules/misc/translations/Client.java +++ b/src/main/java/dev/zenfyr/andromeda/modules/misc/translations/Client.java @@ -3,8 +3,8 @@ package dev.zenfyr.andromeda.modules.misc.translations; import com.google.common.collect.Sets; import dev.zenfyr.andromeda.bootstrap.ModuleManager; import dev.zenfyr.andromeda.bootstrap.util.NetUtils; +import dev.zenfyr.andromeda.bootstrap.util.Util; import dev.zenfyr.andromeda.common.client.AndromedaClient; -import dev.zenfyr.andromeda.util.Util; import java.io.IOException; import java.net.URI; import java.net.http.HttpRequest; diff --git a/src/main/java/dev/zenfyr/andromeda/modules/misc/translations/Translations.java b/src/main/java/dev/zenfyr/andromeda/modules/misc/translations/Translations.java index c74be030..218add92 100644 --- a/src/main/java/dev/zenfyr/andromeda/modules/misc/translations/Translations.java +++ b/src/main/java/dev/zenfyr/andromeda/modules/misc/translations/Translations.java @@ -9,7 +9,7 @@ import dev.zenfyr.andromeda.bootstrap.event.CreateBootstrapConfigEvent; import dev.zenfyr.andromeda.bootstrap.event.InitEvents; import dev.zenfyr.andromeda.bootstrap.event.PostBootstrapEvent; import dev.zenfyr.andromeda.bootstrap.util.Environment; -import dev.zenfyr.andromeda.util.Util; +import dev.zenfyr.andromeda.bootstrap.util.Util; import dev.zenfyr.pulsar.api.platform.Platform; import java.nio.file.Path;