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

Merge branch 'development'

Browse Source
This commit is contained in:
Brianna 2021-01-14 11:58:50 -06:00
commit 22c64c7032
20 changed files with 88 additions and 20 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.34</version>
<version>2.4.35</version>
<relativePath>../</relativePath>
</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
*/
private final static String coreVersion = "2.4.34";
private final static String coreVersion = "2.4.35";
/**
* This is specific to the website api

70
Core/src/main/java/com/songoda/core/compatibility/CompatibleMaterial.java
View File

@ -2631,6 +2631,9 @@ public enum CompatibleMaterial {
}
/**
* Note: If using this on a legacy server without #getBlockMaterial
* you may run into issues.
*
* @return true if this is a block that has a growth state
*/
public boolean isCrop() {
@ -2648,8 +2651,73 @@ public enum CompatibleMaterial {
case SUGAR_CANE:
case WHEAT:
return true;
default:
return false;
}
}
/**
* @return the yield of this crop.
*/
public CompatibleMaterial getCropYield() {
switch (this) {
case BEETROOTS:
return BEETROOT;
case CACTUS:
return CACTUS;
case CARROTS:
return CARROT;
case CHORUS_FLOWER:
return CHORUS_PLANT;
case KELP:
return KELP;
case MELON_STEM:
return MELON;
case NETHER_WART:
return NETHER_WART;
case POTATOES:
return POTATO;
case PUMPKIN_STEM:
return PUMPKIN;
case SUGAR_CANE:
return SUGAR_CANE;
case WHEAT:
return WHEAT;
default:
return null;
}
}
/**
* @return the seed of this crop.
*/
public CompatibleMaterial getCropSeed() {
switch (this) {
case BEETROOTS:
return BEETROOT_SEEDS;
case CACTUS:
return CACTUS;
case CARROTS:
return CARROT;
case CHORUS_PLANT:
return CHORUS_FLOWER;
case KELP:
return KELP;
case MELON_STEM:
return MELON_SEEDS;
case NETHER_WART:
return NETHER_WART;
case POTATOES:
return POTATO;
case PUMPKIN_STEM:
return PUMPKIN_SEEDS;
case SUGAR_CANE:
return SUGAR_CANE;
case WHEAT:
return WHEAT_SEEDS;
default:
return null;
}
return false;
}
public static CompatibleMaterial getSpawnEgg(EntityType type) {

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

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

2
pom.xml
View File

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