Minecraft
/
PlaytimeReloaded
mirror of https://github.com/Sahrea/PlaytimeReloaded.git
1
0
Fork 0
Code Releases Activity

2e version

This commit is contained in:
Chris 2016-09-12 22:36:32 +02:00
parent db9883803c
commit d7f97897fe
4 changed files with 22 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
.idea/workspace.xml
View File

@ -7,16 +7,8 @@
</component>
<component name="ChangeListManager">
<list default="true" id="2349fe23-928a-4003-8915-70ed3a9a49d9" name="Default" comment="">
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/artifacts/PlaytimeReloaded.xml" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/spigot_1_10_2.xml" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/uiDesigner.xml" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/META-INF/MANIFEST.MF" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/plugin.yml" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/li/inc/PlaytimeReloaded/DataStore/Config.java" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/li/inc/PlaytimeReloaded/DataStore/DB/MySQL.java" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/li/inc/PlaytimeReloaded/DataStore/DB/MySQLTools.java" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/li/inc/PlaytimeReloaded/DataStore/UUIDFetcher.java" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/li/inc/PlaytimeReloaded/Playtime.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/li/inc/PlaytimeReloaded/DataStore/Config.java" afterPath="$PROJECT_DIR$/src/li/inc/PlaytimeReloaded/DataStore/Config.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/li/inc/PlaytimeReloaded/Playtime.java" afterPath="$PROJECT_DIR$/src/li/inc/PlaytimeReloaded/Playtime.java" />
</list>
<ignored path="PlaytimeReloaded.iws" />
<ignored path=".idea/workspace.xml" />
@ -37,11 +29,11 @@
</component>
<component name="FileEditorManager">
<leaf>
<file leaf-file-name="Playtime.java" pinned="false" current-in-tab="true">
<file leaf-file-name="Playtime.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/li/inc/PlaytimeReloaded/Playtime.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="376">
<caret line="65" column="47" selection-start-line="65" selection-start-column="47" selection-end-line="65" selection-end-column="47" />
<state relative-caret-position="223">
<caret line="108" column="9" selection-start-line="108" selection-start-column="9" selection-end-line="108" selection-end-column="9" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#1268#1269#0" expanded="true" />
@ -80,11 +72,11 @@
</provider>
</entry>
</file>
<file leaf-file-name="Config.java" pinned="false" current-in-tab="false">
<file leaf-file-name="Config.java" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/li/inc/PlaytimeReloaded/DataStore/Config.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="342">
<caret line="168" column="38" selection-start-line="168" selection-start-column="38" selection-end-line="168" selection-end-column="38" />
<state relative-caret-position="155">
<caret line="148" column="0" selection-start-line="148" selection-start-column="0" selection-end-line="148" selection-end-column="0" />
<folding />
</state>
</provider>
@ -147,8 +139,8 @@
<option value="$PROJECT_DIR$/src/li/inc/PlaytimeReloaded/DataStore/DB/MySQLTools.java" />
<option value="$PROJECT_DIR$/src/li/inc/PlaytimeReloaded/DataStore/UUIDFetcher.java" />
<option value="$PROJECT_DIR$/src/li/inc/PlaytimeReloaded/DataStore/DB/MySQL.java" />
<option value="$PROJECT_DIR$/src/li/inc/PlaytimeReloaded/DataStore/Config.java" />
<option value="$PROJECT_DIR$/src/li/inc/PlaytimeReloaded/Playtime.java" />
<option value="$PROJECT_DIR$/src/li/inc/PlaytimeReloaded/DataStore/Config.java" />
</list>
</option>
</component>
@ -639,14 +631,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/li/inc/PlaytimeReloaded/DataStore/Config.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="342">
<caret line="168" column="38" selection-start-line="168" selection-start-column="38" selection-end-line="168" selection-end-column="38" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/li/inc/PlaytimeReloaded/DataStore/DB/MySQL.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="291">
@ -659,8 +643,8 @@
</entry>
<entry file="file://$PROJECT_DIR$/src/li/inc/PlaytimeReloaded/Playtime.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="376">
<caret line="65" column="47" selection-start-line="65" selection-start-column="47" selection-end-line="65" selection-end-column="47" />
<state relative-caret-position="223">
<caret line="108" column="9" selection-start-line="108" selection-start-column="9" selection-end-line="108" selection-end-column="9" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#1268#1269#0" expanded="true" />
@ -669,6 +653,14 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/li/inc/PlaytimeReloaded/DataStore/Config.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="155">
<caret line="148" column="0" selection-start-line="148" selection-start-column="0" selection-end-line="148" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
</component>
<component name="masterDetails">
<states>

BIN
out/production/PlaytimeReloaded/li/inc/PlaytimeReloaded/Playtime.class
View File

Binary file not shown.

9
src/li/inc/PlaytimeReloaded/DataStore/Config.java
View File

@ -7,12 +7,6 @@ import org.bukkit.plugin.Plugin;
public class Config
{
//MySQL
private boolean m_useMySQL = false;
public boolean getUseMySQL()
{
return m_useMySQL;
}
private String m_MySqlHost = "127.0.0.1";
public String getMysqlHost()
{
@ -129,7 +123,6 @@ public class Config
private void getConfigValues(FileConfiguration _config)
{
m_useMySQL = _config.getBoolean("enable.mysql");
m_MySqlHost = _config.getString("mysql.host");
m_MySqlPort = _config.getInt("mysql.port");
m_MySqlDB = _config.getString("mysql.db");
@ -153,8 +146,6 @@ public class Config
private void saveConfigValues(FileConfiguration _config)
{
_config.set("enable.mysql", m_useMySQL);
_config.set("mysql.host", m_MySqlHost);
_config.set("mysql.port", m_MySqlPort);
_config.set("mysql.db", m_MySqlDB);

9
src/li/inc/PlaytimeReloaded/Playtime.java
View File

@ -77,7 +77,7 @@ public class Playtime extends JavaPlugin implements Listener
Player _player = (Player)sender;
if(_player.hasPermission("playtime.use.others"))
{
_player.sendMessage(getChatMessage(m_config.getTextYourCurrentPlaytime(), args[0], m_mysql.getPlayerTime(_searchPlayer), 0));
_player.sendMessage(getChatMessage(m_config.getTextPlayerPlaytimeIs(), args[0], m_mysql.getPlayerTime(_searchPlayer), 0));
}else{
_player.sendMessage(getChatMessage(m_config.getTextNoPermission(), args[0], 0, 0));
}
@ -103,11 +103,10 @@ public class Playtime extends JavaPlugin implements Listener
@EventHandler
public void onPlayerJoin(PlayerJoinEvent event)
{
if(event.getPlayer().hasPermission("playtime.use.others"))
if(event.getPlayer().hasPermission("playtime.use") && event.getPlayer().hasPermission("playtime.login"))
{
event.getPlayer().sendMessage(getChatMessage(m_config.getTextYourCurrentPlaytime(), event.getPlayer().getName(), m_mysql.getPlayerTime(event.getPlayer().getUniqueId()), 0));
}
}
private void refreshPlaytime()
@ -162,8 +161,6 @@ public class Playtime extends JavaPlugin implements Listener
long hours = seconds % 86400 / 3600;
long days = seconds / 86400;
System.out.println("Day " + days + " Hour " + hours + " Minute " + minutes + " Seconds " + sec);
return new long[]{days, hours, minutes, sec};
}
@ -173,7 +170,7 @@ public class Playtime extends JavaPlugin implements Listener
long seconds = _timeInMin * 60;
if(seconds == 0)
if(seconds != 0)
{
long[] _time = calculateTime(seconds);