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

Merge branch 'development'

Browse Source
This commit is contained in:
Brianna 2021-05-27 09:55:10 -05:00
commit 8334aecfba
22 changed files with 25 additions and 27 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.53</version> <version>2.4.54</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.4.53"; private final static String coreVersion = "2.4.54";
/** /**
* This is specific to the website api * This is specific to the website api

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

@ -20,7 +20,7 @@ public class CMIHolograms extends Holograms {
private static CMI cmi; private static CMI cmi;
private static HologramManager cmiHologramManager; private static HologramManager cmiHologramManager;
private static HashSet<String> ourHolograms = new HashSet(); private static HashSet<String> ourHolograms = new HashSet<>();
private static Method cmi_CMIHologram_getLines; private static Method cmi_CMIHologram_getLines;
private static boolean useOldMethod; private static boolean useOldMethod;
@ -98,7 +98,7 @@ public class CMIHolograms extends Holograms {
} }
} catch (Exception ex) { } catch (Exception ex) {
Logger.getLogger(CMIHolograms.class.getName()).log(Level.SEVERE, "CMI Hologram error!", ex); Logger.getLogger(CMIHolograms.class.getName()).log(Level.SEVERE, "CMI Hologram error!", ex);
holoLines = Collections.EMPTY_LIST; holoLines = Collections.emptyList();
} }
boolean isChanged = lines.size() != holoLines.size(); boolean isChanged = lines.size() != holoLines.size();
if (!isChanged) { if (!isChanged) {
@ -128,7 +128,6 @@ public class CMIHolograms extends Holograms {
} }
private void createAt(Location location, List<String> lines) { private void createAt(Location location, List<String> lines) {
final String id = locStr(location); final String id = locStr(location);
CMIHologram holo = new CMIHologram(id, location); CMIHologram holo = new CMIHologram(id, location);
holo.setLines(lines); holo.setLines(lines);
@ -136,8 +135,6 @@ public class CMIHolograms extends Holograms {
cmiHologramManager.addHologram(holo); cmiHologramManager.addHologram(holo);
holo.update(); holo.update();
if (!ourHolograms.contains(id)) { ourHolograms.add(id);
ourHolograms.add(id);
}
} }
} }

1
Core/src/main/java/com/songoda/core/hooks/holograms/HolographicDisplaysHolograms.java
View File

@ -2,6 +2,7 @@ package com.songoda.core.hooks.holograms;
import com.gmail.filoghost.holographicdisplays.api.Hologram; import com.gmail.filoghost.holographicdisplays.api.Hologram;
import com.gmail.filoghost.holographicdisplays.api.HologramsAPI; import com.gmail.filoghost.holographicdisplays.api.HologramsAPI;
import com.gmail.filoghost.holographicdisplays.api.line.TextLine;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.plugin.Plugin; import org.bukkit.plugin.Plugin;

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.53</version> <version>2.4.54</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.53</version> <version>2.4.54</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.53</version> <version>2.4.54</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.53</version> <version>2.4.54</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.53</version> <version>2.4.54</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.53</version> <version>2.4.54</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.53</version> <version>2.4.54</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.53</version> <version>2.4.54</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.53</version> <version>2.4.54</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.53</version> <version>2.4.54</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.53</version> <version>2.4.54</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.53</version> <version>2.4.54</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.53</version> <version>2.4.54</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.53</version> <version>2.4.54</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.53</version> <version>2.4.54</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.53</version> <version>2.4.54</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.53</version> <version>2.4.54</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.53' compileOnly 'com.songoda:SongodaCore:2.4.54'
} }
``` ```

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.53</version> <version>2.4.54</version>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging> <packaging>pom</packaging>