Upstream/SongodaCore
1
0
Fork 0
mirror of https://github.com/songoda/SongodaCore.git synced 2024-11-27 12:35:12 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'development'

Browse Source
This commit is contained in:
Brianna 2020-09-22 15:40:53 -05:00
commit 3cdab9ec19
19 changed files with 22 additions and 18 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.7</version>
<version>2.4.8</version>
<relativePath>../</relativePath>
</parent>

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

@ -55,7 +55,7 @@ public class SongodaCore {
* This has been added as of Rev 6 <br>
* This value is automatically filled in by gitlab-ci
*/
private final static String coreVersion = "2.4.7";
private final static String coreVersion = "2.4.8";
/**
* This is specific to the website api

4
Core/src/main/java/com/songoda/core/compatibility/CompatibleBiome.java
View File

@ -185,6 +185,10 @@ public enum CompatibleBiome {
return biome == null ? null : lookupMap.get(biome.name());
}
public static CompatibleBiome getBiome(String name) {
return name == null ? null : lookupMap.get(name.toUpperCase());
}
public void setBiome(Chunk chunk) throws InvocationTargetException, IllegalAccessException {
Object nmsChunk = null;
Object biomeStorage = null;

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

@ -3,7 +3,7 @@
<parent>
<groupId>com.songoda</groupId>
<artifactId>SongodaCore-Modules</artifactId>
<version>2.4.7</version>
<version>2.4.8</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.7</version>
<version>2.4.8</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.7</version>
<version>2.4.8</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.7</version>
<version>2.4.8</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.7</version>
<version>2.4.8</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.7</version>
<version>2.4.8</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.7</version>
<version>2.4.8</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.7</version>
<version>2.4.8</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.7</version>
<version>2.4.8</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.7</version>
<version>2.4.8</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.7</version>
<version>2.4.8</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.7</version>
<version>2.4.8</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.7</version>
<version>2.4.8</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.7</version>
<version>2.4.8</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.7</version>
<version>2.4.8</version>
<relativePath>../../</relativePath>
</parent>

2
pom.xml
View File

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