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 2021-06-13 13:23:39 -05:00
commit b7a6981a83
23 changed files with 28 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Compatibility/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.5.2</version> <version>2.5.3</version>
<relativePath>../</relativePath> <relativePath>../</relativePath>
</parent> </parent>

2
Compatibility/src/com/songoda/core/compatibility/ClassMapping.java
View File

@ -37,7 +37,7 @@ public enum ClassMapping {
CRAFT_BLOCK("block", "CraftBlock"), CRAFT_BLOCK("block", "CraftBlock"),
CRAFT_BLOCK_DATA("block.data", "CraftBlockData"), CRAFT_BLOCK_DATA("block.data", "CraftBlockData"),
CRAFT_CHUNK("craftChunk"), CRAFT_CHUNK("CraftChunk"),
CRAFT_ENTITY("entity", "CraftEntity"), CRAFT_ENTITY("entity", "CraftEntity"),
CRAFT_PLAYER("entity", "CraftPlayer"), CRAFT_PLAYER("entity", "CraftPlayer"),
CRAFT_WORLD("CraftWorld"); CRAFT_WORLD("CraftWorld");

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.5.2</version> <version>2.5.3</version>
<relativePath>../</relativePath> <relativePath>../</relativePath>
</parent> </parent>

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

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

6
Core/src/main/java/com/songoda/core/world/SItemStack.java
View File

@ -1,5 +1,6 @@
package com.songoda.core.world; package com.songoda.core.world;
import com.songoda.core.compatibility.CompatibleHand;
import com.songoda.core.compatibility.CompatibleSound; 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;
@ -20,6 +21,11 @@ public class SItemStack {
this.sItem = NmsManager.getWorld().getItemStack(item); this.sItem = NmsManager.getWorld().getItemStack(item);
} }
public SItemStack(CompatibleHand hand, Player player) {
this.item = hand.getItem(player);
this.sItem = NmsManager.getWorld().getItemStack(item);
}
/** /**
* Damage the selected item * Damage the selected 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.5.2</version> <version>2.5.3</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.5.2</version> <version>2.5.3</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.5.2</version> <version>2.5.3</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.5.2</version> <version>2.5.3</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.5.2</version> <version>2.5.3</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.5.2</version> <version>2.5.3</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.5.2</version> <version>2.5.3</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.5.2</version> <version>2.5.3</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.5.2</version> <version>2.5.3</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.5.2</version> <version>2.5.3</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.5.2</version> <version>2.5.3</version>
<relativePath>../../</relativePath> <relativePath>../../</relativePath>
</parent> </parent>

2
NMS/NMS-v1_17_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.5.2</version> <version>2.5.3</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.5.2</version> <version>2.5.3</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.5.2</version> <version>2.5.3</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.5.2</version> <version>2.5.3</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.5.2</version> <version>2.5.3</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.5.2</version> <version>2.5.3</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.5.2</version> <version>2.5.3</version>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging> <packaging>pom</packaging>