Move HttpHelper

AlexProgrammerDE · Feb 24, 2024 · 8f27552 · 8f27552
1 parent 04e95aa
commit 8f27552
Show file tree

Hide file tree

Showing 8 changed files with 7 additions and 8 deletions.
diff --git a/src/main/java/net/pistonmaster/soulfire/account/service/SFBedrockMicrosoftAuthService.java b/src/main/java/net/pistonmaster/soulfire/account/service/SFBedrockMicrosoftAuthService.java
@@ -19,9 +19,9 @@
 
 import java.io.IOException;
 import net.pistonmaster.soulfire.account.AuthType;
-import net.pistonmaster.soulfire.account.HttpHelper;
 import net.pistonmaster.soulfire.account.MinecraftAccount;
 import net.pistonmaster.soulfire.proxy.SFProxy;
+import net.pistonmaster.soulfire.util.HttpHelper;
 import net.raphimc.minecraftauth.MinecraftAuth;
 import net.raphimc.minecraftauth.step.msa.StepCredentialsMsaCode;
 import org.apache.commons.validator.routines.EmailValidator;

diff --git a/src/main/java/net/pistonmaster/soulfire/account/service/SFEasyMCAuthService.java b/src/main/java/net/pistonmaster/soulfire/account/service/SFEasyMCAuthService.java
@@ -23,10 +23,10 @@
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 import net.pistonmaster.soulfire.account.AuthType;
-import net.pistonmaster.soulfire.account.HttpHelper;
 import net.pistonmaster.soulfire.account.MinecraftAccount;
 import net.pistonmaster.soulfire.proxy.SFProxy;
 import net.pistonmaster.soulfire.util.GsonInstance;
+import net.pistonmaster.soulfire.util.HttpHelper;
 import reactor.core.publisher.Flux;
 import reactor.netty.ByteBufFlux;
 

diff --git a/src/main/java/net/pistonmaster/soulfire/account/service/SFJavaMicrosoftAuthService.java b/src/main/java/net/pistonmaster/soulfire/account/service/SFJavaMicrosoftAuthService.java
@@ -19,9 +19,9 @@
 
 import java.io.IOException;
 import net.pistonmaster.soulfire.account.AuthType;
-import net.pistonmaster.soulfire.account.HttpHelper;
 import net.pistonmaster.soulfire.account.MinecraftAccount;
 import net.pistonmaster.soulfire.proxy.SFProxy;
+import net.pistonmaster.soulfire.util.HttpHelper;
 import net.raphimc.minecraftauth.MinecraftAuth;
 import net.raphimc.minecraftauth.step.msa.StepCredentialsMsaCode;
 import org.apache.commons.validator.routines.EmailValidator;

diff --git a/src/main/java/net/pistonmaster/soulfire/account/service/SFTheAlteningAuthService.java b/src/main/java/net/pistonmaster/soulfire/account/service/SFTheAlteningAuthService.java
@@ -23,11 +23,11 @@
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import net.pistonmaster.soulfire.account.AuthType;
-import net.pistonmaster.soulfire.account.HttpHelper;
 import net.pistonmaster.soulfire.account.MinecraftAccount;
 import net.pistonmaster.soulfire.proxy.SFProxy;
 import net.pistonmaster.soulfire.server.util.UUIDHelper;
 import net.pistonmaster.soulfire.util.GsonInstance;
+import net.pistonmaster.soulfire.util.HttpHelper;
 import reactor.core.publisher.Flux;
 import reactor.netty.ByteBufFlux;
 

diff --git a/src/main/java/net/pistonmaster/soulfire/client/gui/libs/PastesDevService.java b/src/main/java/net/pistonmaster/soulfire/client/gui/libs/PastesDevService.java
@@ -19,8 +19,8 @@
 
 import java.net.URI;
 import lombok.extern.slf4j.Slf4j;
-import net.pistonmaster.soulfire.account.HttpHelper;
 import net.pistonmaster.soulfire.util.GsonInstance;
+import net.pistonmaster.soulfire.util.HttpHelper;
 import reactor.core.publisher.Flux;
 import reactor.netty.ByteBufFlux;
 

diff --git a/src/main/java/net/pistonmaster/soulfire/server/protocol/SFSessionService.java b/src/main/java/net/pistonmaster/soulfire/server/protocol/SFSessionService.java
@@ -27,10 +27,10 @@
 import javax.crypto.SecretKey;
 import lombok.AllArgsConstructor;
 import net.pistonmaster.soulfire.account.AuthType;
-import net.pistonmaster.soulfire.account.HttpHelper;
 import net.pistonmaster.soulfire.proxy.SFProxy;
 import net.pistonmaster.soulfire.server.util.UUIDHelper;
 import net.pistonmaster.soulfire.util.GsonInstance;
+import net.pistonmaster.soulfire.util.HttpHelper;
 import reactor.core.publisher.Flux;
 import reactor.netty.ByteBufFlux;
 

diff --git a/...onmaster/soulfire/account/HttpHelper.java → ...istonmaster/soulfire/util/HttpHelper.java b/...onmaster/soulfire/account/HttpHelper.java → ...istonmaster/soulfire/util/HttpHelper.java
@@ -15,7 +15,7 @@
  * 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 net.pistonmaster.soulfire.account;
+package net.pistonmaster.soulfire.util;
 
 import io.netty.handler.codec.http.HttpHeaders;
 import io.netty.handler.codec.http.HttpMethod;

diff --git a/src/main/java/net/pistonmaster/soulfire/util/SFUpdateChecker.java b/src/main/java/net/pistonmaster/soulfire/util/SFUpdateChecker.java
@@ -22,7 +22,6 @@
 import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
 import lombok.extern.slf4j.Slf4j;
-import net.pistonmaster.soulfire.account.HttpHelper;
 import net.pistonmaster.soulfire.builddata.BuildData;
 import net.pistonmaster.soulfire.server.util.VersionComparator;
 import reactor.core.publisher.Mono;