Compare commits
5 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
7f41eab5e4 | ||
|
|
0d1c2364da | ||
|
|
5bca33a9f5 | ||
|
|
1196fe8004 | ||
|
|
98ae416fa7 |
@@ -20,7 +20,7 @@ dependencies {
|
|||||||
compileOnly 'fr.neatmonster:nocheatplus:3.16.1-SNAPSHOT'
|
compileOnly 'fr.neatmonster:nocheatplus:3.16.1-SNAPSHOT'
|
||||||
compileOnly 'com.github.jiangdashao:matrix-api-repo:317d4635fd'
|
compileOnly 'com.github.jiangdashao:matrix-api-repo:317d4635fd'
|
||||||
compileOnly 'org.jetbrains:annotations:19.0.0'
|
compileOnly 'org.jetbrains:annotations:19.0.0'
|
||||||
compileOnly fileTree(dir: '/lib', include: ['*.jar'])
|
compileOnly fileTree(dir: 'lib', include: ['*.jar'])
|
||||||
|
|
||||||
// Lombok
|
// Lombok
|
||||||
compileOnly 'org.projectlombok:lombok:1.18.16'
|
compileOnly 'org.projectlombok:lombok:1.18.16'
|
||||||
@@ -98,5 +98,5 @@ build.dependsOn publishToMavenLocal
|
|||||||
|
|
||||||
group = 'com.willfp'
|
group = 'com.willfp'
|
||||||
archivesBaseName = project.name
|
archivesBaseName = project.name
|
||||||
version = '1.0.1'
|
version = '1.0.4'
|
||||||
java.sourceCompatibility = JavaVersion.VERSION_1_8
|
java.sourceCompatibility = JavaVersion.VERSION_1_8
|
||||||
@@ -28,6 +28,7 @@ public abstract class BaseConfig extends PluginDependent implements ValueGetter
|
|||||||
/**
|
/**
|
||||||
* The physical config file, as stored on disk.
|
* The physical config file, as stored on disk.
|
||||||
*/
|
*/
|
||||||
|
@Getter(AccessLevel.PROTECTED)
|
||||||
private final File configFile;
|
private final File configFile;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -38,10 +38,10 @@ public final class TelekinesisUtils {
|
|||||||
}
|
}
|
||||||
|
|
||||||
static {
|
static {
|
||||||
if (!Bukkit.getServicesManager().isProvidedFor(TelekinesisTests.class)) {
|
if (Bukkit.getServicesManager().getKnownServices().stream().noneMatch(clazz -> clazz.getName().contains("TelekinesisTests"))) {
|
||||||
Bukkit.getServicesManager().register(TelekinesisTests.class, new EcoTelekinesisTests(), AbstractEcoPlugin.getInstance(), ServicePriority.Normal);
|
Bukkit.getServicesManager().register(TelekinesisTests.class, new EcoTelekinesisTests(), AbstractEcoPlugin.getInstance(), ServicePriority.Normal);
|
||||||
}
|
}
|
||||||
|
|
||||||
tests = Bukkit.getServicesManager().load(TelekinesisTests.class);
|
tests = (TelekinesisTests) Bukkit.getServicesManager().load(Bukkit.getServicesManager().getKnownServices().stream().filter(clazz -> clazz.getName().contains("TelekinesisTests")).findFirst().get());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -51,6 +51,7 @@ import org.jetbrains.annotations.NotNull;
|
|||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
|
import java.util.HashSet;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
import java.util.stream.Collectors;
|
import java.util.stream.Collectors;
|
||||||
@@ -86,6 +87,18 @@ public abstract class AbstractEcoPlugin extends JavaPlugin {
|
|||||||
@Getter
|
@Getter
|
||||||
private final String proxyPackage;
|
private final String proxyPackage;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The color of the plugin, used in messages.
|
||||||
|
*/
|
||||||
|
@Getter
|
||||||
|
private final String color;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Loaded integrations.
|
||||||
|
*/
|
||||||
|
@Getter
|
||||||
|
private final Set<String> loadedIntegrations = new HashSet<>();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Set of external plugin integrations.
|
* Set of external plugin integrations.
|
||||||
*/
|
*/
|
||||||
@@ -159,15 +172,18 @@ public abstract class AbstractEcoPlugin extends JavaPlugin {
|
|||||||
* @param resourceId The spigot resource ID for the plugin.
|
* @param resourceId The spigot resource ID for the plugin.
|
||||||
* @param bStatsId The bStats resource ID for the plugin.
|
* @param bStatsId The bStats resource ID for the plugin.
|
||||||
* @param proxyPackage The package where proxy implementations are stored.
|
* @param proxyPackage The package where proxy implementations are stored.
|
||||||
|
* @param color The color of the plugin (used in messages, such as &a, &b)
|
||||||
*/
|
*/
|
||||||
protected AbstractEcoPlugin(@NotNull final String pluginName,
|
protected AbstractEcoPlugin(@NotNull final String pluginName,
|
||||||
final int resourceId,
|
final int resourceId,
|
||||||
final int bStatsId,
|
final int bStatsId,
|
||||||
@NotNull final String proxyPackage) {
|
@NotNull final String proxyPackage,
|
||||||
|
@NotNull final String color) {
|
||||||
this.pluginName = pluginName;
|
this.pluginName = pluginName;
|
||||||
this.resourceId = resourceId;
|
this.resourceId = resourceId;
|
||||||
this.bStatsId = bStatsId;
|
this.bStatsId = bStatsId;
|
||||||
this.proxyPackage = proxyPackage;
|
this.proxyPackage = proxyPackage;
|
||||||
|
this.color = color;
|
||||||
|
|
||||||
this.log = new EcoLogger(this);
|
this.log = new EcoLogger(this);
|
||||||
this.scheduler = new EcoScheduler(this);
|
this.scheduler = new EcoScheduler(this);
|
||||||
@@ -187,10 +203,7 @@ public abstract class AbstractEcoPlugin extends JavaPlugin {
|
|||||||
super.onLoad();
|
super.onLoad();
|
||||||
|
|
||||||
this.getLog().info("==========================================");
|
this.getLog().info("==========================================");
|
||||||
this.getLog().info("");
|
this.getLog().info("Loading " + this.color + this.pluginName);
|
||||||
this.getLog().info("Loading &a" + this.pluginName);
|
|
||||||
this.getLog().info("Made by &aAuxilor&f - willfp.com");
|
|
||||||
this.getLog().info("");
|
|
||||||
this.getLog().info("==========================================");
|
this.getLog().info("==========================================");
|
||||||
|
|
||||||
this.getEventManager().registerListener(new ArrowDataListener(this));
|
this.getEventManager().registerListener(new ArrowDataListener(this));
|
||||||
@@ -219,16 +232,12 @@ public abstract class AbstractEcoPlugin extends JavaPlugin {
|
|||||||
Set<String> enabledPlugins = Arrays.stream(Bukkit.getPluginManager().getPlugins()).map(Plugin::getName).collect(Collectors.toSet());
|
Set<String> enabledPlugins = Arrays.stream(Bukkit.getPluginManager().getPlugins()).map(Plugin::getName).collect(Collectors.toSet());
|
||||||
|
|
||||||
this.getDefaultIntegrations().forEach((integrationLoader -> {
|
this.getDefaultIntegrations().forEach((integrationLoader -> {
|
||||||
StringBuilder infoBuilder = new StringBuilder();
|
|
||||||
infoBuilder.append(integrationLoader.getPluginName()).append(": ");
|
|
||||||
if (enabledPlugins.contains(integrationLoader.getPluginName())) {
|
if (enabledPlugins.contains(integrationLoader.getPluginName())) {
|
||||||
|
this.loadedIntegrations.add(integrationLoader.getPluginName());
|
||||||
integrationLoader.load();
|
integrationLoader.load();
|
||||||
infoBuilder.append("&aENABLED");
|
|
||||||
} else {
|
|
||||||
infoBuilder.append("&9DISABLED");
|
|
||||||
}
|
}
|
||||||
this.getLog().info(infoBuilder.toString());
|
|
||||||
}));
|
}));
|
||||||
|
this.getLog().info("Loaded integrations: " + String.join(", ", this.getLoadedIntegrations()));
|
||||||
this.getLog().info("");
|
this.getLog().info("");
|
||||||
|
|
||||||
Prerequisite.update();
|
Prerequisite.update();
|
||||||
|
|||||||
Reference in New Issue
Block a user