Skip to content

Adding IPv6 Option [ISSUE: #994] #995

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
joern-h wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Adding IPv6 Option [ISSUE: #994] #995

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
340dc7b
Adding IPv6 option
joern-h Mar 11, 2017
a0ff2bf
Adding IPv6 option
joern-h Mar 11, 2017
7778c14
Adding IPv6 option
joern-h Mar 11, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion src/main/java/net/ftb/gui/panes/OptionsPane.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ public class OptionsPane extends JPanel implements ILauncherPane {
private JSlider ramMaximum;
private JComboBox locale;
private JTextField installFolderTextField;
private JCheckBox chckbxShowConsole, keepLauncherOpen, optJavaArgs, useSystemProxy;
private JCheckBox chckbxShowConsole, keepLauncherOpen, optJavaArgs, useSystemProxy, allowIpv6;
private final Settings settings;

private JPanel fitterPane;
Expand Down Expand Up @@ -218,6 +218,12 @@ public void actionPerformed (ActionEvent e) {
useSystemProxy.addFocusListener(settingsChangeListener);
fitterPane.add(useSystemProxy);

allowIpv6 = new JCheckBox(I18N.getLocaleString("IPV6_SUPPORT"));
allowIpv6.setBounds(540, 235, 300, 25);
allowIpv6.setSelected(settings.getAllowIpv6());
allowIpv6.addFocusListener(settingsChangeListener);
fitterPane.add(allowIpv6);

advancedOptionsBtn = new JButton(I18N.getLocaleString("ADVANCED_OPTIONS"));
advancedOptionsBtn.setBounds(147, 275, 629, 29);
advancedOptionsBtn.addActionListener(new ActionListener() {
Expand Down Expand Up @@ -251,6 +257,7 @@ public void saveSettingsInto (Settings settings) {
settings.setOptJavaArgs(optJavaArgs.isSelected());
settings.setKeepLauncherOpen(keepLauncherOpen.isSelected());
settings.setUseSystemProxy(useSystemProxy.isSelected());
settings.setAllowIpv6(allowIpv6.isSelected());
settings.save();
}

Expand Down
6 changes: 5 additions & 1 deletion src/main/java/net/ftb/minecraft/MCLauncher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,11 @@ public static Process launchMinecraft (String javaPath, String gameFolder, File
}

// Use IPv4 when possible, only use IPv6 when connecting to IPv6 only addresses
//arguments.add("-Djava.net.preferIPv4Stack=true");


if (!Settings.getSettings().getAllowIpv6()) {
arguments.add("-Djava.net.preferIPv4Stack=true");
}

if (Settings.getSettings().getUseSystemProxy()) {
arguments.add("-Djava.net.useSystemProxies=true");
Expand Down
3 changes: 2 additions & 1 deletion src/main/resources/i18n/deDE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,8 @@ RAM_MAX = RAM Maximum (MB)
LANGUAGE = Sprache
SHOW_CONSOLE = Konsole anzeigen?
OPT_JAVA_ARGS = Optimierungs-Argumente für schnelle Computer benutzen?
USE_SYSTEM_PROXY =
USE_SYSTEM_PROXY = Benutze System Proxy?
IPV6_SUPPORT = Unterstütze IPv6?
REOPEN_LAUNCHER = Launcher erneut öffnen, nachdem Minecraft beendet wurde
ADVANCED_OPTIONS = Erweiterte Optionen
INSTALL_FIRSTUSE = Da dies das erste Mal ist, dass du diesen Launcher verwendest, empfehlen wir, das Installationsverzeichnis zu bestimmen.
Expand Down
1 change: 1 addition & 0 deletions src/main/resources/i18n/enUS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ LANGUAGE = Language
SHOW_CONSOLE = Show Console?
OPT_JAVA_ARGS= Use Optimization Arguments for fast computers?
USE_SYSTEM_PROXY = Use Internet Proxy to download files?
IPV6_SUPPORT = Enable IPv6 Support?
REOPEN_LAUNCHER = Reopen launcher after exiting Minecraft?
ADVANCED_OPTIONS = Advanced Options
INSTALL_FIRSTUSE = Since this is your first time using the launcher, we suggest setting the install directory.
Expand Down