Compare commits

..

No commits in common. "main" and "20240809161607" have entirely different histories.

11 changed files with 29 additions and 106 deletions

View file

@ -9,7 +9,7 @@ on:
jobs:
publish:
runs-on: docker
runs-on: ubuntu-latest
steps:
- name: Checkout Repository
uses: actions/checkout@v3

10
pom.xml
View file

@ -52,16 +52,6 @@
<artifactId>github-api</artifactId>
<version>1.127</version>
</dependency>
<dependency>
<groupId>com.sun.mail</groupId>
<artifactId>javax.mail</artifactId>
<version>1.6.2</version>
</dependency>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>8.0.33</version>
</dependency>
<dependency>
<groupId>io.qtjambi</groupId>
<artifactId>qtjambi</artifactId>

View file

@ -83,7 +83,6 @@ public class DownloadLevels {
fileOutputStream.write(dataBuffer, 0, bytesRead);
}
} catch (IOException e) {
e.printStackTrace();
}

View file

@ -6,7 +6,6 @@ import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import org.apache.commons.io.FileUtils;
import org.json.JSONException;
import org.json.JSONObject;
public class GuiData {
@ -81,15 +80,8 @@ public class GuiData {
localLevels.add(obj.getString("name"));
id.add(obj.getInt("id") + "");
try {
verifier.add(obj.getString("verifier"));
creator.add(obj.getString("author"));
} catch (JSONException e) {
verifier.add(Long.toString(obj.getLong("verifier")));
creator.add(Long.toString(obj.getLong("author")));
}
verifier.add(obj.getString("verifier"));
creator.add(obj.getString("author"));
qualification.add(obj.getInt("percentToQualify") + "");
ytlink.add(obj.getString("verification") + "");
creators.add(obj.getJSONArray("creators") + "");

View file

@ -176,42 +176,40 @@ public class Sqlite {
}
public void queryData(String tablename) {
FetchData fetch = new FetchData();
FetchData fetch = new FetchData();
for(int i = 0; i < fetch.allLevels().size(); i++) {
String sql = "SELECT levelname, levelID, author, creators, verifier, verificationLink, " +
"percentToQualify, completed, records, levelNameRaw, attempts, locked, " +
"personalBest, levelLength FROM " + tablename + " WHERE levelNameRaw = ?";
String sql = "SELECT * FROM " + tablename + " WHERE levelNameRaw = '" + fetch.allLevels().get(i) + "'";
try (Connection conn = DriverManager.getConnection(url);
PreparedStatement pstmt = conn.prepareStatement(sql)) {
Statement stmt = conn.createStatement();
ResultSet rs = stmt.executeQuery(sql)) {
for (int i = 0; i < fetch.allLevels().size(); i++) {
pstmt.setString(1, fetch.allLevels().get(i));
try (ResultSet rs = pstmt.executeQuery()) {
while (rs.next()) { // Sicherstellen, dass alle Zeilen verarbeitet werden
levelname.add(rs.getString("levelname"));
levelID.add(rs.getInt("levelID") + "");
author.add(rs.getString("author"));
creators.add(rs.getString("creators"));
verifier.add(rs.getString("verifier"));
verificationLink.add(rs.getString("verificationLink"));
percenttoqualify.add(rs.getInt("percentToQualify") + "");
completed.add(rs.getBoolean("completed") + "");
records.add(rs.getString("records"));
rawLevelNames.add(rs.getString("levelNameRaw"));
attempts.add(rs.getInt("attempts"));
locked.add(rs.getBoolean("locked"));
pbarr.add(rs.getString("personalBest"));
levelLength.add(rs.getString("levelLength"));
}
}
}
levelname.add(rs.getString("levelname"));
levelID.add(rs.getInt("levelID") + "");
author.add(rs.getString("author"));
creators.add(rs.getString("creators"));
verifier.add(rs.getString("verifier"));
verificationLink.add(rs.getString("verificationLink"));
percenttoqualify.add(rs.getInt("percentToQualify") + "");
completed.add(rs.getBoolean("completed") + "");
records.add(rs.getString("records"));
rawLevelNames.add(rs.getString("levelNameRaw"));
attempts.add(rs.getInt("attempts"));
locked.add(rs.getBoolean("locked")); // Get the value of the new column
pbarr.add(rs.getString("personalBest"));
levelLength.add(rs.getString("levelLength"));
} catch (SQLException e) {
e.printStackTrace();
}
}
}
public void sortData(String tablename) throws SQLException {
FetchData data = new FetchData();

View file

@ -1,21 +0,0 @@
package errorhandler;
import java.io.PrintWriter;
import java.io.StringWriter;
import javax.swing.JOptionPane;
public class ErrorHandler {
public void newError(Throwable e) {
e.printStackTrace();
StringWriter sw = new StringWriter();
PrintWriter pw = new PrintWriter(sw);
e.printStackTrace(pw);
JOptionPane.showMessageDialog(null, sw.toString() + "", e.getMessage(), JOptionPane.ERROR_MESSAGE);
System.exit(-1);
}
}

View file

@ -1,18 +0,0 @@
package errorhandler;
import java.util.Properties;
import javax.mail.Authenticator;
import javax.mail.Message;
import javax.mail.MessagingException;
import javax.mail.PasswordAuthentication;
import javax.mail.Session;
import javax.mail.Transport;
import javax.mail.internet.InternetAddress;
import javax.mail.internet.MimeMessage;
public class ErrorSubmission {
}

View file

@ -3,14 +3,11 @@ package main;
import java.io.IOException;
import java.util.zip.DataFormatException;
import javax.swing.JOptionPane;
import api.GetApiData;
import data.FetchData;
import data.ManageFiles;
import database.DatabaseManager;
import database.Sqlite;
import errorhandler.ErrorHandler;
import filestructure.CreateFileStructure;
import gui.LoadMenu;
import preload.PreChecks;
@ -19,16 +16,6 @@ import settingsfunctions.LoadSettings;
public class Main {
public static void main(String[] args) throws IOException, DataFormatException {
Thread.setDefaultUncaughtExceptionHandler(new Thread.UncaughtExceptionHandler() {
@Override
public void uncaughtException(Thread t, Throwable e) {
ErrorHandler error = new ErrorHandler();
error.newError(e);
}
});
try {
LoadMenu load = new LoadMenu();
load.onLoad();
@ -67,10 +54,6 @@ public class Main {
load.updateBar("Ladevorgang abgeschlossen");
load.close();
} catch (Exception e) {
System.out.println("fehler");
}
}
}

View file

@ -10,5 +10,4 @@
requires java.xml;
requires org.apache.commons.codec;
requires github.api;
requires java.mail;
}

View file

@ -24,4 +24,5 @@ public class PreChecks {
migration.migrateData();
}
}
}

View file

@ -16,7 +16,7 @@ import org.apache.commons.codec.binary.Base64;
public class DecryptXOR {
private static final String[] SAVES = {"CCGameManager.dat"};
private static final String[] SAVES = {"CCGameManager.dat"};
private static final int XOR_KEY = 11;
private static byte[] xor(byte[] data, int key) {