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

feat: Compile v1_21_R1 nms module with Spigot 1.21.1 for compatibility

Browse Source
This commit is contained in:
Christian Koop 2024-08-11 10:39:45 +02:00
parent 91a92bc10b
commit 97a9e5f6e8
No known key found for this signature in database
GPG Key ID: 6A4A09E8ED946113
4 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/actions/setup_project_workspace/action.yml vendored
View File

@ -56,7 +56,7 @@ runs:
- uses: SpraxDev/Action-SpigotMC@v5 - uses: SpraxDev/Action-SpigotMC@v5
with: with:
versions: 1.20.6, 1.21 versions: 1.20.6, 1.21.1
remapped: true remapped: true
sftpCacheHost: ${{ inputs.spigot_buildtools_sftp_host }} sftpCacheHost: ${{ inputs.spigot_buildtools_sftp_host }}
sftpCachePort: ${{ inputs.spigot_buildtools_sftp_port }} sftpCachePort: ${{ inputs.spigot_buildtools_sftp_port }}

1
Compatibility/src/main/java/com/craftaro/core/compatibility/ServerVersion.java
View File

@ -78,6 +78,7 @@ public enum ServerVersion {
VERSION_TO_REVISION.put("1.20.5", "v1_20_R4"); VERSION_TO_REVISION.put("1.20.5", "v1_20_R4");
VERSION_TO_REVISION.put("1.20.6", "v1_20_R4"); VERSION_TO_REVISION.put("1.20.6", "v1_20_R4");
VERSION_TO_REVISION.put("1.21", "v1_21_R1"); VERSION_TO_REVISION.put("1.21", "v1_21_R1");
VERSION_TO_REVISION.put("1.21.1", "v1_21_R1");
if (Bukkit.getServer() != null) { if (Bukkit.getServer() != null) {
String srvPackage = Bukkit.getServer().getClass().getPackage().getName(); String srvPackage = Bukkit.getServer().getClass().getPackage().getName();

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

@ -16,7 +16,7 @@
<java.version>21</java.version> <java.version>21</java.version>
<java.release>21</java.release> <java.release>21</java.release>
<nms.ver>1.21-R0.1-SNAPSHOT</nms.ver> <nms.ver>1.21.1-R0.1-SNAPSHOT</nms.ver>
</properties> </properties>
<build> <build>

2
NMS/NMS-v1_21_R1/src/main/java/com/craftaro/core/nms/v1_21_R1/anvil/AnvilInventoryCustom.java
View File

@ -10,7 +10,7 @@ public class AnvilInventoryCustom extends CraftInventoryAnvil {
final InventoryHolder holder; final InventoryHolder holder;
public AnvilInventoryCustom(InventoryHolder holder, Location location, Container inventory, Container resultInventory, AnvilMenu container) { public AnvilInventoryCustom(InventoryHolder holder, Location location, Container inventory, Container resultInventory, AnvilMenu container) {
super(location, inventory, resultInventory, container); super(location, inventory, resultInventory);
this.holder = holder; this.holder = holder;
} }