Skip to content

Add a reflash botton for CleanroomReleases #28

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
Ecdcaeb wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Add a reflash botton for CleanroomReleases #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1772fa6
try update if possible
Ecdcaeb Jul 6, 2025
53af6c5
try?
Ecdcaeb Jul 6, 2025
f682aad
update a reflesh botton
Ecdcaeb Jul 6, 2025
7f7aa29
Merge branch 'master' into update_if_possible
Ecdcaeb Jul 8, 2025
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
48 changes: 36 additions & 12 deletions src/main/java/com/cleanroommc/relauncher/download/CleanroomRelease.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,37 +14,61 @@
import java.nio.file.StandardOpenOption;
import java.time.Duration;
import java.util.Arrays;
import java.util.ArrayList;
import java.util.List;
import java.util.HashMap;

public class CleanroomRelease {

private static final Path CACHE_FILE = CleanroomRelauncher.CACHE_DIR.resolve("releases.json");

public static List<CleanroomRelease> queryAll() throws IOException {
long ttlM = Duration.ofHours(1).toMillis(); // TODO: configurable, this is temp
public static List<CleanroomRelease> queryAll(boolean update) throws IOException {
HashMap<String, CleanroomRelease> map = new HashMap<>();
boolean updated = false;

if (Files.exists(CACHE_FILE)) {
CleanroomRelauncher.LOGGER.info("Loading releases from cached json.");
try {
long fileModifiedM = Files.getLastModifiedTime(CACHE_FILE).toMillis();
long nowM = System.currentTimeMillis();
long diffM = nowM - fileModifiedM;
if (diffM < ttlM) {
return fetchReleasesFromCache(CACHE_FILE);
for(CleanroomRelease cleanroomRelease : fetchReleasesFromCache(CACHE_FILE)){
map.put(cleanroomRelease.name, cleanroomRelease);
}
} catch (IOException e) {
Files.deleteIfExists(CACHE_FILE);
CleanroomRelauncher.LOGGER.error("Unable to read cached releases.json, attempting to connect to GitHub and rebuild.", e);
}
long ttlM = Duration.ofHours(1).toMillis(); // TODO: configurable, this is temp
long fileModifiedM = Files.getLastModifiedTime(CACHE_FILE).toMillis();
long nowM = System.currentTimeMillis();
long diffM = nowM - fileModifiedM;
if (update || diffM < ttlM) {
try {
updated = true;
for(CleanroomRelease cleanroomRelease : fetchReleasesFromGithub()){
map.put(cleanroomRelease.name, cleanroomRelease);
}
} catch (IOException e) {
CleanroomRelauncher.LOGGER.error("Unable to fetch from GitHub", e);
}
} catch (Throwable t) {
Files.delete(CACHE_FILE);
CleanroomRelauncher.LOGGER.error("Unable to read cached releases.json, attempting to connect to GitHub and rebuild.", t);
}
} else {
CleanroomRelauncher.LOGGER.info("No cache found, fetching releases...");
updated = true;
for(CleanroomRelease cleanroomRelease : fetchReleasesFromGithub()){
map.put(cleanroomRelease.name, cleanroomRelease);
}
}
List<CleanroomRelease> releases = fetchReleasesFromGithub();
List<CleanroomRelease> releases = new ArrayList<>(map.values());

// After fetching releases, save them to the cache
saveReleasesToCache(CACHE_FILE, releases);
if (updated)
saveReleasesToCache(CACHE_FILE, releases);
return releases;
}

public static List<CleanroomRelease> queryAll() throws IOException {
return queryAll(false);
}

private static List<CleanroomRelease> fetchReleasesFromGithub() throws IOException {
try {
URL url = new URL("https://api.github.com/repos/CleanroomMC/Cleanroom/releases");
Expand Down
99 changes: 60 additions & 39 deletions src/main/java/com/cleanroommc/relauncher/gui/RelauncherGUI.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ public void windowClosing(WindowEvent e) {

JLabel cleanroomLogo = new JLabel(new ImageIcon(frame.getIconImage().getScaledInstance(80, 80, Image.SCALE_SMOOTH)));

JPanel cleanroomPickerPanel = this.initializeCleanroomPicker(eligibleReleases);
JPanel cleanroomPickerPanel = new CleanroomPickerPanel(eligibleReleases);
mainPanel.add(cleanroomPickerPanel);

JPanel javaPickerPanel = this.initializeJavaPicker();
Expand Down Expand Up @@ -227,49 +227,70 @@ public void windowClosing(WindowEvent e) {
this.setAutoRequestFocus(true);
}

private JPanel initializeCleanroomPicker(List<CleanroomRelease> eligibleReleases) {
// Main Panel
JPanel cleanroomPicker = new JPanel(new BorderLayout(5, 0));
cleanroomPicker.setBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10));
private class CleanroomPickerPanel extends JPanel {

JPanel select = new JPanel();
select.setLayout(new BoxLayout(select, BoxLayout.Y_AXIS));
cleanroomPicker.add(select);
private DefaultComboBoxModel<CleanroomRelease> releasesList;

// Title label
JLabel title = new JLabel("Select Cleanroom Version:");
title.setAlignmentX(Component.LEFT_ALIGNMENT);
select.add(title);
select.add(Box.createRigidArea(new Dimension(0, 5)));

// Create dropdown panel
JPanel dropdown = new JPanel(new BorderLayout(5, 5));
dropdown.setAlignmentX(Component.LEFT_ALIGNMENT);
select.add(dropdown);

// Create the dropdown with release versions
JComboBox<CleanroomRelease> releaseBox = new JComboBox<>();
DefaultComboBoxModel<CleanroomRelease> releaseModel = new DefaultComboBoxModel<>();
for (CleanroomRelease release : eligibleReleases) {
releaseModel.addElement(release);
}
releaseBox.setModel(releaseModel);
releaseBox.setRenderer(new DefaultListCellRenderer() {
@Override
public Component getListCellRendererComponent(JList<?> list, Object value, int index, boolean isSelected, boolean cellHasFocus) {
super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);
if (value instanceof CleanroomRelease) {
setText(((CleanroomRelease) value).name);
public CleanroomPickerPanel(List<CleanroomRelease> eligibleReleases) {
super(new BorderLayout(5, 0));

JPanel select = new JPanel();
select.setLayout(new BoxLayout(select, BoxLayout.Y_AXIS));
CleanroomPickerPanel.this.add(select);

// Title label
JLabel title = new JLabel("Select Cleanroom Version:");
title.setAlignmentX(Component.LEFT_ALIGNMENT);
select.add(title);
select.add(Box.createRigidArea(new Dimension(0, 5)));

// Create dropdown panel
JPanel dropdown = new JPanel(new BorderLayout(5, 5));
dropdown.setAlignmentX(Component.LEFT_ALIGNMENT);
select.add(dropdown);

// Create the dropdown with release versions
JComboBox<CleanroomRelease> releaseBox = new JComboBox<>();
DefaultComboBoxModel<CleanroomRelease> releaseModel = CleanroomPickerPanel.this.releasesList = new DefaultComboBoxModel<>();
for (CleanroomRelease release : eligibleReleases) {
releaseModel.addElement(release);
}
releaseBox.setModel(releaseModel);
releaseBox.setRenderer(new DefaultListCellRenderer() {
@Override
public Component getListCellRendererComponent(JList<?> list, Object value, int index, boolean isSelected, boolean cellHasFocus) {
super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);
if (value instanceof CleanroomRelease) {
setText(((CleanroomRelease) value).name);
}
return this;
}
return this;
});
releaseBox.setSelectedItem(RelauncherGUI.this.selected);
releaseBox.setMaximumRowCount(5);
releaseBox.addActionListener(e -> RelauncherGUI.this.selected = (CleanroomRelease) releaseBox.getSelectedItem());
dropdown.add(releaseBox, BorderLayout.CENTER);

JButton refreshButton = new JButton("⟳");
refreshButton.setFont(refreshButton.getFont().deriveFont(16f));
refreshButton.setPreferredSize(new Dimension(32, 28));
refreshButton.addActionListener(e -> {
updateReleases(CleanroomRelease.queryAll(true));
});
dropdown.add(refreshButton, BorderLayout.EAST);
}

public void addReleases(CleanroomRelease element) {
CleanroomPickerPanel.this.releasesList.addElement(element);
}

public void updateReleases(List<CleanroomRelease> eligibleReleases) {
CleanroomPickerPanel.this.releasesList.removeAllElements();
for (CleanroomRelease release : eligibleReleases) {
CleanroomPickerPanel.this.releasesList.addElement(release);
}
});
releaseBox.setSelectedItem(selected);
releaseBox.setMaximumRowCount(5);
releaseBox.addActionListener(e -> selected = (CleanroomRelease) releaseBox.getSelectedItem());
dropdown.add(releaseBox, BorderLayout.CENTER);
}

return cleanroomPicker;
}

private JPanel initializeJavaPicker() {
Expand Down