Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .idea/compiler.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

468 changes: 278 additions & 190 deletions .idea/workspace.xml

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion Nicky.iml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5">
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="false">
<output url="file://$MODULE_DIR$/target/classes" />
<output-test url="file://$MODULE_DIR$/target/test-classes" />
<content url="file://$MODULE_DIR$">
Expand All @@ -27,5 +27,6 @@
<orderEntry type="library" name="Maven: com.comphenix.protocol:ProtocolLib-API:4.2.1" level="project" />
<orderEntry type="library" name="Maven: cglib:cglib-nodep:2.2.2" level="project" />
<orderEntry type="library" name="Maven: com.comphenix.executors:BukkitExecutors:1.1-SNAPSHOT" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: me.clip:placeholderapi:2.0.8" level="project" />
</component>
</module>
42 changes: 35 additions & 7 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,37 +3,65 @@
<modelVersion>4.0.0</modelVersion>
<groupId>io.loyloy.nicky</groupId>
<artifactId>Nicky</artifactId>
<version>0.6.9</version>
<version>0.7.0</version>
<name>Nicky</name>

<repositories>
<build>
<sourceDirectory>src</sourceDirectory>
<finalName>${project.artifactId}</finalName>
<resources>
<resource>
<directory>src</directory>
<excludes>
<exclude>**/*.java</exclude>
</excludes>
</resource>
</resources>
<plugins>
<plugin>
<version>3.1</version>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.8</source>
<target>1.8</target>
</configuration>
</plugin>
</plugins>
</build>

<repositories>
<repository>
<id>spigot-repo</id>
<url>https://hub.spigotmc.org/nexus/content/groups/public/</url>
</repository>

<repository>
<id>dmulloy2-repo</id>
<url>http://repo.dmulloy2.net/nexus/repository/public/</url>
</repository>

<repository>
<id>placeholderapi</id>
<url>http://repo.extendedclip.com/content/repositories/placeholderapi/</url>
</repository>
</repositories>

<dependencies>

<dependency>
<groupId>org.spigotmc</groupId>
<artifactId>spigot-api</artifactId>
<version>1.8.7-R0.1-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>com.comphenix.protocol</groupId>
<artifactId>ProtocolLib-API</artifactId>
<version>4.2.1</version>
</dependency>

<dependency>
<groupId>me.clip</groupId>
<artifactId>placeholderapi</artifactId>
<version>2.0.8</version>
<scope>provided</scope>
</dependency>
</dependencies>

</project>
File renamed without changes.
6 changes: 0 additions & 6 deletions src/io/loyloy/nicky/Nick.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
import io.loyloy.nicky.databases.SQL;
import org.bukkit.ChatColor;
import org.bukkit.entity.Player;
import org.kitteh.tag.TagAPI;

import java.util.List;

Expand Down Expand Up @@ -145,10 +144,5 @@ private void refresh()
{
unLoad();
load();

if( Nicky.isTagAPIUsed() )
{
TagAPI.refreshPlayer( player );
}
}
}
13 changes: 6 additions & 7 deletions src/io/loyloy/nicky/Nicky.java
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import io.loyloy.nicky.databases.MySQL;
import io.loyloy.nicky.databases.SQL;
import io.loyloy.nicky.databases.SQLite;
import io.loyloy.nicky.hook.PAPIHook;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.configuration.file.FileConfiguration;
Expand Down Expand Up @@ -34,7 +35,7 @@ public class Nicky extends JavaPlugin

public Nicky()
{
databases = new HashSet<SQL>();
databases = new HashSet<>();
}

@Override
Expand All @@ -50,14 +51,12 @@ public void onEnable()
PluginManager pm = getServer().getPluginManager();
pm.registerEvents( new PlayerListener(), this );

if( pm.isPluginEnabled( "TagAPI" ) && getConfig().getBoolean( "tagapi" ) )
{
pm.registerEvents( new TagAPIListener(), this );
log( "TagAPI link enabled." );
TAGAPI = true;
if (pm.isPluginEnabled("PlaceholderAPI")) {
new PAPIHook(this).hook();
log("PlaceholderAPI hook has been enabled.");
}

BLACKLIST = new ArrayList<String>();
BLACKLIST = new ArrayList<>();
reloadNickyConfig();

getCommand( "nick" ).setExecutor( new NickCommand( this ) );
Expand Down
19 changes: 0 additions & 19 deletions src/io/loyloy/nicky/TagAPIListener.java

This file was deleted.

4 changes: 2 additions & 2 deletions plugin.yml → src/plugin.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
name: Nicky
main: io.loyloy.nicky.Nicky
version: 0.6.9
version: 0.7.0
description: Simple SQL nickname plugin.
author: Melonking
softdepend: [TagAPI]
softdepend: [TagAPI, PlaceholderAPI]

commands:
nicky:
Expand Down