Yes.
This commit is contained in:
1 parent
3c20243769
commit
5a799d698e
5 files changed
+45
-9
No files matched your search
@@ -0,0 +1,40 @@
|
||||
# Automatically build the project and run any configured tests for every push
|
||||
# and submitted pull request. This can help catch issues that only occur on
|
||||
# certain platforms or Java versions, and provides a first line of defence
|
||||
# against bad commits.
|
||||
|
||||
name: build
|
||||
on: [pull_request, push]
|
||||
|
||||
jobs:
|
||||
build:
|
||||
strategy:
|
||||
matrix:
|
||||
# Use these Java versions
|
||||
java: [
|
||||
8,
|
||||
17
|
||||
]
|
||||
# and run on both Linux and Windows
|
||||
os: [ubuntu-20.04, windows-latest]
|
||||
runs-on: ${{ matrix.os }}
|
||||
steps:
|
||||
- name: checkout repository
|
||||
uses: actions/checkout@v3
|
||||
- name: validate gradle wrapper
|
||||
uses: gradle/wrapper-validation-action@v1
|
||||
- name: setup jdk ${{ matrix.java }}
|
||||
uses: actions/setup-java@v1
|
||||
with:
|
||||
java-version: ${{ matrix.java }}
|
||||
- name: make gradle wrapper executable
|
||||
if: ${{ runner.os != 'Windows' }}
|
||||
run: chmod +x ./gradlew
|
||||
- name: build
|
||||
run: ./gradlew build
|
||||
- name: capture build artifacts
|
||||
if: ${{ runner.os == 'Linux' && matrix.java == '8' }} # Only upload artifacts built from latest java on one OS
|
||||
uses: actions/upload-artifact@v3
|
||||
with:
|
||||
name: Artifacts
|
||||
path: build/libs
|
||||
@@ -1,7 +1,6 @@
|
||||
plugins {
|
||||
id 'java'
|
||||
id "com.github.johnrengelman.shadow" version "7.0.0"
|
||||
id "de.undercouch.download" version "4.1.2"
|
||||
}
|
||||
|
||||
sourceCompatibility = JavaVersion.VERSION_1_8
|
||||
|
||||
@@ -19,12 +19,10 @@ public class InstallerHelper {
|
||||
public JTextField installLocation;
|
||||
public JButton selectFolderButton;
|
||||
|
||||
private JPanel panel;
|
||||
|
||||
public static JCheckBox createProfile;
|
||||
|
||||
public JPanel setPanel(InstallerGUI gui) {
|
||||
panel = new JPanel(new GridBagLayout());
|
||||
JPanel panel = new JPanel(new GridBagLayout());
|
||||
panel.setBorder(new EmptyBorder(4, 4, 4, 4));
|
||||
|
||||
GridBagConstraints c = new GridBagConstraints();
|
||||
@@ -52,7 +50,7 @@ public class InstallerHelper {
|
||||
|
||||
installLocation.setText(InstallerUtils.findDefaultInstallDir().toString());
|
||||
|
||||
addLastRow(panel, c, null,
|
||||
addLastRow(panel, c,
|
||||
buttonInstall = new JButton(Main.BUNDLE.getString("installer.button.install")));
|
||||
buttonInstall.addActionListener(e -> {
|
||||
buttonInstall.setEnabled(false);
|
||||
@@ -73,8 +71,8 @@ public class InstallerHelper {
|
||||
addRow(parent, c, false, label, components);
|
||||
}
|
||||
|
||||
protected void addLastRow(Container parent, GridBagConstraints c, String label, Component... components) {
|
||||
addRow(parent, c, true, label, components);
|
||||
protected void addLastRow(Container parent, GridBagConstraints c, Component... components) {
|
||||
addRow(parent, c, true, null, components);
|
||||
}
|
||||
|
||||
public void addRow(Container parent, GridBagConstraints c, boolean last, String label, Component... components) {
|
||||
|
||||
@@ -12,7 +12,6 @@ import java.security.MessageDigest;
|
||||
import java.security.NoSuchAlgorithmException;
|
||||
import java.text.DateFormat;
|
||||
import java.text.SimpleDateFormat;
|
||||
import java.util.Arrays;
|
||||
import java.util.Locale;
|
||||
import java.util.zip.ZipEntry;
|
||||
import java.util.zip.ZipInputStream;
|
||||
|
||||
@@ -3,7 +3,7 @@ installer.prompt.select.location=Select Install Location:
|
||||
installer.button.install=Install
|
||||
installer.prompt.install.done={0} has been installed, if you want to install fabric then click on the "Install Fabric" button.
|
||||
installer.exception.no.launcher.directory=No launcher directory found!
|
||||
installer.prompt.launcher.type.body=The Combat Test Installer has detected 2 different installations of the Minecraft Launcher, which launcher do you wish to install Fabric to?\n\n- Select Microsoft Store if you are playing Minecraft through the Xbox App or the Windows Store.\n- Select Standalone if you downloaded the Minecraft launcher directly from the Minecraft.net website.\n\nIf you are unsure try the Microsoft Store option first, you can always re-run the installer.
|
||||
installer.prompt.launcher.type.body=The Combat Test Installer has detected 2 different installations of the Minecraft Launcher, which launcher do you wish to install the Combat Tests to?\n\n- Select Microsoft Store if you are playing Minecraft through the Xbox App or the Windows Store.\n- Select Standalone if you downloaded the Minecraft launcher directly from the Minecraft.net website.\n\nIf you are unsure try the Microsoft Store option first, you can always re-run the installer.
|
||||
installer.prompt.launcher.type.xbox=Microsoft Store / Xbox
|
||||
installer.prompt.launcher.type.win32=Standalone (Win32)
|
||||
installer.title=Combat Test Installer
|
||||
|
||||
Reference in new issue
Block a user