Merge branch 'master' into April1

# Conflicts:
#	src/main/java/gg/archipelago/client/network/server/RoomInfoPacket.java

Author: KonoTyran

.gitignore

@@ -2,6 +2,5 @@
 /.gradle/
 /build/
 /build/classes/java/main/
-/gradle/
 /.idea/
 gradle.properties

build.gradle

@@ -7,22 +7,25 @@ plugins {
 
 archivesBaseName = "Archipelago.MultiClient.Java"
 group = 'gg.archipelago.APClient'
-version = '1.5'
+version = '1.9'
 
-java.toolchain.languageVersion = JavaLanguageVersion.of(16)
+java.toolchain.languageVersion = JavaLanguageVersion.of(8)
 
 logger.info('Java: {} JVM: {}({}}) Arch: {}',System.getProperty('java.version'),System.getProperty('java.vm.version'),System.getProperty('java.vendor'),System.getProperty('os.arch'))
 
 repositories {
     mavenCentral()
 }
 
+
 dependencies {
     implementation 'org.java-websocket:Java-WebSocket:1.5.2'
     implementation 'com.google.code.gson:gson:2.8.9'
+    implementation 'org.apache.httpcomponents.client5:httpclient5:5.2.1'
+    implementation 'org.apache.httpcomponents.core5:httpcore5:5.2'
 }
 
-task relocateShadowJar(type: ConfigureShadowRelocation) {
+tasks.register('relocateShadowJar', ConfigureShadowRelocation) {
     target = tasks.shadowJar
     prefix = "archipelagoClient" // Default value is "shadow"
 }

gradle/wrapper/gradle-wrapper.jar

@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-bin.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 pluginManagement {
     plugins {
-        id 'com.github.johnrengelman.shadow' version '6.0.0'
+        id 'com.github.johnrengelman.shadow' version '7.1.2'
     }
 }