Upstream/SongodaCore
1
0
Fork 0
mirror of https://github.com/songoda/SongodaCore.git synced 2025-03-13 06:59:07 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'development'

Browse Source
This commit is contained in:
Brianna 2020-09-28 11:20:14 -05:00
commit f1718bc2dd
20 changed files with 32 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.idea/jarRepositories.xml
View File

@ -16,6 +16,11 @@
<option name="name" value="Central Repository" /> <option name="name" value="Central Repository" />
<option name="url" value="https://repo.maven.apache.org/maven2" /> <option name="url" value="https://repo.maven.apache.org/maven2" />
</remote-repository> </remote-repository>
<remote-repository>
<option name="id" value="private" />
<option name="name" value="private" />
<option name="url" value="https://repo.songoda.com/repository/private/" />
</remote-repository>
<remote-repository> <remote-repository>
<option name="id" value="central" /> <option name="id" value="central" />
<option name="name" value="Maven Central repository" /> <option name="name" value="Maven Central repository" />
@ -26,6 +31,11 @@
<option name="name" value="jitpack.io" /> <option name="name" value="jitpack.io" />
<option name="url" value="https://jitpack.io" /> <option name="url" value="https://jitpack.io" />
</remote-repository> </remote-repository>
<remote-repository>
<option name="id" value="public" />
<option name="name" value="public" />
<option name="url" value="https://repo.songoda.com/repository/public/" />
</remote-repository>
<remote-repository> <remote-repository>
<option name="id" value="public" /> <option name="id" value="public" />
<option name="name" value="public" /> <option name="name" value="public" />

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.9</version> <version>2.4.10</version>
<relativePath>../</relativePath> <relativePath>../</relativePath>
</parent> </parent>

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

@ -54,7 +54,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.9"; private final static String coreVersion = "2.4.10";
/** /**
* This is specific to the website api * This is specific to the website api

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

@ -126,7 +126,7 @@ public enum CompatibleBiome {
if (biome.isCompatible()) if (biome.isCompatible())
compatibleBiomes.add(biome); compatibleBiomes.add(biome);
if (ServerVersion.isServerVersionAtLeast(ServerVersion.V1_13)) { if (ServerVersion.isServerVersionAtLeast(ServerVersion.V1_15)) {
Class<?> classBiomeBase = NMSUtils.getNMSClass("BiomeBase"), Class<?> classBiomeBase = NMSUtils.getNMSClass("BiomeBase"),
classCraftChunk = NMSUtils.getCraftClass("CraftChunk"), classCraftChunk = NMSUtils.getCraftClass("CraftChunk"),
classCraftBlock = NMSUtils.getCraftClass("block.CraftBlock"), classCraftBlock = NMSUtils.getCraftClass("block.CraftBlock"),
@ -193,7 +193,7 @@ public enum CompatibleBiome {
Object nmsChunk = null; Object nmsChunk = null;
Object biomeStorage = null; Object biomeStorage = null;
Object biomeBase = null; Object biomeBase = null;
if (ServerVersion.isServerVersionAtLeast(ServerVersion.V1_13)) { if (ServerVersion.isServerVersionAtLeast(ServerVersion.V1_15)) {
nmsChunk = methodGetHandle.invoke(chunk); nmsChunk = methodGetHandle.invoke(chunk);
biomeStorage = methodGetBiomeIndex.invoke(nmsChunk); biomeStorage = methodGetBiomeIndex.invoke(nmsChunk);
if (isAbove1_16_R1) { if (isAbove1_16_R1) {
@ -208,14 +208,14 @@ public enum CompatibleBiome {
int chunkZ = chunk.getZ(); int chunkZ = chunk.getZ();
for (int x = chunkX << 4; x < (chunkX << 4) + 16; x++) { for (int x = chunkX << 4; x < (chunkX << 4) + 16; x++) {
for (int z = chunkZ << 4; z < (chunkZ << 4) + 16; z++) { for (int z = chunkZ << 4; z < (chunkZ << 4) + 16; z++) {
if (ServerVersion.isServerVersionAtLeast(ServerVersion.V1_13)) if (ServerVersion.isServerVersionAtLeast(ServerVersion.V1_15))
for (int y = 0; y < world.getMaxHeight(); ++y) for (int y = 0; y < world.getMaxHeight(); ++y)
methodSetBiome.invoke(biomeStorage, x >> 2, y >> 2, z >> 2, biomeBase); methodSetBiome.invoke(biomeStorage, x >> 2, y >> 2, z >> 2, biomeBase);
else else
chunk.getWorld().setBiome(x, z, getBiome()); chunk.getWorld().setBiome(x, z, getBiome());
} }
} }
if (ServerVersion.isServerVersionAtLeast(ServerVersion.V1_13)) if (ServerVersion.isServerVersionAtLeast(ServerVersion.V1_15))
methodMarkDirty.invoke(nmsChunk); methodMarkDirty.invoke(nmsChunk);
} }

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.9</version> <version>2.4.10</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.9</version> <version>2.4.10</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.9</version> <version>2.4.10</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.9</version> <version>2.4.10</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.9</version> <version>2.4.10</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.9</version> <version>2.4.10</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.9</version> <version>2.4.10</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.9</version> <version>2.4.10</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.9</version> <version>2.4.10</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.9</version> <version>2.4.10</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.9</version> <version>2.4.10</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.9</version> <version>2.4.10</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.9</version> <version>2.4.10</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.9</version> <version>2.4.10</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.9</version> <version>2.4.10</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.9</version> <version>2.4.10</version>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging> <packaging>pom</packaging>