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-21 10:09:14 -06:00
commit 2f7c165c01
21 changed files with 44 additions and 26 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.38</version> <version>2.4.39</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.38"; private final static String coreVersion = "2.4.39";
/** /**
* This is specific to the website api * This is specific to the website api

28
Core/src/main/java/com/songoda/core/utils/ItemUtils.java
View File

@ -7,6 +7,7 @@ import com.mojang.authlib.GameProfile;
import com.mojang.authlib.properties.Property; import com.mojang.authlib.properties.Property;
import com.songoda.core.compatibility.CompatibleHand; import com.songoda.core.compatibility.CompatibleHand;
import com.songoda.core.compatibility.CompatibleMaterial; import com.songoda.core.compatibility.CompatibleMaterial;
import com.songoda.core.compatibility.CompatibleSound;
import com.songoda.core.compatibility.ServerVersion; import com.songoda.core.compatibility.ServerVersion;
import com.songoda.core.nms.NmsManager; import com.songoda.core.nms.NmsManager;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
@ -120,21 +121,38 @@ public class ItemUtils {
} }
public static ItemStack addDamage(ItemStack item, int damage) { public static ItemStack addDamage(ItemStack item, int damage) {
if (item == null) { return addDamage(null, item, damage);
}
public static ItemStack addDamage(Player player, ItemStack item, int damage) {
if (item == null)
return null; return null;
} else if (ServerVersion.isServerVersionBelow(ServerVersion.V1_11)
? NmsManager.getNbt().of(item).has("Unbreakable") int maxDurability = item.getType().getMaxDurability();
: item.getItemMeta().isUnbreakable()) { int durability;
if (ServerVersion.isServerVersionBelow(ServerVersion.V1_11)
? NmsManager.getNbt().of(item).has("Unbreakable")
: item.getItemMeta().isUnbreakable()) {
return item; return item;
} else if (ServerVersion.isServerVersionAtLeast(ServerVersion.V1_13)) { } else if (ServerVersion.isServerVersionAtLeast(ServerVersion.V1_13)) {
// ItemStack.setDurability(short) still works in 1.13-1.14, but use these methods now // ItemStack.setDurability(short) still works in 1.13-1.14, but use these methods now
ItemMeta meta = item.getItemMeta(); ItemMeta meta = item.getItemMeta();
if (meta instanceof Damageable) { if (meta instanceof Damageable) {
((Damageable) meta).setDamage(((Damageable) meta).getDamage() + damage); Damageable damageable = ((Damageable) meta);
damageable.setDamage(((Damageable) meta).getDamage() + damage);
item.setItemMeta(meta); item.setItemMeta(meta);
durability = damageable.getDamage();
} else {
return item;
} }
} else { } else {
item.setDurability((short) Math.max(0, item.getDurability() + damage)); item.setDurability((short) Math.max(0, item.getDurability() + damage));
durability = item.getDurability();
}
if (durability >= maxDurability && player != null) {
player.getInventory().removeItem(item);
CompatibleSound.ENTITY_ITEM_BREAK.play(player);
} }
return item; return item;
} }

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.38</version> <version>2.4.39</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.38</version> <version>2.4.39</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.38</version> <version>2.4.39</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.38</version> <version>2.4.39</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.38</version> <version>2.4.39</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.38</version> <version>2.4.39</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.38</version> <version>2.4.39</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.38</version> <version>2.4.39</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.38</version> <version>2.4.39</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.38</version> <version>2.4.39</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.38</version> <version>2.4.39</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.38</version> <version>2.4.39</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.38</version> <version>2.4.39</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.38</version> <version>2.4.39</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.38</version> <version>2.4.39</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.38</version> <version>2.4.39</version>
<relativePath>../../</relativePath> <relativePath>../../</relativePath>
</parent> </parent>

4
README.md
View File

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

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.38</version> <version>2.4.39</version>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging> <packaging>pom</packaging>