mirror/HMCL
2
0
Fork 0
mirror of https://github.com/HMCL-dev/HMCL.git synced 2024-12-27 07:10:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

chore(multiplayer): remove JSTUN.

Browse Source
This commit is contained in:
huanghongxun 2022-09-16 01:41:23 +08:00
parent 735a407f0e
commit b3bbd21f1f
2 changed files with 1 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
HMCL/build.gradle.kts
View File

@ -52,8 +52,6 @@ version = "$versionRoot.$buildNumber"
dependencies { dependencies {
implementation(project(":HMCLCore")) implementation(project(":HMCLCore"))
implementation("libs:JFoenix") implementation("libs:JFoenix")
implementation("de.javawi.jstun:jstun:0.7.4")
} }
fun digest(algorithm: String, bytes: ByteArray) = MessageDigest.getInstance(algorithm).digest(bytes) fun digest(algorithm: String, bytes: ByteArray) = MessageDigest.getInstance(algorithm).digest(bytes)

16
HMCL/src/main/java/org/jackhuang/hmcl/ui/multiplayer/MultiplayerPage.java
View File

@ -19,7 +19,6 @@ package org.jackhuang.hmcl.ui.multiplayer;
import com.jfoenix.controls.JFXButton; import com.jfoenix.controls.JFXButton;
import com.jfoenix.controls.JFXDialogLayout; import com.jfoenix.controls.JFXDialogLayout;
import de.javawi.jstun.test.DiscoveryInfo;
import javafx.beans.property.*; import javafx.beans.property.*;
import javafx.scene.control.Label; import javafx.scene.control.Label;
import javafx.scene.control.Skin; import javafx.scene.control.Skin;
@ -30,10 +29,8 @@ import org.jackhuang.hmcl.ui.construct.*;
import org.jackhuang.hmcl.ui.decorator.DecoratorAnimatedPage; import org.jackhuang.hmcl.ui.decorator.DecoratorAnimatedPage;
import org.jackhuang.hmcl.ui.decorator.DecoratorPage; import org.jackhuang.hmcl.ui.decorator.DecoratorPage;
import org.jackhuang.hmcl.util.HMCLService; import org.jackhuang.hmcl.util.HMCLService;
import org.jackhuang.hmcl.util.Result;
import org.jackhuang.hmcl.util.TaskCancellationAction; import org.jackhuang.hmcl.util.TaskCancellationAction;
import org.jackhuang.hmcl.util.io.ChecksumMismatchException; import org.jackhuang.hmcl.util.io.ChecksumMismatchException;
import org.jetbrains.annotations.Nullable;
import java.util.concurrent.CancellationException; import java.util.concurrent.CancellationException;
import java.util.function.Consumer; import java.util.function.Consumer;
@ -48,7 +45,6 @@ import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
public class MultiplayerPage extends DecoratorAnimatedPage implements DecoratorPage, PageAware { public class MultiplayerPage extends DecoratorAnimatedPage implements DecoratorPage, PageAware {
private final ReadOnlyObjectWrapper<State> state = new ReadOnlyObjectWrapper<>(State.fromTitle(i18n("multiplayer"))); private final ReadOnlyObjectWrapper<State> state = new ReadOnlyObjectWrapper<>(State.fromTitle(i18n("multiplayer")));
private final ReadOnlyObjectWrapper<@Nullable Result<DiscoveryInfo>> natState = new ReadOnlyObjectWrapper<>();
private final ReadOnlyObjectWrapper<MultiplayerManager.HiperSession> session = new ReadOnlyObjectWrapper<>(); private final ReadOnlyObjectWrapper<MultiplayerManager.HiperSession> session = new ReadOnlyObjectWrapper<>();
private final IntegerProperty port = new SimpleIntegerProperty(); private final IntegerProperty port = new SimpleIntegerProperty();
private final StringProperty address = new SimpleStringProperty(); private final StringProperty address = new SimpleStringProperty();
@ -69,14 +65,6 @@ public class MultiplayerPage extends DecoratorAnimatedPage implements DecoratorP
return new MultiplayerPageSkin(this); return new MultiplayerPageSkin(this);
} }
public Result<DiscoveryInfo> getNatState() {
return natState.get();
}
public ReadOnlyObjectProperty<Result<DiscoveryInfo>> natStateProperty() {
return natState.getReadOnlyProperty();
}
public int getPort() { public int getPort() {
return port.get(); return port.get();
} }
@ -213,9 +201,7 @@ public class MultiplayerPage extends DecoratorAnimatedPage implements DecoratorP
} }
private void onIPAllocated(MultiplayerManager.HiperIPEvent event) { private void onIPAllocated(MultiplayerManager.HiperIPEvent event) {
runInFX(() -> { runInFX(() -> this.address.set(event.getIP()));
this.address.set(event.getIP());
});
} }
private void onExit(MultiplayerManager.HiperExitEvent event) { private void onExit(MultiplayerManager.HiperExitEvent event) {