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

Updated to no longer use the private repo.

Browse Source
This commit is contained in:
Brianna 2021-01-15 10:45:28 -06:00
parent 793581a853
commit c593a52791
17 changed files with 56 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
Core/pom.xml
View File

@ -249,15 +249,15 @@
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.sainttx.holograms</groupId> <groupId>com.sainttx</groupId>
<artifactId>Holograms</artifactId> <artifactId>Holograms</artifactId>
<version>2.9.1</version> <version>2.13</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.zrips</groupId> <groupId>com.github.Zrips</groupId>
<artifactId>CMI</artifactId> <artifactId>CMI-API</artifactId>
<version>8.4.0.2_1</version> <version>7.6.2.0</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
@ -293,7 +293,7 @@
<dependency> <dependency>
<groupId>com.sk89q</groupId> <groupId>com.sk89q</groupId>
<artifactId>worldguard-bukkit</artifactId> <artifactId>worldguard-bukkit</artifactId>
<version>7.1.0</version> <version>7.0.4</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
@ -305,13 +305,13 @@
<dependency> <dependency>
<groupId>com.songoda</groupId> <groupId>com.songoda</groupId>
<artifactId>UltimateStacker</artifactId> <artifactId>UltimateStacker</artifactId>
<version>2.0.1</version> <version>2.1.1</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.github.OmerBenGera</groupId> <groupId>com.bgsoftware</groupId>
<artifactId>WildStackerAPI</artifactId> <artifactId>wildstacker</artifactId>
<version>b16</version> <version>3.5.1</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
@ -321,14 +321,14 @@
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.gamingmesh</groupId> <groupId>com.github.Zrips</groupId>
<artifactId>jobs</artifactId> <artifactId>Jobs</artifactId>
<version>4.13.0</version> <version>LATEST</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.gmail.nossr50</groupId> <groupId>com.gmail.nossr50.mcMMO</groupId>
<artifactId>mcmmo</artifactId> <artifactId>mcMMO</artifactId>
<version>2.1.50</version> <version>2.1.50</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>

16
Core/src/main/java/com/songoda/core/hooks/holograms/CMIHolograms.java
View File

@ -20,7 +20,7 @@ public class CMIHolograms extends Holograms {
CMI cmi; CMI cmi;
HologramManager cmiHologramManager; HologramManager cmiHologramManager;
HashSet<String> ourHolograms = new HashSet(); HashSet<String> ourHolograms = new HashSet();
Method cmi_CMIHologram_getLines; Method cmi_CMIHologram_getLines, getLines;
{ {
try { try {
@ -89,15 +89,15 @@ public class CMIHolograms extends Holograms {
if (holo != null) { if (holo != null) {
// only update if there is a change to the text // only update if there is a change to the text
List<String> holoLines; List<String> holoLines;
if (cmi_CMIHologram_getLines != null) { try {
try { if (cmi_CMIHologram_getLines != null) {
holoLines = Arrays.asList((String[]) cmi_CMIHologram_getLines.invoke(holo)); holoLines = Arrays.asList((String[]) cmi_CMIHologram_getLines.invoke(holo));
} catch (Exception ex) { } else {
Logger.getLogger(CMIHolograms.class.getName()).log(Level.SEVERE, "CMI Hologram error!", ex); holoLines = (List<String>) cmi_CMIHologram_getLines.invoke(holo);
holoLines = Collections.EMPTY_LIST;
} }
} else { } catch (Exception ex) {
holoLines = holo.getLines(); Logger.getLogger(CMIHolograms.class.getName()).log(Level.SEVERE, "CMI Hologram error!", ex);
holoLines = Collections.EMPTY_LIST;
} }
boolean isChanged = lines.size() != holoLines.size(); boolean isChanged = lines.size() != holoLines.size();
if (!isChanged) { if (!isChanged) {

4
NMS/NMS-v1_10_R1/pom.xml
View File

@ -14,8 +14,8 @@
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>com.destroystokyo.papermc</groupId> <groupId>org.spigotmc</groupId>
<artifactId>paper</artifactId> <artifactId>spigot</artifactId>
<version>1.10.2</version> <version>1.10.2</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>

4
NMS/NMS-v1_11_R1/pom.xml
View File

@ -14,8 +14,8 @@
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>com.destroystokyo.papermc</groupId> <groupId>org.spigotmc</groupId>
<artifactId>paper</artifactId> <artifactId>spigot</artifactId>
<version>1.11.2</version> <version>1.11.2</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>

4
NMS/NMS-v1_12_R1/pom.xml
View File

@ -14,8 +14,8 @@
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>com.destroystokyo.papermc</groupId> <groupId>org.spigotmc</groupId>
<artifactId>paper</artifactId> <artifactId>spigot</artifactId>
<version>1.12.2</version> <version>1.12.2</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>

4
NMS/NMS-v1_13_R1/pom.xml
View File

@ -14,8 +14,8 @@
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>com.destroystokyo.papermc</groupId> <groupId>org.spigotmc</groupId>
<artifactId>paper</artifactId> <artifactId>spigot</artifactId>
<version>1.13</version> <version>1.13</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>

2
NMS/NMS-v1_13_R1/src/com/songoda/core/nms/v1_13_R1/nbt/NBTEntityImpl.java
View File

@ -59,7 +59,7 @@ public class NBTEntityImpl extends NBTCompoundImpl implements NBTEntity {
@Override @Override
public void addExtras() { public void addExtras() {
MinecraftKey key = EntityTypes.REGISTRY.b(nmsEntity.getEntityType()); MinecraftKey key = EntityTypes.REGISTRY.b(nmsEntity.P()); // Changed in 1.13
if (key != null) if (key != null)
compound.setString("entity_type", key.toString()); // Changed in 1.13 compound.setString("entity_type", key.toString()); // Changed in 1.13
} }

4
NMS/NMS-v1_13_R2/pom.xml
View File

@ -14,8 +14,8 @@
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>com.destroystokyo.papermc</groupId> <groupId>org.spigotmc</groupId>
<artifactId>paper</artifactId> <artifactId>spigot</artifactId>
<version>1.13.2</version> <version>1.13.2</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>

4
NMS/NMS-v1_14_R1/pom.xml
View File

@ -14,8 +14,8 @@
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>com.destroystokyo.papermc</groupId> <groupId>org.spigotmc</groupId>
<artifactId>paper</artifactId> <artifactId>spigot</artifactId>
<version>1.14.4</version> <version>1.14.4</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>

6
NMS/NMS-v1_15_R1/pom.xml
View File

@ -14,9 +14,9 @@
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>com.destroystokyo.papermc</groupId> <groupId>org.spigotmc</groupId>
<artifactId>paper</artifactId> <artifactId>spigot</artifactId>
<version>1.15.1</version> <version>1.15</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>

6
NMS/NMS-v1_8_R1/pom.xml
View File

@ -14,9 +14,9 @@
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.bukkit</groupId> <groupId>org.spigotmc</groupId>
<artifactId>craftbukkit</artifactId> <artifactId>spigot</artifactId>
<version>1.8-R0.1-20190912.143550-1</version> <version>1.8</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>

6
NMS/NMS-v1_8_R2/pom.xml
View File

@ -14,9 +14,9 @@
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.bukkit</groupId> <groupId>org.spigotmc</groupId>
<artifactId>craftbukkit</artifactId> <artifactId>spigot</artifactId>
<version>1.8.3-R0.1-20190912.192032-1</version> <version>1.8.3</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>

4
NMS/NMS-v1_8_R3/pom.xml
View File

@ -14,8 +14,8 @@
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>com.destroystokyo.papermc</groupId> <groupId>org.spigotmc</groupId>
<artifactId>paper</artifactId> <artifactId>spigot</artifactId>
<version>1.8.8</version> <version>1.8.8</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>

12
NMS/NMS-v1_9_R1/pom.xml
View File

@ -13,16 +13,10 @@
<packaging>jar</packaging> <packaging>jar</packaging>
<dependencies> <dependencies>
<!--dependency>
<groupId>com.destroystokyo.papermc</groupId>
<artifactId>paper</artifactId>
<version>1.8.8</version>
<scope>provided</scope>
</dependency-->
<dependency> <dependency>
<groupId>org.bukkit</groupId> <groupId>org.spigotmc</groupId>
<artifactId>craftbukkit</artifactId> <artifactId>spigot</artifactId>
<version>1.9.2-R0.1-20190912.192509-1</version> <version>1.9.2</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>

4
NMS/NMS-v1_9_R2/pom.xml
View File

@ -14,8 +14,8 @@
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>com.destroystokyo.papermc</groupId> <groupId>org.spigotmc</groupId>
<artifactId>paper</artifactId> <artifactId>spigot</artifactId>
<version>1.9.4</version> <version>1.9.4</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>

8
pom.xml
View File

@ -43,10 +43,6 @@
</plugins> </plugins>
</build> </build>
<repositories> <repositories>
<repository>
<id>private</id>
<url>https://repo.songoda.com/repository/private/</url>
</repository>
<repository> <repository>
<id>public</id> <id>public</id>
<url>https://repo.songoda.com/repository/public/</url> <url>https://repo.songoda.com/repository/public/</url>
@ -59,6 +55,10 @@
<id>jitpack.io</id> <id>jitpack.io</id>
<url>https://jitpack.io</url> <url>https://jitpack.io</url>
</repository> </repository>
<repository>
<id>CodeMC</id>
<url>https://repo.codemc.org/repository/maven-public</url>
</repository>
</repositories> </repositories>
<!-- Global dependencies --> <!-- Global dependencies -->
<dependencies> <dependencies>

9
settings.xml
View File

@ -1,9 +0,0 @@
<settings>
<servers>
<server>
<id>private</id>
<username>{REPO_USER}</username>
<password>{REPO_PASS}</password>
</server>
</servers>
</settings>