Upstream/Jobs
1
0
Fork 0
mirror of https://github.com/Zrips/Jobs.git synced 2025-02-15 03:41:22 +01:00
Code Issues Projects Releases Wiki Activity

Use executeUpdate for table conversion when updating to ids

Browse Source
This commit is contained in:
montlikadani 2021-02-26 08:15:39 +01:00
parent 2a941c76cb
commit 4f475888a6
4 changed files with 38 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
pom.xml
View File

@ -14,12 +14,33 @@
</properties> </properties>
<dependencies> <dependencies>
<!-- Spigot -->
<dependency> <dependency>
<groupId>org.spigotmc</groupId> <groupId>com.destroystokyo.paper</groupId>
<artifactId>spigot-api</artifactId> <artifactId>paper-api</artifactId>
<version>1.16.5-R0.1-SNAPSHOT</version> <version>1.16.5-R0.1-SNAPSHOT</version>
<scope>provided</scope> <scope>provided</scope>
<exclusions>
<exclusion>
<groupId>org.ow2.asm</groupId>
<artifactId>asm-commons</artifactId>
</exclusion>
<exclusion>
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
</exclusion>
<exclusion>
<groupId>com.googlecode.json-simple</groupId>
<artifactId>json-simple</artifactId>
</exclusion>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
<exclusion>
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<!-- McMMO --> <!-- McMMO -->
<dependency> <dependency>
@ -178,11 +199,6 @@
</dependency> </dependency>
</dependencies> </dependencies>
<repositories> <repositories>
<!-- Spigot -->
<repository>
<id>spigot-repo</id>
<url>https://hub.spigotmc.org/nexus/content/groups/public/</url>
</repository>
<!-- Vault --> <!-- Vault -->
<repository> <repository>
<id>vault-repo</id> <id>vault-repo</id>

4
src/main/java/com/gamingmesh/jobs/config/ConfigManager.java
View File

@ -830,7 +830,7 @@ public class ConfigManager {
} }
Parser maxExpEquation; Parser maxExpEquation;
String maxExpEquationInput = jobKey.equalsIgnoreCase("None") ? "0" : jobSection.getString("leveling-progression-equation"); String maxExpEquationInput = jobKey.equalsIgnoreCase("None") ? "0" : jobSection.getString("leveling-progression-equation", "0");
try { try {
maxExpEquation = new Parser(maxExpEquationInput); maxExpEquation = new Parser(maxExpEquationInput);
// test equation // test equation
@ -859,7 +859,7 @@ public class ConfigManager {
} }
Parser expEquation; Parser expEquation;
String expEquationInput = jobKey.equalsIgnoreCase("None") ? "0" : jobSection.getString("experience-progression-equation"); String expEquationInput = jobKey.equalsIgnoreCase("None") ? "0" : jobSection.getString("experience-progression-equation", "0");
try { try {
expEquation = new Parser(expEquationInput); expEquation = new Parser(expEquationInput);
// test equation // test equation

20
src/main/java/com/gamingmesh/jobs/dao/JobsDAO.java
View File

@ -1024,7 +1024,7 @@ public abstract class JobsDAO {
for (JobsWorld jobsWorld : Util.getJobsWorlds().values()) { for (JobsWorld jobsWorld : Util.getJobsWorlds().values()) {
exploreStatement.setInt(1, jobsWorld.getId()); exploreStatement.setInt(1, jobsWorld.getId());
exploreStatement.setString(2, jobsWorld.getName()); exploreStatement.setString(2, jobsWorld.getName());
exploreStatement.execute(); exploreStatement.executeUpdate();
} }
} catch (SQLException e) { } catch (SQLException e) {
e.printStackTrace(); e.printStackTrace();
@ -1039,7 +1039,7 @@ public abstract class JobsDAO {
for (JobsWorld jobsWorld : Util.getJobsWorlds().values()) { for (JobsWorld jobsWorld : Util.getJobsWorlds().values()) {
exploreStatementBack.setString(1, jobsWorld.getName()); exploreStatementBack.setString(1, jobsWorld.getName());
exploreStatementBack.setInt(2, jobsWorld.getId()); exploreStatementBack.setInt(2, jobsWorld.getId());
exploreStatementBack.execute(); exploreStatementBack.executeUpdate();
} }
} catch (SQLException e) { } catch (SQLException e) {
e.printStackTrace(); e.printStackTrace();
@ -1054,7 +1054,7 @@ public abstract class JobsDAO {
for (JobsWorld jobsWorld : Util.getJobsWorlds().values()) { for (JobsWorld jobsWorld : Util.getJobsWorlds().values()) {
bpStatement.setInt(1, jobsWorld.getId()); bpStatement.setInt(1, jobsWorld.getId());
bpStatement.setString(2, jobsWorld.getName()); bpStatement.setString(2, jobsWorld.getName());
bpStatement.execute(); bpStatement.executeUpdate();
} }
} catch (SQLException e) { } catch (SQLException e) {
e.printStackTrace(); e.printStackTrace();
@ -1069,7 +1069,7 @@ public abstract class JobsDAO {
for (JobsWorld jobsWorld : Util.getJobsWorlds().values()) { for (JobsWorld jobsWorld : Util.getJobsWorlds().values()) {
bpStatementback.setString(1, jobsWorld.getName()); bpStatementback.setString(1, jobsWorld.getName());
bpStatementback.setInt(2, jobsWorld.getId()); bpStatementback.setInt(2, jobsWorld.getId());
bpStatementback.execute(); bpStatementback.executeUpdate();
} }
} catch (SQLException e) { } catch (SQLException e) {
e.printStackTrace(); e.printStackTrace();
@ -1084,7 +1084,7 @@ public abstract class JobsDAO {
for (Job job : Jobs.getJobs()) { for (Job job : Jobs.getJobs()) {
archiveStatement.setInt(1, job.getId()); archiveStatement.setInt(1, job.getId());
archiveStatement.setString(2, job.getName()); archiveStatement.setString(2, job.getName());
archiveStatement.execute(); archiveStatement.executeUpdate();
} }
} catch (SQLException e) { } catch (SQLException e) {
e.printStackTrace(); e.printStackTrace();
@ -1098,7 +1098,7 @@ public abstract class JobsDAO {
for (Job job : Jobs.getJobs()) { for (Job job : Jobs.getJobs()) {
archiveStatementBack.setString(1, job.getName()); archiveStatementBack.setString(1, job.getName());
archiveStatementBack.setInt(2, job.getId()); archiveStatementBack.setInt(2, job.getId());
archiveStatementBack.execute(); archiveStatementBack.executeUpdate();
} }
} catch (SQLException e) { } catch (SQLException e) {
e.printStackTrace(); e.printStackTrace();
@ -1112,7 +1112,7 @@ public abstract class JobsDAO {
for (Job job : Jobs.getJobs()) { for (Job job : Jobs.getJobs()) {
usersStatement.setInt(1, job.getId()); usersStatement.setInt(1, job.getId());
usersStatement.setString(2, job.getName()); usersStatement.setString(2, job.getName());
usersStatement.execute(); usersStatement.executeUpdate();
} }
} catch (SQLException e) { } catch (SQLException e) {
e.printStackTrace(); e.printStackTrace();
@ -1125,7 +1125,7 @@ public abstract class JobsDAO {
for (Job job : Jobs.getJobs()) { for (Job job : Jobs.getJobs()) {
usersStatementBack.setString(1, job.getName()); usersStatementBack.setString(1, job.getName());
usersStatementBack.setInt(2, job.getId()); usersStatementBack.setInt(2, job.getId());
usersStatementBack.execute(); usersStatementBack.executeUpdate();
} }
} catch (SQLException e) { } catch (SQLException e) {
e.printStackTrace(); e.printStackTrace();
@ -1140,7 +1140,7 @@ public abstract class JobsDAO {
for (CurrencyType type : CurrencyType.values()) { for (CurrencyType type : CurrencyType.values()) {
limitsStatement.setInt(1, type.getId()); limitsStatement.setInt(1, type.getId());
limitsStatement.setString(2, type.getName()); limitsStatement.setString(2, type.getName());
limitsStatement.execute(); limitsStatement.executeUpdate();
} }
} catch (SQLException e) { } catch (SQLException e) {
e.printStackTrace(); e.printStackTrace();
@ -1155,7 +1155,7 @@ public abstract class JobsDAO {
for (CurrencyType type : CurrencyType.values()) { for (CurrencyType type : CurrencyType.values()) {
limitsStatementBack.setString(1, type.getName()); limitsStatementBack.setString(1, type.getName());
limitsStatementBack.setInt(2, type.getId()); limitsStatementBack.setInt(2, type.getId());
limitsStatementBack.execute(); limitsStatementBack.executeUpdate();
} }
} catch (SQLException e) { } catch (SQLException e) {
e.printStackTrace(); e.printStackTrace();

4
src/main/resources/jobs/_EXAMPLE.yml
View File

@ -549,7 +549,7 @@ exampleJob:
fly: fly:
# Command its self, this will be executed from console, so all commands should work # Command its self, this will be executed from console, so all commands should work
# Possible variables are: [player] [jobname] [oldlevel] [newlevel] # Possible variables are: [player] [jobname] [oldlevel] [newlevel]
command: manuaddp [player] essentials.fly command: lp user [player] permission set essentials.fly
# When to execute this command first time # When to execute this command first time
levelFrom: 100 levelFrom: 100
@ -560,7 +560,7 @@ exampleJob:
kit: kit:
command: command:
- manuaddp [player] essentials.kits.woodcutter - lp user [player] permission set essentials.kits.woodcutter
- msg [player] Now you can use woodcutter kit! - msg [player] Now you can use woodcutter kit!
levelFrom: 150 levelFrom: 150