Skip to content

Commit 916e4e9

Browse files
committed
More platform cleanup
Signed-off-by: FlorianMichael <[email protected]>
1 parent 7181674 commit 916e4e9

File tree

13 files changed

+30
-217
lines changed

13 files changed

+30
-217
lines changed

build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ dependencies {
6868
implementation(kotlin("stdlib-jdk8"))
6969
implementation(kotlin("reflect"))
7070

71-
val vvVer = "5.7.1"
71+
val vvVer = "5.7.2-SNAPSHOT"
7272
val vbVer = "5.7.1"
7373
val vrVer = "4.0.14"
7474
val vafVer = "4.0.8"

src/main/java/com/viaversion/aas/handler/ViaCodec.java

Lines changed: 0 additions & 52 deletions
This file was deleted.

src/main/java/com/viaversion/aas/platform/AspirinAprilFools.java

Lines changed: 0 additions & 24 deletions
This file was deleted.

src/main/java/com/viaversion/aas/platform/AspirinBackwards.java

Lines changed: 0 additions & 29 deletions
This file was deleted.
Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,18 @@
11
package com.viaversion.aas.platform;
22

33
import com.viaversion.viaversion.platform.NoopInjector;
4+
import com.viaversion.viaversion.platform.ViaCodecHandler;
45

56
public class AspirinInjector extends NoopInjector {
6-
@Override
7-
public String getEncoderName() {
8-
return getDecoderName();
9-
}
107

11-
@Override
12-
public String getDecoderName() {
13-
return "via-codec";
14-
}
8+
@Override
9+
public String getEncoderName() {
10+
return ViaCodecHandler.NAME;
11+
}
12+
13+
@Override
14+
public String getDecoderName() {
15+
return ViaCodecHandler.NAME;
16+
}
1517

1618
}

src/main/java/com/viaversion/aas/platform/AspirinLegacy.java

Lines changed: 0 additions & 24 deletions
This file was deleted.

src/main/java/com/viaversion/aas/platform/AspirinLoader.java renamed to src/main/java/com/viaversion/aas/platform/AspirinPlatformLoader.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@
99
import net.raphimc.vialegacy.protocol.release.r1_6_4tor1_7_2_5.provider.EncryptionProvider;
1010
import net.raphimc.vialegacy.protocol.release.r1_7_6_10tor1_8.provider.GameProfileFetcher;
1111

12-
public class AspirinLoader implements ViaPlatformLoader {
12+
public class AspirinPlatformLoader implements ViaPlatformLoader {
13+
1314
@Override
1415
public void load() {
1516
Via.getManager().getProviders().use(VersionProvider.class, new AspirinVersionProvider());
@@ -26,4 +27,5 @@ public void load() {
2627
@Override
2728
public void unload() {
2829
}
30+
2931
}

src/main/java/com/viaversion/aas/platform/AspirinRewind.java

Lines changed: 0 additions & 24 deletions
This file was deleted.

src/main/java/com/viaversion/aas/platform/FutureTask.java

Lines changed: 0 additions & 19 deletions
This file was deleted.

src/main/kotlin/com/viaversion/aas/VIAaaS.kt

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,16 @@ package com.viaversion.aas
33
import com.viaversion.aas.command.CommandManager
44
import com.viaversion.aas.command.VIAaaSConsole
55
import com.viaversion.aas.config.VIAaaSConfig
6-
import com.viaversion.aas.platform.AspirinAprilFools
7-
import com.viaversion.aas.platform.AspirinBackwards
8-
import com.viaversion.aas.platform.AspirinLegacy
96
import com.viaversion.aas.platform.AspirinPlatform
10-
import com.viaversion.aas.platform.AspirinRewind
11-
import com.viaversion.aas.protocol.registerAspirinProtocols
127
import com.viaversion.aas.web.ViaWebApp
8+
import com.viaversion.viaaprilfools.ViaAprilFoolsPlatformImpl
9+
import com.viaversion.viabackwards.ViaBackwardsPlatformImpl
10+
import com.viaversion.viarewind.ViaRewindPlatformImpl
1311
import com.viaversion.viaversion.api.Via
1412
import com.viaversion.viaversion.api.protocol.version.ProtocolVersion
1513
import com.viaversion.viaversion.api.protocol.version.VersionType
1614
import io.ktor.server.application.*
15+
import net.raphimc.vialegacy.ViaLegacyPlatformImpl
1716
import org.apache.logging.log4j.Level
1817
import org.apache.logging.log4j.io.IoBuilder
1918

@@ -64,15 +63,14 @@ private fun initVia(cmdManager: CommandManager) {
6463
val platform = AspirinPlatform(cmdManager)
6564

6665
platform.initVia {
67-
AspirinBackwards().init()
68-
AspirinRewind().init()
69-
AspirinAprilFools().init()
70-
AspirinLegacy().init()
66+
ViaBackwardsPlatformImpl()
67+
ViaRewindPlatformImpl()
68+
ViaAprilFoolsPlatformImpl()
69+
ViaLegacyPlatformImpl()
7170
Via.getManager().configurationProvider.register(VIAaaSConfig)
7271
}
7372

7473
ProtocolVersion.register(AUTO)
75-
registerAspirinProtocols()
7674
}
7775

7876
fun Application.mainWeb() {

0 commit comments

Comments
 (0)