Upstream/Minepacks
1
0
Fork 0
mirror of https://github.com/GeorgH93/Minepacks.git synced 2025-02-27 03:32:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update PCGF PluginLib

Browse Source 
Add support for Cauldron / Uranium 1.7
Fix error with MySQL
This commit is contained in:
GeorgH93 2019-07-13 01:15:38 +02:00
parent f521f56195
commit 38a9463016
No known key found for this signature in database
GPG Key ID: D1630D37F9E4B3C8
3 changed files with 3 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pom.xml
View File

@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>at.pcgamingfreaks</groupId> <groupId>at.pcgamingfreaks</groupId>
<artifactId>Minepacks</artifactId> <artifactId>Minepacks</artifactId>
<version>2.0.8-RC3</version> <version>2.0.8</version>
<scm> <scm>
<connection>scm:git:git@github.com:GeorgH93/Minepacks.git</connection> <connection>scm:git:git@github.com:GeorgH93/Minepacks.git</connection>
@ -78,7 +78,7 @@
<dependency> <dependency>
<groupId>at.pcgamingfreaks</groupId> <groupId>at.pcgamingfreaks</groupId>
<artifactId>PluginLib</artifactId> <artifactId>PluginLib</artifactId>
<version>1.0.14-SNAPSHOT</version> <version>1.0.15-SNAPSHOT</version>
</dependency> </dependency>
<!-- BadRabbit --> <!-- BadRabbit -->
<dependency> <dependency>

42
src/at/pcgamingfreaks/Minepacks/Bukkit/Database/Config.java
View File

@ -93,48 +93,6 @@ public void setDatabaseType(String type)
} }
} }
@Override
public @NotNull String getSQLHost()
{
return getConfig().getString("Database.SQL.Host", "localhost");
}
@Override
public @NotNull String getSQLDatabase()
{
return getConfig().getString("Database.SQL.Database", "minecraft");
}
@Override
public @NotNull String getSQLUser()
{
return getConfig().getString("Database.SQL.User", "minecraft");
}
@Override
public @NotNull String getSQLPassword()
{
return getConfig().getString("Database.SQL.Password", "");
}
@Override
public int getSQLMaxConnections()
{
return getConfig().getInt("Database.SQL.MaxConnections", 2);
}
@Override
public @NotNull String getSQLConnectionProperties()
{
List<String> list = getConfig().getStringList("Database.SQL.Properties", new LinkedList<>());
StringBuilder str = new StringBuilder("?allowMultiQueries=true&autoReconnect=true");
for(String s : list)
{
str.append("&").append(s);
}
return str.toString();
}
public String getUserTable() public String getUserTable()
{ {
return getConfig().getString("Database.Tables.User", "backpack_players"); return getConfig().getString("Database.Tables.User", "backpack_players");

2
src/at/pcgamingfreaks/Minepacks/Bukkit/Minepacks.java
View File

@ -58,7 +58,7 @@ public class Minepacks extends JavaPlugin implements MinepacksPlugin
{ {
private static final int BUKKIT_PROJECT_ID = 83445; private static final int BUKKIT_PROJECT_ID = 83445;
@SuppressWarnings("unused") @SuppressWarnings("unused")
private static final String JENKINS_URL = "https://ci.pcgamingfreaks.at", JENKINS_JOB_DEV = "Minepacks V2", JENKINS_JOB_MASTER = "Minepacks", MIN_PCGF_PLUGIN_LIB_VERSION = "1.0.14-SNAPSHOT"; private static final String JENKINS_URL = "https://ci.pcgamingfreaks.at", JENKINS_JOB_DEV = "Minepacks V2", JENKINS_JOB_MASTER = "Minepacks", MIN_PCGF_PLUGIN_LIB_VERSION = "1.0.15-SNAPSHOT";
private static Minepacks instance = null; private static Minepacks instance = null;
private Config config; private Config config;