Upstream/SongodaCore
1
0
Fork 0
mirror of https://github.com/songoda/SongodaCore.git synced 2025-01-14 19:41:24 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'development'

Browse Source
This commit is contained in:
Brianna 2020-12-16 10:02:18 -06:00
commit 9c9599880e
20 changed files with 46 additions and 19 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> <parent>
<groupId>com.songoda</groupId> <groupId>com.songoda</groupId>
<artifactId>SongodaCore-Modules</artifactId> <artifactId>SongodaCore-Modules</artifactId>
<version>2.4.28</version> <version>2.4.29</version>
<relativePath>../</relativePath> <relativePath>../</relativePath>
</parent> </parent>

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

@ -53,7 +53,7 @@ public class SongodaCore {
/** /**
* This has been added as of Rev 6 * This has been added as of Rev 6
*/ */
private final static String coreVersion = "2.4.28"; private final static String coreVersion = "2.4.29";
/** /**
* This is specific to the website api * This is specific to the website api

27
Core/src/main/java/com/songoda/core/utils/TextUtils.java
View File

@ -32,6 +32,33 @@ public class TextUtils {
return list.stream().map(TextUtils::formatText).collect(Collectors.toList()); return list.stream().map(TextUtils::formatText).collect(Collectors.toList());
} }
public static List<String> wrap(String line) {
return wrap(null, line);
}
public static List<String> wrap(String color, String line) {
if (color != null)
color = "&" + color;
else
color = "";
List<String> lore = new ArrayList<>();
int lastIndex = 0;
for (int n = 0; n < line.length(); n++) {
if (n - lastIndex < 25)
continue;
if (line.charAt(n) == ' ') {
lore.add(TextUtils.formatText(color + TextUtils.formatText(line.substring(lastIndex, n))));
lastIndex = n;
}
}
if (lastIndex - line.length() < 25)
lore.add(TextUtils.formatText(color + TextUtils.formatText(line.substring(lastIndex))));
return lore;
}
/** /**
* Convert a string to an invisible colored string that's lore-safe <br /> * Convert a string to an invisible colored string that's lore-safe <br />

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

2
pom.xml
View File

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