Skip to content

Commit 2b6029b

Browse files
committed
Updated to ModpackUpdater 1.0.5
Fixed #2
1 parent cae737d commit 2b6029b

File tree

5 files changed

+29
-34
lines changed

5 files changed

+29
-34
lines changed

src/main/java/ml/karmaconfigs/ModPackUpdater/CreateFrame.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ public void display() {
173173
if (!chooser.getSelectedFile().equals(mcFolder)) {
174174
mcFolder = chooser.getSelectedFile();
175175
utils.setDebug(utils.rgbColor("Changed minecraft directory to: " + FilesUtilities.getPath(mcFolder), 120, 200, 155), true);
176-
FilesUtilities.getConfig.saveMinecraftDir();
176+
FilesUtilities.getConfig.saveMinecraftDir(mcFolder);
177177
} else {
178178
utils.setDebug(utils.rgbColor("Same minecraft directory selected, nothing changed", 110, 150, 150), false);
179179
}

src/main/java/ml/karmaconfigs/ModPackUpdater/MainFrame.java

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import com.formdev.flatlaf.FlatDarkLaf;
44
import com.formdev.flatlaf.FlatLightLaf;
5+
import com.formdev.flatlaf.intellijthemes.FlatDarkPurpleIJTheme;
56
import ml.karmaconfigs.ModPackUpdater.Utils.Files.Config;
67
import ml.karmaconfigs.ModPackUpdater.Utils.Files.FilesUtilities;
78
import ml.karmaconfigs.ModPackUpdater.Utils.ModPack.*;
@@ -82,7 +83,7 @@ public void initFrame() {
8283
Nobody should use "System default" since it looks pretty bad and honestly, it works really slow :)
8384
Should I remove it in a future version?
8485
*/
85-
JComboBox<String> theme = new JComboBox<>(new String[]{"Light", "Dark", "System default"});
86+
JComboBox<String> theme = new JComboBox<>(new String[]{"Light", "Dark", "Dark 2", "System default"});
8687
theme.setSelectedItem(FilesUtilities.getConfig.getTheme());
8788

8889
//Check boxes
@@ -259,6 +260,14 @@ public void initFrame() {
259260
Utils.infoScrollable.setBackground(Color.GRAY);
260261
}
261262
break;
263+
case "Dark 2":
264+
bPane.setOpaque(true);
265+
bPane.setBackground(Color.DARK_GRAY);
266+
UIManager.setLookAndFeel(FlatDarkPurpleIJTheme.class.getCanonicalName());
267+
if (Utils.info != null && Utils.infoScrollable != null) {
268+
Utils.infoScrollable.setBackground(Color.DARK_GRAY);
269+
}
270+
break;
262271
default:
263272
utils.setDebug(utils.rgbColor("Failed to change theme", 255, 0, 0), true);
264273
break;
@@ -672,6 +681,7 @@ private void syncSize(Component syncWith, Component... components) {
672681
public static void main(String[] args) {
673682
FlatLightLaf.install();
674683
FlatDarkLaf.install();
684+
FlatDarkPurpleIJTheme.install();
675685

676686
try {
677687
String themeName = new Config().getTheme();
@@ -686,6 +696,10 @@ public static void main(String[] args) {
686696
finalTheme = "Dark";
687697
UIManager.setLookAndFeel(FlatDarkLaf.class.getCanonicalName());
688698
break;
699+
case "Dark 2":
700+
finalTheme = "Dark 2";
701+
UIManager.setLookAndFeel(FlatDarkPurpleIJTheme.class.getCanonicalName());
702+
break;
689703
default:
690704
finalTheme = "System default";
691705
UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());

src/main/java/ml/karmaconfigs/ModPackUpdater/Utils/Files/Config.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,9 +139,9 @@ public final void saveTheme(String theme) {
139139
write("THEME", theme);
140140
}
141141

142-
public final void saveMinecraftDir() {
142+
public final void saveMinecraftDir(File dir) {
143143
//System.out.printInt("Saved mc dir");
144-
write("MINECRAFT_DIR", FilesUtilities.getPath(new File(FilesUtilities.getMinecraftDir())));
144+
write("MINECRAFT_DIR", FilesUtilities.getPath(dir));
145145
}
146146

147147
public final void saveCreatorURL(String url) {

src/main/java/ml/karmaconfigs/ModPackUpdater/Utils/Utils.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
import java.text.SimpleDateFormat;
2323
import java.util.*;
2424
import java.util.Timer;
25-
import java.util.concurrent.TimeUnit;
2625

2726
public final class Utils extends MainFrame implements Runnable {
2827

src/main/java/tagapi_3/ExUtils.java

Lines changed: 11 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -24,44 +24,26 @@
2424

2525
package tagapi_3;
2626

27-
import java.io.BufferedWriter;
28-
import java.io.FileInputStream;
29-
import java.io.FileWriter;
27+
import com.alemcode.HexEditor.HexEditor;
28+
import com.minecraft.moonlake.nbt.NBTBase;
29+
import com.minecraft.moonlake.nbt.NBTTagCompound;
30+
import com.minecraft.moonlake.nbt.NBTUtil;
31+
import org.apache.commons.io.FileUtils;
32+
33+
import java.io.*;
34+
import java.math.BigInteger;
35+
import java.net.URI;
3036
import java.security.MessageDigest;
3137
import java.security.NoSuchAlgorithmException;
32-
import java.util.Locale;
33-
import org.apache.commons.io.FileUtils;
3438
import java.security.SecureRandom;
35-
import java.math.BigInteger;
36-
import java.util.ArrayList;
37-
import java.util.HashSet;
38-
import java.util.List;
39-
import java.io.File;
40-
import java.io.FileOutputStream;
41-
import java.io.InputStream;
39+
import java.util.*;
4240
import java.util.jar.JarEntry;
4341
import java.util.jar.JarFile;
44-
import java.util.Enumeration;
45-
import com.alemcode.HexEditor.HexEditor;
46-
import java.io.Closeable;
47-
import java.io.IOException;
48-
import java.io.OutputStream;
49-
import java.net.URI;
50-
import java.util.Deque;
51-
import java.util.HashMap;
52-
import java.util.LinkedList;
53-
import java.util.Map;
5442
import java.util.zip.ZipEntry;
5543
import java.util.zip.ZipOutputStream;
56-
import org.apache.commons.io.FileUtils;
44+
5745
import static org.zeroturnaround.zip.commons.FileUtils.copy;
58-
import com.minecraft.moonlake.nbt.NBTBase;
59-
import com.minecraft.moonlake.nbt.NBTTagCompound;
60-
import com.minecraft.moonlake.nbt.NBTUtil;
61-
import org.apache.commons.io.FileUtils;
6246

63-
import java.nio.file.Path;
64-
import java.nio.file.Paths;
6547
/**
6648
*
6749
* @author Ammar Ahmad

0 commit comments

Comments
 (0)