Skip to content
This repository was archived by the owner on Sep 26, 2018. It is now read-only.
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
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@
target/
AdvancedKitsReloaded.iml

.classpath
.project
.settings/

### Java template
# Compiled class file
*.class
Expand Down
4 changes: 4 additions & 0 deletions .settings/org.eclipse.m2e.core.prefs
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
activeProfiles=
eclipse.preferences.version=1
resolveWorkspaceProjects=true
version=1
40 changes: 0 additions & 40 deletions advancedkits.iml

This file was deleted.

66 changes: 19 additions & 47 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<groupId>hu.tryharddevs</groupId>
<artifactId>advancedkits</artifactId>
<version>1.1.14</version>
<version>1.1.16</version>

<name>AdvancedKitsReloaded</name>

Expand All @@ -22,16 +22,16 @@

<repository>
<id>placeholderapi-repo</id>
<url>http://repo.extendedclip.com/content/repositories/placeholderapi/</url>
<url>https://repo.extendedclip.com/content/repositories/placeholderapi/</url>
</repository>
<repository>
<id>vault-repo</id>
<url>http://nexus.hc.to/content/repositories/pub_releases/</url>
<url>https://nexus.hc.to/content/repositories/pub_releases/</url>
</repository>

<repository>
<id>aikar-repo</id>
<url>http://ci.emc.gs/nexus/content/groups/aikar/</url>
<url>https://ci.emc.gs/nexus/content/groups/aikar/</url>
</repository>
<repository>
<id>jitpack.io</id>
Expand All @@ -46,7 +46,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.2</version>
<version>3.8.1</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
Expand All @@ -60,7 +60,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>3.0.1</version>
<version>3.2.1</version>
<executions>
<execution>
<id>attach-sources</id>
Expand All @@ -73,14 +73,13 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>2.4.1</version>
<version>3.2.4</version>
<configuration>
<dependencyReducedPomLocation>${project.build.directory}/dependency-reduced-pom.xml</dependencyReducedPomLocation>
<artifactSet>
<includes>
<include>co.aikar:acf-core</include>
<include>co.aikar:minecraft-timings</include>
<include>com.github.TryHardDood:ReflectionHelper</include>
<include>com.github.InventivetalentDev:ParticleAPI</include>
</includes>
</artifactSet>
Expand All @@ -101,10 +100,6 @@
<pattern>co.aikar.timings.lib</pattern>
<shadedPattern>hu.tryharddevs.advancedkits.utils.timings</shadedPattern>
</relocation>
<relocation>
<pattern>org.inventivetalent.reflection</pattern>
<shadedPattern>hu.tryharddevs.advancedkits.utils.reflection</shadedPattern>
</relocation>
<relocation>
<pattern>org.inventivetalent.particle</pattern>
<shadedPattern>hu.tryharddevs.advancedkits.utils.particle</shadedPattern>
Expand All @@ -120,29 +115,6 @@
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<version>1.8</version>
<executions>
<execution>
<id>copy</id>
<phase>package</phase>
<configuration>
<target>
<echo>Copying AdvancedKitsReloaded.jar to localtest</echo>
<copy todir="C:\Users\rsnco\Desktop\Servers\Servers\plugins" overwrite="true" flatten="true">
<fileset dir="${basedir}">
<include name="target/AdvancedKitsReloaded.jar" />
</fileset>
</copy>
</target>
</configuration>
<goals>
<goal>run</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
<resources>
<resource>
Expand All @@ -154,21 +126,27 @@

<dependencies>
<dependency>
<groupId>org.bukkit</groupId>
<artifactId>bukkit</artifactId>
<version>1.12-pre2-SNAPSHOT</version>
<groupId>org.spigotmc</groupId>
<artifactId>spigot-api</artifactId>
<version>1.16.5-R0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>me.clip</groupId>
<artifactId>placeholderapi</artifactId>
<version>2.7.1</version>
<version>2.10.10</version>
</dependency>
<dependency>
<groupId>net.milkbowl.vault</groupId>
<artifactId>VaultAPI</artifactId>
<version>1.6</version>
<version>1.7</version>
<exclusions>
<exclusion>
<groupId>org.bukkit</groupId>
<artifactId>bukkit</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
Expand All @@ -179,13 +157,7 @@
<dependency>
<groupId>co.aikar</groupId>
<artifactId>minecraft-timings</artifactId>
<version>1.0.3</version>
</dependency>

<dependency>
<groupId>com.github.TryHardDood</groupId>
<artifactId>ReflectionHelper</artifactId>
<version>-SNAPSHOT</version>
<version>1.0.4</version>
</dependency>
<dependency>
<groupId>com.github.InventivetalentDev</groupId>
Expand Down
21 changes: 1 addition & 20 deletions src/main/java/hu/tryharddevs/advancedkits/AdvancedKitsMain.java
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
import org.bukkit.ChatColor;
import org.bukkit.plugin.RegisteredServiceProvider;
import org.bukkit.plugin.java.JavaPlugin;
import org.inventivetalent.reflection.minecraft.Minecraft;

import java.util.ArrayList;
import java.util.Arrays;
Expand All @@ -43,12 +42,6 @@ public void onEnable() {
this.log(ChatColor.GREEN + "Starting " + this.getDescription().getName() + " " + this.getDescription().getVersion());
advancedKits = this;

if (Minecraft.VERSION.olderThan(Minecraft.Version.v1_9_R1)) {
this.log(ChatColor.RED + "ERROR: Unsupported Minecraft version. (" + Minecraft.VERSION.toString() + ")");
this.setEnabled(false);
return;
}

// Hooking vault
this.log("Hooking to Vault.");
Boolean vaultFound = this.getServer().getPluginManager().getPlugin("Vault") != null;
Expand Down Expand Up @@ -81,7 +74,7 @@ public void onEnable() {
// Register events
this.log("Registering events");
this.getServer().getPluginManager().registerEvents(new PlayerListener(this), this);
this.getServer().getPluginManager().registerEvents(new CInventoryMain(this), this);
this.getServer().getPluginManager().registerEvents(new CInventoryMain(), this);

// Register CommandManager and the Commands.
this.log("Registering commands.");
Expand All @@ -101,18 +94,6 @@ public void onEnable() {
commandManager.registerCommand(new UseCommand(this));
commandManager.registerCommand(new MainCommand(this));

// Check for update
if (Config.AUTOUPDATE_ENABLED) {
this.log("Checking for updates.");
new Updater(this, 91129, this.getFile(), Updater.UpdateType.DEFAULT, true);
}

// Check if metrics is enabled
if (Config.METRICS_ENABLED) {
this.log("Enabling Plugin Metrics.");
new MetricsLite(this);
}

this.log(ChatColor.GREEN + "Finished loading " + this.getDescription().getName() + " " + this.getDescription().getVersion() + " by " + this.getDescription().getAuthors().stream().collect(Collectors.joining(",")));
}

Expand Down
14 changes: 0 additions & 14 deletions src/main/java/hu/tryharddevs/advancedkits/Config.java
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@ public class Config {
public static String CHAT_PREFIX = ChatColor.translateAlternateColorCodes('&', "&7[&6AdvancedKits&7]");
public static String LOCALE = "en";
public static Boolean COLORED_LOG = true;
public static Boolean METRICS_ENABLED = true;
public static Boolean AUTOUPDATE_ENABLED = true;
public static Boolean TITLES_ENABLED = true;
public static Boolean ACTIONBARS_ENABLED = true;
public static List<String> DISABLED_WORLDS = new ArrayList<>();
Expand Down Expand Up @@ -42,16 +40,6 @@ public static void loadConfigurationValues(AdvancedKitsMain instance) {
oldConfig = true;
}

if (!config.contains("MetricsEnabled")) {
config.addDefault("MetricsEnabled", true);
oldConfig = true;
}

if (!config.contains("AutoUpdateEnabled")) {
config.addDefault("AutoUpdateEnabled", true);
oldConfig = true;
}

if (!config.contains("Messages.TitlesEnabled")) {
config.addDefault("Messages.TitlesEnabled", true);
oldConfig = true;
Expand Down Expand Up @@ -83,8 +71,6 @@ public static void loadConfigurationValues(AdvancedKitsMain instance) {
LOCALE = config.getString("Locale");

COLORED_LOG = config.getBoolean("Log.ColoredLog");
METRICS_ENABLED = config.getBoolean("MetricsEnabled");
AUTOUPDATE_ENABLED = config.getBoolean("AutoUpdateEnabled");

TITLES_ENABLED = config.getBoolean("Messages.TitlesEnabled", true);
ACTIONBARS_ENABLED = config.getBoolean("Messages.ActionbarsEnabled", true);
Expand Down
Loading