Upstream/SongodaCore
1
0
Fork 0
mirror of https://github.com/songoda/SongodaCore.git synced 2025-02-25 07:51:20 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'development'

Browse Source
This commit is contained in:
Brianna 2021-05-27 17:16:56 -05:00
commit 5197e20335
21 changed files with 22 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Core/pom.xml
View File

@ -3,7 +3,7 @@
<parent>
<groupId>com.songoda</groupId>
<artifactId>SongodaCore-Modules</artifactId>
<version>2.4.55</version>
<version>2.4.56</version>
<relativePath>../</relativePath>
</parent>

31
Core/src/main/java/com/songoda/core/SongodaCore.java
View File

@ -56,7 +56,7 @@ public class SongodaCore {
/**
* This has been added as of Rev 6
*/
private final static String coreVersion = "2.4.55";
private final static String coreVersion = "2.4.56";
/**
* This is specific to the website api
@ -85,7 +85,6 @@ public class SongodaCore {
}
public static void registerPlugin(JavaPlugin plugin, int pluginID, String icon, String coreVersion) {
boolean showAds = false;
if (INSTANCE == null) {
// First: are there any other instances of SongodaCore active?
for (Class<?> clazz : Bukkit.getServicesManager().getKnownServices()) {
@ -121,8 +120,6 @@ public class SongodaCore {
// register ourselves as the SongodaCore service!
INSTANCE = new SongodaCore(plugin);
INSTANCE.init();
PluginInfo info = INSTANCE.register(plugin, pluginID, icon, coreVersion);
Bukkit.getScheduler().runTaskLater(plugin, () -> runAds(info), 100L);
Bukkit.getServicesManager().register(SongodaCore.class, INSTANCE, plugin, ServicePriority.Normal);
// we need (JavaPlugin plugin, int pluginID, String icon) for our object
if (!otherPlugins.isEmpty()) {
@ -150,12 +147,8 @@ public class SongodaCore {
// register ourselves as the SongodaCore service!
INSTANCE = new SongodaCore(plugin);
INSTANCE.init();
showAds = true;
Bukkit.getServicesManager().register(SongodaCore.class, INSTANCE, plugin, ServicePriority.Normal);
}
PluginInfo info = INSTANCE.register(plugin, pluginID, icon, coreVersion);
if (showAds)
Bukkit.getScheduler().runTaskLater(plugin, () -> runAds(info), 100L);
}
SongodaCore() {
@ -202,28 +195,6 @@ public class SongodaCore {
loginListener = null;
}
private static void runAds(PluginInfo pluginInfo) {
if (registeredPlugins.stream().noneMatch(p -> p.getJavaPlugin().getName().toLowerCase().contains("ultimate")))
return;
JSONObject json = pluginInfo.getJson();
JSONArray ads = (JSONArray) json.get("ads");
if (ads == null || ads.isEmpty())
return;
ConsoleCommandSender console = Bukkit.getConsoleSender();
console.sendMessage(String.format("%s---------------------- %sSongoda+ ads %s----------------------", ChatColor.GRAY.toString(),
ChatColor.LIGHT_PURPLE.toString(), ChatColor.GRAY.toString()));
for (Object o : ads) {
JSONObject ad = (JSONObject) o;
console.sendMessage(String.format("%s" + ad.get("patron") + " - " + ad.get("link")
+ " - " + ad.get("descr"), ChatColor.DARK_PURPLE));
}
console.sendMessage(String.format("%s---------- %sPut your ad here patreon.songoda.com %s----------", ChatColor.GRAY.toString(),
ChatColor.LIGHT_PURPLE.toString(), ChatColor.GRAY.toString()));
}
private ArrayList<BukkitTask> tasks = new ArrayList();
private PluginInfo register(JavaPlugin plugin, int pluginID, String icon, String libraryVersion) {

2
NMS/NMS-API/pom.xml
View File

@ -3,7 +3,7 @@
<parent>
<groupId>com.songoda</groupId>
<artifactId>SongodaCore-Modules</artifactId>
<version>2.4.55</version>
<version>2.4.56</version>
<relativePath>../../</relativePath>
</parent>

2
NMS/NMS-v1_10_R1/pom.xml
View File

@ -3,7 +3,7 @@
<parent>
<groupId>com.songoda</groupId>
<artifactId>SongodaCore-Modules</artifactId>
<version>2.4.55</version>
<version>2.4.56</version>
<relativePath>../../</relativePath>
</parent>

2
NMS/NMS-v1_11_R1/pom.xml
View File

@ -3,7 +3,7 @@
<parent>
<groupId>com.songoda</groupId>
<artifactId>SongodaCore-Modules</artifactId>
<version>2.4.55</version>
<version>2.4.56</version>
<relativePath>../../</relativePath>
</parent>

2
NMS/NMS-v1_12_R1/pom.xml
View File

@ -3,7 +3,7 @@
<parent>
<groupId>com.songoda</groupId>
<artifactId>SongodaCore-Modules</artifactId>
<version>2.4.55</version>
<version>2.4.56</version>
<relativePath>../../</relativePath>
</parent>

2
NMS/NMS-v1_13_R1/pom.xml
View File

@ -3,7 +3,7 @@
<parent>
<groupId>com.songoda</groupId>
<artifactId>SongodaCore-Modules</artifactId>
<version>2.4.55</version>
<version>2.4.56</version>
<relativePath>../../</relativePath>
</parent>

2
NMS/NMS-v1_13_R2/pom.xml
View File

@ -3,7 +3,7 @@
<parent>
<groupId>com.songoda</groupId>
<artifactId>SongodaCore-Modules</artifactId>
<version>2.4.55</version>
<version>2.4.56</version>
<relativePath>../../</relativePath>
</parent>

2
NMS/NMS-v1_14_R1/pom.xml
View File

@ -3,7 +3,7 @@
<parent>
<groupId>com.songoda</groupId>
<artifactId>SongodaCore-Modules</artifactId>
<version>2.4.55</version>
<version>2.4.56</version>
<relativePath>../../</relativePath>
</parent>

2
NMS/NMS-v1_15_R1/pom.xml
View File

@ -3,7 +3,7 @@
<parent>
<groupId>com.songoda</groupId>
<artifactId>SongodaCore-Modules</artifactId>
<version>2.4.55</version>
<version>2.4.56</version>
<relativePath>../../</relativePath>
</parent>

2
NMS/NMS-v1_16_R1/pom.xml
View File

@ -3,7 +3,7 @@
<parent>
<groupId>com.songoda</groupId>
<artifactId>SongodaCore-Modules</artifactId>
<version>2.4.55</version>
<version>2.4.56</version>
<relativePath>../../</relativePath>
</parent>

2
NMS/NMS-v1_16_R2/pom.xml
View File

@ -3,7 +3,7 @@
<parent>
<groupId>com.songoda</groupId>
<artifactId>SongodaCore-Modules</artifactId>
<version>2.4.55</version>
<version>2.4.56</version>
<relativePath>../../</relativePath>
</parent>

2
NMS/NMS-v1_16_R3/pom.xml
View File

@ -3,7 +3,7 @@
<parent>
<groupId>com.songoda</groupId>
<artifactId>SongodaCore-Modules</artifactId>
<version>2.4.55</version>
<version>2.4.56</version>
<relativePath>../../</relativePath>
</parent>

2
NMS/NMS-v1_8_R1/pom.xml
View File

@ -3,7 +3,7 @@
<parent>
<groupId>com.songoda</groupId>
<artifactId>SongodaCore-Modules</artifactId>
<version>2.4.55</version>
<version>2.4.56</version>
<relativePath>../../</relativePath>
</parent>

2
NMS/NMS-v1_8_R2/pom.xml
View File

@ -3,7 +3,7 @@
<parent>
<groupId>com.songoda</groupId>
<artifactId>SongodaCore-Modules</artifactId>
<version>2.4.55</version>
<version>2.4.56</version>
<relativePath>../../</relativePath>
</parent>

2
NMS/NMS-v1_8_R3/pom.xml
View File

@ -3,7 +3,7 @@
<parent>
<groupId>com.songoda</groupId>
<artifactId>SongodaCore-Modules</artifactId>
<version>2.4.55</version>
<version>2.4.56</version>
<relativePath>../../</relativePath>
</parent>

2
NMS/NMS-v1_9_R1/pom.xml
View File

@ -3,7 +3,7 @@
<parent>
<groupId>com.songoda</groupId>
<artifactId>SongodaCore-Modules</artifactId>
<version>2.4.55</version>
<version>2.4.56</version>
<relativePath>../../</relativePath>
</parent>

2
NMS/NMS-v1_9_R2/pom.xml
View File

@ -3,7 +3,7 @@
<parent>
<groupId>com.songoda</groupId>
<artifactId>SongodaCore-Modules</artifactId>
<version>2.4.55</version>
<version>2.4.56</version>
<relativePath>../../</relativePath>
</parent>

4
README.md
View File

@ -18,7 +18,7 @@ Maven Information
<dependency>
<groupId>com.songoda</groupId>
<artifactId>SongodaCore</artifactId>
<version>2.4.55</version>
<version>2.4.56</version>
<scope>provided</scope>
</dependency>
```
@ -37,6 +37,6 @@ repositories {
* Artifact:
```groovy
dependencies {
compileOnly 'com.songoda:SongodaCore:2.4.55'
compileOnly 'com.songoda:SongodaCore:2.4.56'
}
```

2
compatibility/pom.xml
View File

@ -3,7 +3,7 @@
<parent>
<groupId>com.songoda</groupId>
<artifactId>SongodaCore-Modules</artifactId>
<version>2.4.55</version>
<version>2.4.56</version>
<relativePath>../</relativePath>
</parent>

2
pom.xml
View File

@ -2,7 +2,7 @@
<groupId>com.songoda</groupId>
<artifactId>SongodaCore-Modules</artifactId>
<version>2.4.55</version>
<version>2.4.56</version>
<modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging>