liangsheng8708
/
FoldCraftLauncher
mirror of https://mirror.ghproxy.com/https://github.com/FCL-Team/FoldCraftLauncher.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix crash caused by style #422

This commit is contained in:
ShirosakiMio 2024-07-01 08:47:24 +08:00
parent 36f1b75c31
commit d535fa82ab
2 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
FCL/src/main/java/com/tungsten/fcl/control/data/ButtonStyles.java
View File

@ -17,6 +17,7 @@ import com.tungsten.fclcore.util.io.FileUtils;
import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Objects;
import java.util.logging.Level;
public class ButtonStyles {
@ -70,14 +71,21 @@ public class ButtonStyles {
}
private static ArrayList<ControlButtonStyle> getStylesFromDisk() {
ArrayList<ControlButtonStyle> list = new ArrayList<>();
try {
String json = FileUtils.readText(new File(FCLPath.CONTROLLER_DIR + "/styles/button_styles.json"));
Gson gson = new GsonBuilder().setPrettyPrinting().create();
return gson.fromJson(json, new TypeToken<ArrayList<ControlButtonStyle>>(){}.getType());
ArrayList<ControlButtonStyle> styles = gson.fromJson(json, new TypeToken<ArrayList<ControlButtonStyle>>() {
}.getType());
if (Objects.isNull(styles)) {
new File(FCLPath.CONTROLLER_DIR + "/styles/button_styles.json").delete();
} else {
list.addAll(styles);
}
} catch (IOException e) {
Logging.LOG.log(Level.SEVERE, "Failed to get button styles", e);
return new ArrayList<>();
}
return list;
}
public static ObservableList<ControlButtonStyle> getStyles() {

11
FCL/src/main/java/com/tungsten/fcl/control/data/DirectionStyles.java
View File

@ -17,6 +17,7 @@ import com.tungsten.fclcore.util.io.FileUtils;
import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Objects;
import java.util.logging.Level;
public class DirectionStyles {
@ -70,14 +71,20 @@ public class DirectionStyles {
}
private static ArrayList<ControlDirectionStyle> getStylesFromDisk() {
ArrayList<ControlDirectionStyle> list = new ArrayList<>();
try {
String json = FileUtils.readText(new File(FCLPath.CONTROLLER_DIR + "/styles/direction_styles.json"));
Gson gson = new GsonBuilder().setPrettyPrinting().create();
return gson.fromJson(json, new TypeToken<ArrayList<ControlDirectionStyle>>(){}.getType());
ArrayList<ControlDirectionStyle> styles = gson.fromJson(json, new TypeToken<ArrayList<ControlDirectionStyle>>(){}.getType());
if (Objects.isNull(styles)) {
new File(FCLPath.CONTROLLER_DIR + "/styles/button_styles.json").delete();
} else {
list.addAll(styles);
}
} catch (IOException e) {
Logging.LOG.log(Level.SEVERE, "Failed to get direction styles", e);
return new ArrayList<>();
}
return list;
}
public static ObservableList<ControlDirectionStyle> getStyles() {