Upstream/SongodaCore
1
0
Fork 0
mirror of https://github.com/songoda/SongodaCore.git synced 2024-10-23 12:50:17 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'development'

Browse Source
This commit is contained in:
Brianna 2020-04-22 13:03:12 -04:00
commit 2862c7ec57
16 changed files with 117 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab-ci.yml
View File

@ -4,7 +4,7 @@ stages:
variables:
name: "SongodaCore"
path: "/builds/$CI_PROJECT_PATH"
version: "2.3.24"
version: "2.3.25"
build:
stage: build

40
.idea/jarRepositories.xml Normal file
View File

@ -0,0 +1,40 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="RemoteRepositoriesConfiguration">
<remote-repository>
<option name="id" value="private" />
<option name="name" value="private" />
<option name="url" value="https://repo.songoda.com/artifactory/private/" />
</remote-repository>
<remote-repository>
<option name="id" value="spigot-repo" />
<option name="name" value="spigot-repo" />
<option name="url" value="https://hub.spigotmc.org/nexus/content/repositories/snapshots/" />
</remote-repository>
<remote-repository>
<option name="id" value="central" />
<option name="name" value="Central Repository" />
<option name="url" value="https://repo.maven.apache.org/maven2" />
</remote-repository>
<remote-repository>
<option name="id" value="central" />
<option name="name" value="Maven Central repository" />
<option name="url" value="https://repo1.maven.org/maven2" />
</remote-repository>
<remote-repository>
<option name="id" value="jitpack.io" />
<option name="name" value="jitpack.io" />
<option name="url" value="https://jitpack.io" />
</remote-repository>
<remote-repository>
<option name="id" value="public" />
<option name="name" value="public" />
<option name="url" value="https://repo.songoda.com/artifactory/public/" />
</remote-repository>
<remote-repository>
<option name="id" value="jboss.community" />
<option name="name" value="JBoss Community repository" />
<option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
</remote-repository>
</component>
</project>

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

@ -315,7 +315,7 @@ public class CommandManager implements CommandExecutor, TabCompleter {
// If we're on Paper 1.8, we need to register timings (spigot creates timings on init, paper creates it on register)
// later versions of paper create timings if needed when the command is executed
if (ServerProject.isServer(ServerProject.PAPER, ServerProject.TACO) && ServerVersion.isServerVersionBelow(ServerVersion.V1_9)) {
// commandObject.timings = co.aikar.timings.TimingsManager.getCommandTiming(plugin.getName().toLowerCase(), commandObject);
//commandObject.timings = co.aikar.timings.TimingsManager.getCommandTiming(plugin.getName().toLowerCase(), commandObject);
}
// Set command action

4
NMS/NMS-API/src/com/songoda/core/nms/nbt/NBTCompound.java
View File

@ -1,7 +1,5 @@
package com.songoda.core.nms.nbt;
import java.util.List;
public interface NBTCompound {
NBTCompound set(String tag, String s);
@ -10,6 +8,8 @@ public interface NBTCompound {
NBTCompound set(String tag, int i);
NBTCompound set(String tag, double i);
NBTCompound set(String tag, long l);
NBTCompound set(String tag, short s);

6
NMS/NMS-v1_10_R1/src/com/songoda/core/nms/v1_10_R1/nbt/NBTCompoundImpl.java
View File

@ -34,6 +34,12 @@ public class NBTCompoundImpl implements NBTCompound {
return this;
}
@Override
public NBTCompound set(String tag, double i) {
compound.setDouble(tag, i);
return this;
}
@Override
public NBTCompound set(String tag, long l) {
compound.setLong(tag, l);

6
NMS/NMS-v1_11_R1/src/com/songoda/core/nms/v1_11_R1/nbt/NBTCompoundImpl.java
View File

@ -34,6 +34,12 @@ public class NBTCompoundImpl implements NBTCompound {
return this;
}
@Override
public NBTCompound set(String tag, double i) {
compound.setDouble(tag, i);
return this;
}
@Override
public NBTCompound set(String tag, long l) {
compound.setLong(tag, l);

6
NMS/NMS-v1_12_R1/src/com/songoda/core/nms/v1_12_R1/nbt/NBTCompoundImpl.java
View File

@ -34,6 +34,12 @@ public class NBTCompoundImpl implements NBTCompound {
return this;
}
@Override
public NBTCompound set(String tag, double i) {
compound.setDouble(tag, i);
return this;
}
@Override
public NBTCompound set(String tag, long l) {
compound.setLong(tag, l);

8
NMS/NMS-v1_13_R1/src/com/songoda/core/nms/v1_13_R1/nbt/NBTCompoundImpl.java
View File

@ -4,7 +4,7 @@ import com.songoda.core.nms.nbt.NBTCompound;
import com.songoda.core.nms.nbt.NBTObject;
import net.minecraft.server.v1_13_R1.NBTTagCompound;
public class NBTCompoundImpl implements NBTCompound {
public class NBTCompoundImpl implements NBTCompound {
protected NBTTagCompound compound;
@ -34,6 +34,12 @@ public class NBTCompoundImpl implements NBTCompound {
return this;
}
@Override
public NBTCompound set(String tag, double i) {
compound.setDouble(tag, i);
return this;
}
@Override
public NBTCompound set(String tag, long l) {
compound.setLong(tag, l);

6
NMS/NMS-v1_13_R2/src/com/songoda/core/nms/v1_13_R2/nbt/NBTCompoundImpl.java
View File

@ -34,6 +34,12 @@ public class NBTCompoundImpl implements NBTCompound {
return this;
}
@Override
public NBTCompound set(String tag, double i) {
compound.setDouble(tag, i);
return this;
}
@Override
public NBTCompound set(String tag, long l) {
compound.setLong(tag, l);

6
NMS/NMS-v1_14_R1/src/com/songoda/core/nms/v1_14_R1/nbt/NBTCompoundImpl.java
View File

@ -34,6 +34,12 @@ public class NBTCompoundImpl implements NBTCompound {
return this;
}
@Override
public NBTCompound set(String tag, double i) {
compound.setDouble(tag, i);
return this;
}
@Override
public NBTCompound set(String tag, long l) {
compound.setLong(tag, l);

6
NMS/NMS-v1_15_R1/src/com/songoda/core/nms/v1_15_R1/nbt/NBTCompoundImpl.java
View File

@ -37,6 +37,12 @@ public class NBTCompoundImpl implements NBTCompound {
return this;
}
@Override
public NBTCompound set(String tag, double i) {
compound.setDouble(tag, i);
return this;
}
@Override
public NBTCompound set(String tag, long l) {
compound.setLong(tag, l);

6
NMS/NMS-v1_8_R1/src/com/songoda/core/nms/v1_8_R1/nbt/NBTCompoundImpl.java
View File

@ -34,6 +34,12 @@ public class NBTCompoundImpl implements NBTCompound {
return this;
}
@Override
public NBTCompound set(String tag, double i) {
compound.setDouble(tag, i);
return this;
}
@Override
public NBTCompound set(String tag, long l) {
compound.setLong(tag, l);

6
NMS/NMS-v1_8_R2/src/com/songoda/core/nms/v1_8_R2/nbt/NBTCompoundImpl.java
View File

@ -34,6 +34,12 @@ public class NBTCompoundImpl implements NBTCompound {
return this;
}
@Override
public NBTCompound set(String tag, double i) {
compound.setDouble(tag, i);
return this;
}
@Override
public NBTCompound set(String tag, long l) {
compound.setLong(tag, l);

6
NMS/NMS-v1_8_R3/src/com/songoda/core/nms/v1_8_R3/nbt/NBTCompoundImpl.java
View File

@ -34,6 +34,12 @@ public class NBTCompoundImpl implements NBTCompound {
return this;
}
@Override
public NBTCompound set(String tag, double i) {
compound.setDouble(tag, i);
return this;
}
@Override
public NBTCompound set(String tag, long l) {
compound.setLong(tag, l);

6
NMS/NMS-v1_9_R1/src/com/songoda/core/nms/v1_9_R1/nbt/NBTCompoundImpl.java
View File

@ -34,6 +34,12 @@ public class NBTCompoundImpl implements NBTCompound {
return this;
}
@Override
public NBTCompound set(String tag, double i) {
compound.setDouble(tag, i);
return this;
}
@Override
public NBTCompound set(String tag, long l) {
compound.setLong(tag, l);

6
NMS/NMS-v1_9_R2/src/com/songoda/core/nms/v1_9_R2/nbt/NBTCompoundImpl.java
View File

@ -34,6 +34,12 @@ public class NBTCompoundImpl implements NBTCompound {
return this;
}
@Override
public NBTCompound set(String tag, double i) {
compound.setDouble(tag, i);
return this;
}
@Override
public NBTCompound set(String tag, long l) {
compound.setLong(tag, l);