curioustorvald/Terrarum
1
0
Fork 0
mirror of https://github.com/curioustorvald/Terrarum.git synced 2026-06-12 19:44:05 +09:00
Code Issues Packages Projects Releases Wiki Activity

use _cp property to load custom application

Browse Source
This commit is contained in:
minjaesong
2024-09-27 12:42:35 +09:00
parent 83ad86c818
commit 70f2a23354
2 changed files with 27 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/net/torvald/terrarum/Principii.java
View File

@@ -108,6 +108,16 @@ public class Principii {
// String[] cmd = (runtime+extracmd0+userDefinedExtraCmd0+" -Xms1G -Xmx"+xmx+"G -cp ./out/TerrarumBuild.jar net.torvald.terrarum.App").split(" "); // String[] cmd = (runtime+extracmd0+userDefinedExtraCmd0+" -Xms1G -Xmx"+xmx+"G -cp ./out/TerrarumBuild.jar net.torvald.terrarum.App").split(" ");
// use `_cp` property to load custom application
String cp;
try {
cp = getConfigString("_cp");
}
catch (NullPointerException e) {
cp = "";
}
if (cp.isBlank()) cp = "net.torvald.terrarum.App";
List<String> extracmds = Arrays.stream(extracmd0.split(" ")).toList(); List<String> extracmds = Arrays.stream(extracmd0.split(" ")).toList();
List<String> userDefinedExtraCmds = Arrays.stream(userDefinedExtraCmd0.split(" +")).filter((it) -> !it.isBlank()).toList(); List<String> userDefinedExtraCmds = Arrays.stream(userDefinedExtraCmd0.split(" +")).filter((it) -> !it.isBlank()).toList();
ArrayList<String> cmd0 = new ArrayList<>(); ArrayList<String> cmd0 = new ArrayList<>();
@@ -120,7 +130,7 @@ public class Principii {
cmd0.add("-Xmx"+xmx+"G"); cmd0.add("-Xmx"+xmx+"G");
cmd0.add("-cp"); cmd0.add("-cp");
cmd0.add("./out/TerrarumBuild.jar"); cmd0.add("./out/TerrarumBuild.jar");
cmd0.add("net.torvald.terrarum.App"); cmd0.add(cp);
var cmd = cmd0.stream().filter((it) -> !it.isBlank()).toList(); var cmd = cmd0.stream().filter((it) -> !it.isBlank()).toList();
System.out.println(cmd); System.out.println(cmd);

18
src/net/torvald/terrarum/debuggerapp/CSVEditor.java
View File

@@ -5,12 +5,14 @@ import org.apache.commons.csv.CSVFormat;
import org.apache.commons.csv.CSVRecord; import org.apache.commons.csv.CSVRecord;
import javax.swing.*; import javax.swing.*;
import javax.swing.filechooser.FileFilter;
import javax.swing.table.DefaultTableModel; import javax.swing.table.DefaultTableModel;
import java.awt.*; import java.awt.*;
import java.awt.event.KeyAdapter; import java.awt.event.KeyAdapter;
import java.awt.event.KeyEvent; import java.awt.event.KeyEvent;
import java.awt.event.MouseAdapter; import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent; import java.awt.event.MouseEvent;
import java.io.File;
import java.io.FileOutputStream; import java.io.FileOutputStream;
import java.io.IOException; import java.io.IOException;
import java.io.StringReader; import java.io.StringReader;
@@ -28,12 +30,12 @@ import java.util.Properties;
public class CSVEditor extends JFrame { public class CSVEditor extends JFrame {
/** Default columns. When you open existing csv, it should overwrite this. */ /** Default columns. When you open existing csv, it should overwrite this. */
private String[] columns = new String[]{"id", "drop", "spawn", "name", "shdr", "shdg", "shdb", "shduv", "str", "dsty", "mate", "solid", "wall", "grav", "dlfn", "fv", "fr", "lumr", "lumg", "lumb", "lumuv", "colour", "vscs", "refl","tags"}; private String[] columns = new String[]{"id", "drop", "spawn", "name", "shdr", "shdg", "shdb", "shduv", "str", "dsty", "mate", "solid", "wall", "grav", "dlfn", "fv", "fr", "lumr", "lumg", "lumb", "lumuv", "refl","tags"};
private final int FOUR_DIGIT = 42; private final int FOUR_DIGIT = 42;
private final int SIX_DIGIT = 50; private final int SIX_DIGIT = 50;
private final int TWO_DIGIT = 30; private final int TWO_DIGIT = 30;
private final int ARBITRARY = 240; private final int ARBITRARY = 240;
private int[] colWidth = new int[]{FOUR_DIGIT, FOUR_DIGIT, FOUR_DIGIT, ARBITRARY, SIX_DIGIT, SIX_DIGIT, SIX_DIGIT, SIX_DIGIT, TWO_DIGIT, FOUR_DIGIT, FOUR_DIGIT, TWO_DIGIT, TWO_DIGIT, TWO_DIGIT, TWO_DIGIT, TWO_DIGIT, TWO_DIGIT, SIX_DIGIT, SIX_DIGIT, SIX_DIGIT, SIX_DIGIT, FOUR_DIGIT * 2, TWO_DIGIT, SIX_DIGIT, ARBITRARY}; private int[] colWidth = new int[]{FOUR_DIGIT, FOUR_DIGIT, FOUR_DIGIT, ARBITRARY, SIX_DIGIT, SIX_DIGIT, SIX_DIGIT, SIX_DIGIT, TWO_DIGIT, FOUR_DIGIT, FOUR_DIGIT, TWO_DIGIT, TWO_DIGIT, TWO_DIGIT, TWO_DIGIT, TWO_DIGIT, TWO_DIGIT, SIX_DIGIT, SIX_DIGIT, SIX_DIGIT, SIX_DIGIT, SIX_DIGIT, ARBITRARY};
private final int UNDO_BUFFER_SIZE = 10; private final int UNDO_BUFFER_SIZE = 10;
@@ -120,6 +122,18 @@ public class CSVEditor extends JFrame {
{ {
setFileSelectionMode(JFileChooser.FILES_ONLY); setFileSelectionMode(JFileChooser.FILES_ONLY);
setMultiSelectionEnabled(false); setMultiSelectionEnabled(false);
setAcceptAllFileFilterUsed(false);
addChoosableFileFilter(new FileFilter() {
@Override
public boolean accept(File file) {
return file.isDirectory() || file.getName().toLowerCase().endsWith(".csv");
}
@Override
public String getDescription() {
return "CSV Files (*.csv)";
}
});
} }
}; };