diff --git a/dist/Whitehole.jar b/dist/Whitehole.jar index fd4336d..f546a52 100644 Binary files a/dist/Whitehole.jar and b/dist/Whitehole.jar differ diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml index 12081d0..b9ab4db 100644 --- a/nbproject/build-impl.xml +++ b/nbproject/build-impl.xml @@ -154,18 +154,6 @@ is divided into following sections: - - - - - - - - - - - - @@ -1193,13 +1181,27 @@ is divided into following sections: - + + + + + + + + + + + + + + + To run this application from the command line without Ant, try: java -jar "${dist.jar.resolved}" - + diff --git a/nbproject/genfiles.properties b/nbproject/genfiles.properties index 5daf4ef..d585885 100644 --- a/nbproject/genfiles.properties +++ b/nbproject/genfiles.properties @@ -4,5 +4,5 @@ build.xml.stylesheet.CRC32=8064a381@1.79.1.48 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml. # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you. nbproject/build-impl.xml.data.CRC32=8e1fcd80 -nbproject/build-impl.xml.script.CRC32=0b85ad74 -nbproject/build-impl.xml.stylesheet.CRC32=3a2fa800@1.89.1.48 +nbproject/build-impl.xml.script.CRC32=b644062c +nbproject/build-impl.xml.stylesheet.CRC32=f89f7d21@1.94.0.48 diff --git a/src/com/thesuncat/whitehole/ObjectDBUpdater.java b/src/com/thesuncat/whitehole/ObjectDBUpdater.java deleted file mode 100644 index a8f105a..0000000 --- a/src/com/thesuncat/whitehole/ObjectDBUpdater.java +++ /dev/null @@ -1,143 +0,0 @@ -/* - © 2012 - 2019 - Whitehole Team - - Whitehole is free software: you can redistribute it and/or modify it under - the terms of the GNU General Public License as published by the Free - Software Foundation, either version 3 of the License, or (at your option) - any later version. - - Whitehole is distributed in the hope that it will be useful, but WITHOUT ANY - WARRANTY; See the GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along - with Whitehole. If not, see http://www.gnu.org/licenses/. -*/ - -package com.thesuncat.whitehole; - -import java.io.*; -import java.net.*; -import java.nio.ByteBuffer; -import java.util.zip.CRC32; -import java.nio.charset.*; -import java.util.zip.GZIPInputStream; -import javax.swing.JLabel; - -public class ObjectDBUpdater extends Thread { - public ObjectDBUpdater(JLabel status) { - statusLabel = status; - } - - @Override - public void run() { - try { - String ts = String.format("&ts=%1$d", ObjectDB.timestamp); - URL url = new URL (Settings.objectDB_url + "?whitehole&gzip" + ts); - URLConnection conn = url.openConnection(); - DataInputStream dis = new DataInputStream(conn.getInputStream()); - - int length = conn.getContentLength(); - if (length < 8) { - if(!Settings.japanese) - statusLabel.setText("Failed to update object database: received invalid data."); - else - statusLabel.setText("オブジェクトデータベースをアップデートできませんでした"); - return; - } - - byte[] data = new byte[length]; - for (int i = 0; i < data.length; i++) - data[i] = dis.readByte(); - - Charset charset = Charset.forName("UTF-8"); - CharsetDecoder dec = charset.newDecoder(); - String strdata = dec.decode(ByteBuffer.wrap(data, 0, 8)).toString(); - - if (strdata.equals("noupdate")) { - if(Settings.japanese) - statusLabel.setText("オブジェクトデータベースは既にアップデートされています。"); - else - statusLabel.setText("Object database already up-to-date."); - return; - } - else if (data.length < 10) { - if(Settings.japanese) - statusLabel.setText("オブジェクトデータベースを更新できませんでした。無効なデータを受信しました。"); - else - statusLabel.setText("Failed to update object database: received invalid data."); - return; - } - - CRC32 crc = new CRC32(); - crc.update(data, 9, data.length-9); - long crcref; - try { crcref = Long.parseLong(strdata, 16); } - catch (NumberFormatException ex) { crcref = -1; } - if (crc.getValue() != crcref) { - if(Settings.japanese) - statusLabel.setText("オブジェクトデータベースを更新できませんでした。無効なデータを受信しました。"); - else - statusLabel.setText("Failed to update object database: received invalid data."); - return; - } - - File odbbkp = new File("objectdb.xml.bak"); - File odb = new File("objectdb.xml"); - - try { - if (odb.exists()) { - odb.renameTo(odbbkp); - odb.delete(); - } - - ByteArrayInputStream compstream = new ByteArrayInputStream(data, 9, data.length-9); - GZIPInputStream gzstream = new GZIPInputStream(compstream); - - odb.createNewFile(); - FileOutputStream odbstream = new FileOutputStream(odb); - - int curbyte; - while ((curbyte = gzstream.read()) != -1) - odbstream.write(curbyte); - - odbstream.flush(); - odbstream.close(); - - gzstream.close(); - compstream.close(); - - if (odbbkp.exists()) - odbbkp.delete(); - } - catch (IOException ex) { - if(Settings.japanese) - statusLabel.setText("オブジェクトデータベースを保存できませんでした。正しいリンクですか？"); - else - statusLabel.setText("Could not save the object database. Is the link still valid?"); - if (odbbkp.exists()) - odbbkp.renameTo(odb); - return; - } - - if(Settings.japanese) - statusLabel.setText("オブジェクトデータベースは通常に更新されました。"); - else - statusLabel.setText("Object database updated."); - ObjectDB.init(); - } - catch (MalformedURLException ex) { - if(Settings.japanese) - statusLabel.setText("アップデートサーバーへの接続に失敗しました。"); - else - statusLabel.setText("Failed to connect to the update server."); - } - catch (IOException ex) { - if(Settings.japanese) - statusLabel.setText("オブジェクトデータベースを保存できませんでした。正しいリンクですか？"); - else - statusLabel.setText("Could not save the object database. Is the link still valid?."); - } - } - - private final JLabel statusLabel; -} \ No newline at end of file diff --git a/src/com/thesuncat/whitehole/Settings.java b/src/com/thesuncat/whitehole/Settings.java index 4e0cccb..59fb62c 100644 --- a/src/com/thesuncat/whitehole/Settings.java +++ b/src/com/thesuncat/whitehole/Settings.java @@ -20,8 +20,6 @@ public class Settings { public static void init() { Preferences prefs = Preferences.userRoot(); - objectDB_url = prefs.get("objectDB.url", "http://neomariogalaxy.bplaced.net/objectdb/smg_download.php"); - objectDB_update = prefs.getBoolean("objectDB.update", true); arc_enc = prefs.getBoolean("arc.enc", true); editor_shaders = prefs.getBoolean("editor.shaders", true); editor_fastDrag = prefs.getBoolean("editor.fastDrag", false); @@ -44,8 +42,6 @@ public static void init() { public static void save() { Preferences prefs = Preferences.userRoot(); - prefs.put("objectDB.url", objectDB_url); - prefs.putBoolean("objectDB.update", objectDB_update); prefs.putBoolean("arc.enc", arc_enc); prefs.putBoolean("editor.shaders", editor_shaders); prefs.putBoolean("editor.fastDrag", editor_fastDrag); @@ -71,9 +67,8 @@ public static void saveEditorPrefs(boolean area, boolean gravity, boolean camera init(); } - public static String objectDB_url; public static boolean associated; - public static boolean objectDB_update, arc_enc, gameDir, dark, richPresence, aa, fakeCol, reverseRot, legacy, japanese, fileNames; + public static boolean arc_enc, gameDir, dark, richPresence, aa, fakeCol, reverseRot, legacy, japanese, fileNames; public static boolean editor_shaders, editor_fastDrag; public static boolean showAreas, showCameras, showGravity, showPaths, showAxis; } \ No newline at end of file diff --git a/src/com/thesuncat/whitehole/swing/AboutForm.form b/src/com/thesuncat/whitehole/swing/AboutForm.form index 7dbc6e1..410f074 100644 --- a/src/com/thesuncat/whitehole/swing/AboutForm.form +++ b/src/com/thesuncat/whitehole/swing/AboutForm.form @@ -1,258 +1,267 @@ - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/com/thesuncat/whitehole/swing/AboutForm.java b/src/com/thesuncat/whitehole/swing/AboutForm.java index 2d6bffe..7f9b626 100644 --- a/src/com/thesuncat/whitehole/swing/AboutForm.java +++ b/src/com/thesuncat/whitehole/swing/AboutForm.java @@ -68,6 +68,7 @@ private void initComponents() { jLabel14 = new javax.swing.JLabel(); jLabel20 = new javax.swing.JLabel(); jLabel21 = new javax.swing.JLabel(); + jLabel22 = new javax.swing.JLabel(); setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE); setTitle("About " + Whitehole.NAME); @@ -119,6 +120,8 @@ private void initComponents() { jLabel21.setText("OcelotGaming"); + jLabel22.setText("Bussun"); + javax.swing.GroupLayout layout = new javax.swing.GroupLayout(getContentPane()); getContentPane().setLayout(layout); layout.setHorizontalGroup( @@ -148,7 +151,8 @@ private void initComponents() { .addComponent(jLabel7) .addComponent(jLabel9) .addComponent(jLabel13) - .addComponent(jLabel17)))) + .addComponent(jLabel17) + .addComponent(jLabel22, javax.swing.GroupLayout.PREFERRED_SIZE, 36, javax.swing.GroupLayout.PREFERRED_SIZE)))) .addComponent(jLabel11) .addComponent(jLabel16) .addComponent(jLabel20)) @@ -200,7 +204,9 @@ private void initComponents() { .addComponent(jLabel17) .addComponent(jLabel18)) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(jLabel20) + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) + .addComponent(jLabel20) + .addComponent(jLabel22)) .addGap(18, 18, 18) .addComponent(jLabel14) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) @@ -229,6 +235,7 @@ private void initComponents() { private javax.swing.JLabel jLabel2; private javax.swing.JLabel jLabel20; private javax.swing.JLabel jLabel21; + private javax.swing.JLabel jLabel22; private javax.swing.JLabel jLabel3; private javax.swing.JLabel jLabel4; private javax.swing.JLabel jLabel5; diff --git a/src/com/thesuncat/whitehole/swing/MainFrame.java b/src/com/thesuncat/whitehole/swing/MainFrame.java index b8f979a..531b6b3 100644 --- a/src/com/thesuncat/whitehole/swing/MainFrame.java +++ b/src/com/thesuncat/whitehole/swing/MainFrame.java @@ -415,16 +415,6 @@ private void formWindowOpened(java.awt.event.WindowEvent evt) {//GEN-FIRST:event lbStatusBar.setText("開始"); else lbStatusBar.setText("Started!"); - - if (Settings.objectDB_update) { - - if(Settings.japanese) - lbStatusBar.setText("objectdbの更新を確認しています..."); - else - lbStatusBar.setText("Checking for object database updates..."); - ObjectDBUpdater updater = new ObjectDBUpdater(lbStatusBar); - updater.start(); - } }//GEN-LAST:event_formWindowOpened private void formWindowClosed(java.awt.event.WindowEvent evt) {//GEN-FIRST:event_formWindowClosed diff --git a/src/com/thesuncat/whitehole/swing/MsbfEditorForm.java b/src/com/thesuncat/whitehole/swing/MsbfEditorForm.java index b8f9e7f..475ade2 100644 --- a/src/com/thesuncat/whitehole/swing/MsbfEditorForm.java +++ b/src/com/thesuncat/whitehole/swing/MsbfEditorForm.java @@ -15,7 +15,7 @@ package com.thesuncat.whitehole.swing; -import com.sun.glass.events.KeyEvent; +import java.awt.event.KeyEvent; import com.thesuncat.whitehole.Whitehole; import com.thesuncat.whitehole.io.MsbfFile.Flow; import com.thesuncat.whitehole.io.MsbfFile.FlowEntry; @@ -571,7 +571,7 @@ private void cbxCharChooserActionPerformed(java.awt.event.ActionEvent evt) {//GE private void txtCharKeyTyped(java.awt.event.KeyEvent evt) {//GEN-FIRST:event_txtCharKeyTyped if(!(Character.isDigit(evt.getKeyChar()) - || evt.getKeyCode() == KeyEvent.VK_BACKSPACE || evt.getKeyCode() == KeyEvent.VK_LEFT + || evt.getKeyCode() == KeyEvent.VK_BACK_SPACE || evt.getKeyCode() == KeyEvent.VK_LEFT || evt.getKeyCode() == KeyEvent.VK_RIGHT)) evt.consume(); }//GEN-LAST:event_txtCharKeyTyped diff --git a/src/com/thesuncat/whitehole/swing/RarcEditorForm.java b/src/com/thesuncat/whitehole/swing/RarcEditorForm.java index e9dfb5a..8523a64 100644 --- a/src/com/thesuncat/whitehole/swing/RarcEditorForm.java +++ b/src/com/thesuncat/whitehole/swing/RarcEditorForm.java @@ -289,13 +289,13 @@ private void doFolderListing(DefaultMutableTreeNode parentNode, String parent) { public static void setTreeExpandedState(JTree tree) { DefaultMutableTreeNode node = (DefaultMutableTreeNode) tree.getModel().getRoot(); - setNodeExpandedState(tree, node); + setNodeExpandedState(tree, (DefaultMutableTreeNode) node); } private static void setNodeExpandedState(JTree tree, DefaultMutableTreeNode node) { - ArrayList list = Collections.list(node.children()); - for (DefaultMutableTreeNode treeNode : list) - setNodeExpandedState(tree, treeNode); + ArrayList list = Collections.list(node.children()); + for (TreeNode treeNode : list) + setNodeExpandedState(tree, (DefaultMutableTreeNode) treeNode); TreePath path = new TreePath(node.getPath()); tree.expandPath(path); diff --git a/src/com/thesuncat/whitehole/swing/SettingsForm.form b/src/com/thesuncat/whitehole/swing/SettingsForm.form index 7798474..55c04a2 100644 --- a/src/com/thesuncat/whitehole/swing/SettingsForm.form +++ b/src/com/thesuncat/whitehole/swing/SettingsForm.form @@ -37,9 +37,10 @@ - + + @@ -51,20 +52,11 @@ - - - - - - - - - - + @@ -80,81 +72,55 @@ - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - @@ -182,14 +148,6 @@ - - - - - - - - @@ -206,13 +164,6 @@ - - - - - - - diff --git a/src/com/thesuncat/whitehole/swing/SettingsForm.java b/src/com/thesuncat/whitehole/swing/SettingsForm.java index 3376197..26a16fa 100644 --- a/src/com/thesuncat/whitehole/swing/SettingsForm.java +++ b/src/com/thesuncat/whitehole/swing/SettingsForm.java @@ -36,15 +36,13 @@ public SettingsForm(java.awt.Frame parent, boolean modal) { initDarkTheme(); if(Settings.japanese) initJapanese(); - txtObjectDBUrl.setText(Settings.objectDB_url); - chkObjectDBUpdate.setSelected(Settings.objectDB_update); + chkUseShaders.setSelected(Settings.editor_shaders); chkFastDrag.setSelected(Settings.editor_fastDrag); chkGameDir.setSelected(Settings.gameDir); chkDarkTheme.setSelected(Settings.dark); chkRichPresence.setSelected(Settings.richPresence); chkAntiAlias.setSelected(Settings.aa); - txtObjectDBUrl.setCaretPosition(0); chkFakeCol.setSelected(Settings.fakeCol); chkNoShaderRender.setSelected(Settings.legacy); chkJapanese.setSelected(Settings.japanese); @@ -60,9 +58,6 @@ private void initJapanese() { chkUseShaders.setText("3Dレンダリングにシェーダーを使用する(推奨)"); chkFastDrag.setText("右クリック&ドラックでワイヤーフレームで描写"); chkFakeCol.setText("すべてが青でレンダリングされ軽量化できます(低スペック向け)"); - lblObjectDatabase.setFont(chkUseShaders.getFont()); - lblObjectDatabase.setText("オブジェクトデータベース"); - lblUpdateUrl.setText("更新用URL"); lblMisc.setFont(chkAntiAlias.getFont()); lblMisc.setText("その他"); chkDarkTheme.setText("ダークテーマ"); @@ -79,7 +74,7 @@ private void initJapanese() { private void initDarkTheme() { ArrayList chkArray = new ArrayList<>(); chkArray.addAll(Arrays.asList(chkAntiAlias, chkDarkTheme, chkFakeCol, chkFastDrag, chkGameDir, chkJapanese, chkNoShaderRender, - chkObjectDBUpdate, chkRichPresence, chkUseShaders, chkReverseRot, chkFileNames, chkAssoc)); + chkRichPresence, chkUseShaders, chkReverseRot, chkFileNames, chkAssoc)); for (int i = 0; i < chkArray.size(); i++){ chkArray.get(i).setBackground(new Color(32,34,37)); chkArray.get(i).setForeground(new Color(157,158,161)); @@ -87,10 +82,7 @@ private void initDarkTheme() { this.getContentPane().setBackground(new Color(32,34,37)); lblMisc.setForeground(new Color(157,158,161)); - lblUpdateUrl.setForeground(new Color(157,158,161)); lblRendering.setForeground(new Color(157,158,161)); - lblObjectDatabase.setForeground(new Color(157,158,161)); - txtObjectDBUrl.setBackground(new Color(177,178,181)); } private void installAssoc() { @@ -130,16 +122,12 @@ private void execCommand(String com) { private void initComponents() { jCheckBox1 = new javax.swing.JCheckBox(); - chkObjectDBUpdate = new javax.swing.JCheckBox(); chkUseShaders = new javax.swing.JCheckBox(); chkFastDrag = new javax.swing.JCheckBox(); btnCancel = new javax.swing.JButton(); btnOk = new javax.swing.JButton(); - lblObjectDatabase = new javax.swing.JLabel(); lblRendering = new javax.swing.JLabel(); lblMisc = new javax.swing.JLabel(); - lblUpdateUrl = new javax.swing.JLabel(); - txtObjectDBUrl = new javax.swing.JTextField(); chkGameDir = new javax.swing.JCheckBox(); chkDarkTheme = new javax.swing.JCheckBox(); chkRichPresence = new javax.swing.JCheckBox(); @@ -158,9 +146,6 @@ private void initComponents() { setIconImage(Whitehole.ICON); setMinimumSize(new java.awt.Dimension(598, 235)); - chkObjectDBUpdate.setText("Check for object database updates on startup"); - chkObjectDBUpdate.setBorder(javax.swing.BorderFactory.createTitledBorder("")); - chkUseShaders.setSelected(true); chkUseShaders.setText("Use shaders for 3D rendering"); @@ -180,17 +165,12 @@ public void actionPerformed(java.awt.event.ActionEvent evt) { } }); - lblObjectDatabase.setFont(new java.awt.Font("Tahoma", 1, 11)); // NOI18N - lblObjectDatabase.setText("Object database"); - lblRendering.setFont(new java.awt.Font("Tahoma", 1, 11)); // NOI18N lblRendering.setText("Rendering"); lblMisc.setFont(new java.awt.Font("Tahoma", 1, 11)); // NOI18N lblMisc.setText("Misc"); - lblUpdateUrl.setText("Update URL:"); - chkGameDir.setText("Automatically reopen game directory"); chkGameDir.setActionCommand("Automatically reopen game folder"); @@ -225,9 +205,10 @@ public void actionPerformed(java.awt.event.ActionEvent evt) { getContentPane().setLayout(layout); layout.setHorizontalGroup( layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup() + .addGroup(layout.createSequentialGroup() .addContainerGap() .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addComponent(chkNoShaderRender) .addGroup(layout.createSequentialGroup() .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addComponent(chkAntiAlias) @@ -238,18 +219,11 @@ public void actionPerformed(java.awt.event.ActionEvent evt) { .addComponent(chkFakeCol)) .addGap(18, 18, 18) .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(lblObjectDatabase) .addComponent(lblMisc) .addComponent(chkGameDir) - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup() - .addComponent(lblUpdateUrl) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(txtObjectDBUrl)) - .addComponent(chkObjectDBUpdate)) .addGroup(layout.createSequentialGroup() .addComponent(chkDarkTheme) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addComponent(chkJapanese) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addComponent(chkAssoc)) @@ -260,56 +234,42 @@ public void actionPerformed(java.awt.event.ActionEvent evt) { .addGroup(layout.createSequentialGroup() .addComponent(btnOk) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(btnCancel) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) - .addComponent(chkNoShaderRender))) - .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) + .addComponent(btnCancel))) + .addContainerGap(12, Short.MAX_VALUE)) ); layout.setVerticalGroup( layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(layout.createSequentialGroup() - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(layout.createSequentialGroup() - .addContainerGap() - .addComponent(lblObjectDatabase) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) - .addComponent(lblUpdateUrl) - .addComponent(txtObjectDBUrl, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) - .addGap(3, 3, 3) - .addComponent(chkObjectDBUpdate) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) - .addComponent(lblMisc) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) - .addComponent(chkDarkTheme) - .addComponent(chkJapanese) - .addComponent(chkAssoc)) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(chkGameDir) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) - .addComponent(chkRichPresence) - .addComponent(chkFileNames)) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) - .addComponent(chkNoShaderRender) - .addComponent(btnCancel) - .addComponent(btnOk))) - .addGroup(layout.createSequentialGroup() - .addGap(17, 17, 17) - .addComponent(lblRendering) - .addGap(5, 5, 5) - .addComponent(chkAntiAlias) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(chkUseShaders, javax.swing.GroupLayout.PREFERRED_SIZE, 20, javax.swing.GroupLayout.PREFERRED_SIZE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(chkFastDrag) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(chkReverseRot) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(chkFakeCol))) - .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) + .addGap(17, 17, 17) + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) + .addComponent(lblRendering) + .addComponent(lblMisc)) + .addGap(5, 5, 5) + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) + .addComponent(chkAntiAlias) + .addComponent(chkDarkTheme) + .addComponent(chkJapanese) + .addComponent(chkAssoc)) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) + .addComponent(chkUseShaders, javax.swing.GroupLayout.PREFERRED_SIZE, 20, javax.swing.GroupLayout.PREFERRED_SIZE) + .addComponent(chkGameDir)) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) + .addComponent(chkFastDrag) + .addComponent(chkRichPresence) + .addComponent(chkFileNames)) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(chkReverseRot) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(chkFakeCol) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(chkNoShaderRender) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) + .addComponent(btnCancel) + .addComponent(btnOk)) + .addGap(0, 11, Short.MAX_VALUE)) ); pack(); @@ -323,8 +283,7 @@ private void btnCancelActionPerformed(java.awt.event.ActionEvent evt)//GEN-FIRST private void btnOkActionPerformed(java.awt.event.ActionEvent evt)//GEN-FIRST:event_btnOkActionPerformed {//GEN-HEADEREND:event_btnOkActionPerformed - Settings.objectDB_url = txtObjectDBUrl.getText(); - Settings.objectDB_update = chkObjectDBUpdate.isSelected(); + Settings.editor_shaders = chkUseShaders.isSelected(); Settings.editor_fastDrag = chkFastDrag.isSelected(); Settings.gameDir = chkGameDir.isSelected(); @@ -364,16 +323,12 @@ private void chkAssocActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRS private javax.swing.JCheckBox chkGameDir; private javax.swing.JCheckBox chkJapanese; private javax.swing.JCheckBox chkNoShaderRender; - private javax.swing.JCheckBox chkObjectDBUpdate; private javax.swing.JCheckBox chkReverseRot; private javax.swing.JCheckBox chkRichPresence; private javax.swing.JCheckBox chkUseShaders; private javax.swing.JCheckBox jCheckBox1; private javax.swing.JLabel lblMisc; - private javax.swing.JLabel lblObjectDatabase; private javax.swing.JLabel lblRendering; - private javax.swing.JLabel lblUpdateUrl; - private javax.swing.JTextField txtObjectDBUrl; // End of variables declaration//GEN-END:variables private boolean assocUpdate = false; } \ No newline at end of file