From 253883c73514c79b85074584535cb24cde7670d4 Mon Sep 17 00:00:00 2001 From: Fernando Pettinelli Date: Sat, 18 Dec 2021 23:15:46 -0300 Subject: [PATCH 1/4] Hologram hook rework. Only tested with DecentHolograms, needs further testing. --- Core/pom.xml | 7 ++ .../songoda/core/hooks/HologramManager.java | 30 +++--- .../com/songoda/core/hooks/PluginHook.java | 2 + .../core/hooks/holograms/CMIHolograms.java | 33 +++---- .../holograms/DecentHologramsHolograms.java | 98 +++++++++++++++++++ .../core/hooks/holograms/Holograms.java | 18 ++-- .../hooks/holograms/HologramsHolograms.java | 38 +++---- .../HolographicDisplaysHolograms.java | 86 ++++++++-------- 8 files changed, 204 insertions(+), 108 deletions(-) create mode 100644 Core/src/main/java/com/songoda/core/hooks/holograms/DecentHologramsHolograms.java diff --git a/Core/pom.xml b/Core/pom.xml index 7bd29b17..bf89efe9 100644 --- a/Core/pom.xml +++ b/Core/pom.xml @@ -365,6 +365,13 @@ 4.9.0.6 provided + + + com.github.decentsoftware-eu + decentholograms + 2.2.5 + provided + diff --git a/Core/src/main/java/com/songoda/core/hooks/HologramManager.java b/Core/src/main/java/com/songoda/core/hooks/HologramManager.java index 23abc545..29d17222 100644 --- a/Core/src/main/java/com/songoda/core/hooks/HologramManager.java +++ b/Core/src/main/java/com/songoda/core/hooks/HologramManager.java @@ -47,21 +47,21 @@ public class HologramManager { return manager.getCurrentHook(); } - public static void createHologram(Location location, String line) { + public static void createHologram(String id, Location location, String line) { if (manager.isEnabled()) { - manager.getCurrentHook().createHologram(location, line); + manager.getCurrentHook().createHologram(id, location, line); } } - public static void createHologram(Location location, List lines) { + public static void createHologram(String id, Location location, List lines) { if (manager.isEnabled()) { - manager.getCurrentHook().createHologram(location, lines); + manager.getCurrentHook().createHologram(id, location, lines); } } - public static void removeHologram(Location location) { + public static void removeHologram(String id) { if (manager.isEnabled()) { - manager.getCurrentHook().removeHologram(location); + manager.getCurrentHook().removeHologram(id); } } @@ -71,21 +71,29 @@ public class HologramManager { } } - public static void updateHologram(Location location, String line) { + public static void updateHologram(String id, String line) { if (manager.isEnabled()) { - manager.getCurrentHook().updateHologram(location, line); + manager.getCurrentHook().updateHologram(id, line); } } - public static void updateHologram(Location location, List lines) { + public static void updateHologram(String id, List lines) { if (manager.isEnabled()) { - manager.getCurrentHook().updateHologram(location, lines); + manager.getCurrentHook().updateHologram(id, lines); } } - public static void bulkUpdateHolograms(Map> holograms) { + public static void bulkUpdateHolograms(Map> holograms) { if (manager.isEnabled()) { manager.getCurrentHook().bulkUpdateHolograms(holograms); } } + + public static boolean isHologramLoaded(String id) { + if (manager.isEnabled()) { + return manager.getCurrentHook().isHologramLoaded(id); + } + + return false; + } } diff --git a/Core/src/main/java/com/songoda/core/hooks/PluginHook.java b/Core/src/main/java/com/songoda/core/hooks/PluginHook.java index ab7be28c..3bd06e3b 100644 --- a/Core/src/main/java/com/songoda/core/hooks/PluginHook.java +++ b/Core/src/main/java/com/songoda/core/hooks/PluginHook.java @@ -5,6 +5,7 @@ import com.songoda.core.hooks.economies.PlayerPointsEconomy; import com.songoda.core.hooks.economies.ReserveEconomy; import com.songoda.core.hooks.economies.VaultEconomy; import com.songoda.core.hooks.holograms.CMIHolograms; +import com.songoda.core.hooks.holograms.DecentHologramsHolograms; import com.songoda.core.hooks.holograms.Holograms; import com.songoda.core.hooks.holograms.HologramsHolograms; import com.songoda.core.hooks.holograms.HolographicDisplaysHolograms; @@ -44,6 +45,7 @@ public final class PluginHook { public static final PluginHook HOLO_DISPLAYS = new PluginHook(Holograms.class, "HolographicDisplays", HolographicDisplaysHolograms.class); public static final PluginHook HOLO_HOLOGRAMS = new PluginHook(Holograms.class, "Holograms", HologramsHolograms.class); public static final PluginHook HOLO_CMI = new PluginHook(Holograms.class, "CMI", CMIHolograms.class); + public static final PluginHook HOLO_DECENTHOLOGRAMS = new PluginHook(Holograms.class, "DecentHolograms", DecentHologramsHolograms.class); public static final PluginHook LOG_CORE_PROTECT = new PluginHook(Log.class, "CoreProtect", CoreProtectLog.class); public static final PluginHook PROTECTION_GRIEFPREVENTION = new PluginHook(Protection.class, "GriefPrevention", GriefPreventionProtection.class); public static final PluginHook PROTECTION_LANDS = new PluginHook(Protection.class, "Lands", LandsProtection.class); diff --git a/Core/src/main/java/com/songoda/core/hooks/holograms/CMIHolograms.java b/Core/src/main/java/com/songoda/core/hooks/holograms/CMIHolograms.java index 3c98768d..cdd15907 100644 --- a/Core/src/main/java/com/songoda/core/hooks/holograms/CMIHolograms.java +++ b/Core/src/main/java/com/songoda/core/hooks/holograms/CMIHolograms.java @@ -58,15 +58,12 @@ public class CMIHolograms extends Holograms { } @Override - public void createHologram(Location location, List lines) { - createAt(fixLocation(location), lines); + public void createHologram(String id, Location location, List lines) { + createAt(id, fixLocation(location), lines); } @Override - public void removeHologram(Location location) { - location = fixLocation(location); - - final String id = locStr(location); + public void removeHologram(String id) { CMIHologram holo = cmiHologramManager.getByName(id); if (holo != null) { @@ -90,9 +87,13 @@ public class CMIHolograms extends Holograms { } @Override - public void updateHologram(Location location, List lines) { - location = fixLocation(location); - CMIHologram holo = cmiHologramManager.getByName(locStr(location)); + public boolean isHologramLoaded(String id) { + return cmiHologramManager.getByName(id) != null; + } + + @Override + public void updateHologram(String id, List lines) { + CMIHologram holo = cmiHologramManager.getByName(id); if (holo != null) { // only update if there is a change to the text @@ -123,24 +124,16 @@ public class CMIHolograms extends Holograms { return; } - - createAt(location, lines); } @Override - public void bulkUpdateHolograms(Map> hologramData) { - for (Map.Entry> entry : hologramData.entrySet()) { + public void bulkUpdateHolograms(Map> hologramData) { + for (Map.Entry> entry : hologramData.entrySet()) { updateHologram(entry.getKey(), entry.getValue()); } } - private String locStr(Location loc) { - return String.format("%s-%d-%d-%d", loc.getWorld().getName(), loc.getBlockX(), loc.getBlockY(), loc.getBlockZ()); - } - - private void createAt(Location location, List lines) { - final String id = locStr(location); - + private void createAt(String id, Location location, List lines) { CMIHologram holo = new CMIHologram(id, location); holo.setLines(lines); diff --git a/Core/src/main/java/com/songoda/core/hooks/holograms/DecentHologramsHolograms.java b/Core/src/main/java/com/songoda/core/hooks/holograms/DecentHologramsHolograms.java new file mode 100644 index 00000000..2231a2e4 --- /dev/null +++ b/Core/src/main/java/com/songoda/core/hooks/holograms/DecentHologramsHolograms.java @@ -0,0 +1,98 @@ +package com.songoda.core.hooks.holograms; + +import eu.decentsoftware.holograms.api.DHAPI; +import eu.decentsoftware.holograms.api.DecentHologramsAPI; +import eu.decentsoftware.holograms.api.holograms.Hologram; +import org.bukkit.Location; +import org.bukkit.plugin.Plugin; + +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; + +public class DecentHologramsHolograms extends Holograms { + private final Set ourHolograms = new HashSet<>(); + + public DecentHologramsHolograms(Plugin plugin) { + super(plugin); + } + + @Override + public String getName() { + return "DecentHolograms"; + } + + @Override + public boolean isEnabled() { + return true; + } + + @Override + protected double defaultHeightOffset() { + return 1; + } + + @Override + public void createHologram(String id, Location location, List lines) { + createAt(id, location, lines); + } + + @Override + public void removeHologram(String id) { + Hologram hologram = DHAPI.getHologram(id); + + if (hologram != null) { + hologram.delete(); + DecentHologramsAPI.get().getHologramManager().removeHologram(id); + } + + ourHolograms.remove(id); + } + + @Override + public void updateHologram(String id, List lines) { + Hologram hologram = DHAPI.getHologram(id); + + if (hologram != null) { + DHAPI.setHologramLines(hologram, lines); + } + } + + @Override + public void bulkUpdateHolograms(Map> hologramData) { + for (Map.Entry> entry : hologramData.entrySet()) { + updateHologram(entry.getKey(), entry.getValue()); + } + } + + @Override + public void removeAllHolograms() { + for (String id : ourHolograms) { + Hologram hologram = DHAPI.getHologram(id); + + if (hologram != null) { + hologram.delete(); + DecentHologramsAPI.get().getHologramManager().removeHologram(id); + } + } + + ourHolograms.clear(); + } + + @Override + public boolean isHologramLoaded(String id) { + return DHAPI.getHologram(id) != null; + } + + private void createAt(String id, Location location, List lines) { + location = fixLocation(location); + + if (DHAPI.getHologram(id) != null) { + return; + } + + DHAPI.createHologram(id, location, lines); + ourHolograms.add(id); + } +} diff --git a/Core/src/main/java/com/songoda/core/hooks/holograms/Holograms.java b/Core/src/main/java/com/songoda/core/hooks/holograms/Holograms.java index 105cefd0..22d95c04 100644 --- a/Core/src/main/java/com/songoda/core/hooks/holograms/Holograms.java +++ b/Core/src/main/java/com/songoda/core/hooks/holograms/Holograms.java @@ -44,21 +44,23 @@ public abstract class Holograms implements Hook { protected abstract double defaultHeightOffset(); - public void createHologram(Location location, String line) { - createHologram(location, Collections.singletonList(line)); + public void createHologram(String id, Location location, String line) { + createHologram(id, location, Collections.singletonList(line)); } - public abstract void createHologram(Location location, List lines); + public abstract void createHologram(String id, Location location, List lines); - public abstract void removeHologram(Location location); + public abstract void removeHologram(String id); - public void updateHologram(Location location, String line) { - updateHologram(location, Collections.singletonList(line)); + public void updateHologram(String id, String line) { + updateHologram(id, Collections.singletonList(line)); } - public abstract void updateHologram(Location location, List lines); + public abstract void updateHologram(String id, List lines); - public abstract void bulkUpdateHolograms(Map> hologramData); + public abstract void bulkUpdateHolograms(Map> hologramData); public abstract void removeAllHolograms(); + + public abstract boolean isHologramLoaded(String id); } diff --git a/Core/src/main/java/com/songoda/core/hooks/holograms/HologramsHolograms.java b/Core/src/main/java/com/songoda/core/hooks/holograms/HologramsHolograms.java index 9472e16d..35474d8d 100644 --- a/Core/src/main/java/com/songoda/core/hooks/holograms/HologramsHolograms.java +++ b/Core/src/main/java/com/songoda/core/hooks/holograms/HologramsHolograms.java @@ -11,10 +11,11 @@ import org.bukkit.plugin.Plugin; import java.util.HashSet; import java.util.List; import java.util.Map; +import java.util.Set; public class HologramsHolograms extends Holograms { - HologramPlugin hologramPlugin; - HashSet ourHolograms = new HashSet<>(); + private final HologramPlugin hologramPlugin; + private final Set ourHolograms = new HashSet<>(); public HologramsHolograms(Plugin plugin) { super(plugin); @@ -38,15 +39,12 @@ public class HologramsHolograms extends Holograms { } @Override - public void createHologram(Location location, List lines) { - createAt(fixLocation(location), lines); + public void createHologram(String id, Location location, List lines) { + createAt(id, fixLocation(location), lines); } @Override - public void removeHologram(Location location) { - location = fixLocation(location); - - final String id = locStr(location); + public void removeHologram(String id) { Hologram hologram = hologramPlugin.getHologramManager().getHologram(id); if (hologram != null) { @@ -72,9 +70,13 @@ public class HologramsHolograms extends Holograms { } @Override - public void updateHologram(Location location, List lines) { - location = fixLocation(location); - Hologram hologram = hologramPlugin.getHologramManager().getHologram(locStr(location)); + public boolean isHologramLoaded(String id) { + return hologramPlugin.getHologramManager().getHologram(id) != null; + } + + @Override + public void updateHologram(String id, List lines) { + Hologram hologram = hologramPlugin.getHologramManager().getHologram(id); if (hologram != null) { hologram.spawn(); @@ -100,24 +102,16 @@ public class HologramsHolograms extends Holograms { return; } - - createAt(location, lines); } @Override - public void bulkUpdateHolograms(Map> hologramData) { - for (Map.Entry> entry : hologramData.entrySet()) { + public void bulkUpdateHolograms(Map> hologramData) { + for (Map.Entry> entry : hologramData.entrySet()) { updateHologram(entry.getKey(), entry.getValue()); } } - private String locStr(Location loc) { - return String.format("%s-%d-%d-%d", loc.getWorld().getName(), loc.getBlockX(), loc.getBlockY(), loc.getBlockZ()); - } - - private void createAt(Location location, List lines) { - final String id = locStr(location); - + private void createAt(String id, Location location, List lines) { Hologram hologram = new Hologram(id, location); for (String line : lines) { diff --git a/Core/src/main/java/com/songoda/core/hooks/holograms/HolographicDisplaysHolograms.java b/Core/src/main/java/com/songoda/core/hooks/holograms/HolographicDisplaysHolograms.java index 9bf7c34d..6765cda8 100644 --- a/Core/src/main/java/com/songoda/core/hooks/holograms/HolographicDisplaysHolograms.java +++ b/Core/src/main/java/com/songoda/core/hooks/holograms/HolographicDisplaysHolograms.java @@ -7,10 +7,14 @@ import org.bukkit.plugin.Plugin; import java.util.Collection; import java.util.Collections; +import java.util.HashMap; import java.util.List; import java.util.Map; public class HolographicDisplaysHolograms extends Holograms { + + private final Map holograms = new HashMap<>(); + public HolographicDisplaysHolograms(Plugin plugin) { super(plugin); } @@ -31,80 +35,68 @@ public class HolographicDisplaysHolograms extends Holograms { } @Override - public void createHologram(Location location, List lines) { - createAt(fixLocation(location), lines); + public void createHologram(String id, Location location, List lines) { + createAt(id, location, lines); } @Override - public void removeHologram(Location location) { - location = fixLocation(location); - - for (Hologram hologram : HologramsAPI.getHolograms(plugin)) { - if (hologram.getX() != location.getX() - || hologram.getY() != location.getY() - || hologram.getZ() != location.getZ()) { - continue; - } - + public void removeHologram(String id) { + Hologram hologram = holograms.remove(id); + if (hologram != null) { hologram.delete(); } } @Override - public void updateHologram(Location location, List lines) { - bulkUpdateHolograms(Collections.singletonMap(location, lines)); + public void updateHologram(String id, List lines) { + bulkUpdateHolograms(Collections.singletonMap(id, lines)); } @Override - public void bulkUpdateHolograms(Map> hologramData) { - Collection holograms = HologramsAPI.getHolograms(plugin); - - for (Map.Entry> entry : hologramData.entrySet()) { - Location location = fixLocation(entry.getKey()); + public void bulkUpdateHolograms(Map> hologramData) { + for (Map.Entry> entry : hologramData.entrySet()) { + String id = entry.getKey(); List lines = entry.getValue(); - for (Hologram hologram : holograms) { - if (hologram.getX() != location.getX() - || hologram.getY() != location.getY() - || hologram.getZ() != location.getZ()) { - continue; + Hologram hologram = holograms.get(id); + + // only update if there is a change to the text + boolean isChanged = lines.size() != hologram.size(); + + if (!isChanged) { + // double-check the lines + for (int i = 0; !isChanged && i < lines.size(); ++i) { + isChanged = !hologram.getLine(i).toString().equals("CraftTextLine [text=" + lines.get(i) + "]"); } - - // only update if there is a change to the text - boolean isChanged = lines.size() != hologram.size(); - - if (!isChanged) { - // double-check the lines - for (int i = 0; !isChanged && i < lines.size(); ++i) { - isChanged = !hologram.getLine(i).toString().equals("CraftTextLine [text=" + lines.get(i) + "]"); - } - } - - if (isChanged) { - hologram.clearLines(); - - for (String line : lines) { - hologram.appendTextLine(line); - } - } - - return; } - createAt(location, lines); + if (isChanged) { + hologram.clearLines(); + + for (String line : lines) { + hologram.appendTextLine(line); + } + } } } - private void createAt(Location location, List lines) { + private void createAt(String id, Location location, List lines) { Hologram hologram = HologramsAPI.createHologram(plugin, location); for (String line : lines) { hologram.appendTextLine(line); } + + holograms.put(id, hologram); } @Override public void removeAllHolograms() { - HologramsAPI.getHolograms(plugin).forEach(Hologram::delete); + holograms.values().forEach(Hologram::delete); + } + + @Override + public boolean isHologramLoaded(String id) { + return holograms.get(id) != null; } } From 16c0b470f9ece22735514682325e617f13f55763 Mon Sep 17 00:00:00 2001 From: Christian Koop Date: Mon, 20 Dec 2021 20:25:04 +0100 Subject: [PATCH 2/4] Comments out unused reflection access --- .../main/java/com/songoda/core/utils/ItemUtils.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Core/src/main/java/com/songoda/core/utils/ItemUtils.java b/Core/src/main/java/com/songoda/core/utils/ItemUtils.java index 12afdbc7..a6d67d32 100644 --- a/Core/src/main/java/com/songoda/core/utils/ItemUtils.java +++ b/Core/src/main/java/com/songoda/core/utils/ItemUtils.java @@ -202,9 +202,9 @@ public class ItemUtils { static Method mc_ItemStack_setTag; static Method mc_NBTTagCompound_set; static Method mc_NBTTagCompound_remove; - static Method mc_NBTTagCompound_setShort; - static Method mc_NBTTagCompound_setString; - static Method mc_NBTTagList_add; +// static Method mc_NBTTagCompound_setShort; +// static Method mc_NBTTagCompound_setString; +// static Method mc_NBTTagList_add; static Method cb_CraftItemStack_asNMSCopy; static Method cb_CraftItemStack_asCraftMirror; @@ -215,11 +215,11 @@ public class ItemUtils { mc_ItemStack_setTag = MethodMapping.MC_ITEM_STACK__SET_TAG.getMethod(mc_ItemStack); mc_NBTTagCompound_set = MethodMapping.MC_NBT_TAG_COMPOUND__SET.getMethod(mc_NBTTagCompound); mc_NBTTagCompound_remove = MethodMapping.MC_NBT_TAG_COMPOUND__REMOVE.getMethod(mc_NBTTagCompound); - mc_NBTTagCompound_setShort = MethodMapping.MC_NBT_TAG_COMPOUND__SET_SHORT.getMethod(mc_NBTTagCompound); - mc_NBTTagCompound_setString = MethodMapping.MC_NBT_TAG_COMPOUND__SET_STRING.getMethod(mc_NBTTagCompound); +// mc_NBTTagCompound_setShort = MethodMapping.MC_NBT_TAG_COMPOUND__SET_SHORT.getMethod(mc_NBTTagCompound); +// mc_NBTTagCompound_setString = MethodMapping.MC_NBT_TAG_COMPOUND__SET_STRING.getMethod(mc_NBTTagCompound); cb_CraftItemStack_asNMSCopy = MethodMapping.CB_ITEM_STACK__AS_NMS_COPY.getMethod(cb_ItemStack); cb_CraftItemStack_asCraftMirror = MethodMapping.CB_ITEM_STACK__AS_CRAFT_MIRROR.getMethod(cb_ItemStack); - mc_NBTTagList_add = MethodMapping.MC_NBT_TAG_LIST__ADD.getMethod(mc_NBTTagList); +// mc_NBTTagList_add = MethodMapping.MC_NBT_TAG_LIST__ADD.getMethod(mc_NBTTagList); } catch (Exception ex) { Logger.getLogger(ItemUtils.class.getName()).log(Level.SEVERE, null, ex); } From f4519bc030b518fca7898fe8444b3bb1d416d791 Mon Sep 17 00:00:00 2001 From: Fernando Pettinelli Date: Mon, 20 Dec 2021 19:29:00 -0300 Subject: [PATCH 3/4] HolographicDisplays 3 support. --- .../holograms/HolographicDisplaysHolograms.java | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/Core/src/main/java/com/songoda/core/hooks/holograms/HolographicDisplaysHolograms.java b/Core/src/main/java/com/songoda/core/hooks/holograms/HolographicDisplaysHolograms.java index 6765cda8..af54f2c4 100644 --- a/Core/src/main/java/com/songoda/core/hooks/holograms/HolographicDisplaysHolograms.java +++ b/Core/src/main/java/com/songoda/core/hooks/holograms/HolographicDisplaysHolograms.java @@ -2,10 +2,10 @@ package com.songoda.core.hooks.holograms; import com.gmail.filoghost.holographicdisplays.api.Hologram; import com.gmail.filoghost.holographicdisplays.api.HologramsAPI; +import org.bukkit.Bukkit; import org.bukkit.Location; import org.bukkit.plugin.Plugin; -import java.util.Collection; import java.util.Collections; import java.util.HashMap; import java.util.List; @@ -14,9 +14,13 @@ import java.util.Map; public class HolographicDisplaysHolograms extends Holograms { private final Map holograms = new HashMap<>(); + private final String textLineFormat; public HolographicDisplaysHolograms(Plugin plugin) { super(plugin); + String version = Bukkit.getPluginManager().getPlugin("HolographicDisplays").getDescription().getVersion(); + + this.textLineFormat = version.startsWith("3") ? "TextLine{text=%s}" : "CraftTextLine [text=%s]"; } @Override @@ -66,7 +70,7 @@ public class HolographicDisplaysHolograms extends Holograms { if (!isChanged) { // double-check the lines for (int i = 0; !isChanged && i < lines.size(); ++i) { - isChanged = !hologram.getLine(i).toString().equals("CraftTextLine [text=" + lines.get(i) + "]"); + isChanged = !hologram.getLine(i).toString().equals(String.format(textLineFormat, lines.get(i))); } } @@ -81,6 +85,11 @@ public class HolographicDisplaysHolograms extends Holograms { } private void createAt(String id, Location location, List lines) { + if (holograms.containsKey(id)) { + return; + } + + location = fixLocation(location); Hologram hologram = HologramsAPI.createHologram(plugin, location); for (String line : lines) { From de20a5b73cca70db28ed69aa8c81c9fd830f86c4 Mon Sep 17 00:00:00 2001 From: Fernando Pettinelli Date: Mon, 20 Dec 2021 19:29:28 -0300 Subject: [PATCH 4/4] Version 2.6.9 --- Compatibility/pom.xml | 2 +- Core/pom.xml | 2 +- Core/src/main/java/com/songoda/core/SongodaCore.java | 2 +- NMS/NMS-API/pom.xml | 2 +- NMS/NMS-v1_10_R1/pom.xml | 2 +- NMS/NMS-v1_11_R1/pom.xml | 2 +- NMS/NMS-v1_12_R1/pom.xml | 2 +- NMS/NMS-v1_13_R1/pom.xml | 2 +- NMS/NMS-v1_13_R2/pom.xml | 2 +- NMS/NMS-v1_14_R1/pom.xml | 2 +- NMS/NMS-v1_15_R1/pom.xml | 2 +- NMS/NMS-v1_16_R1/pom.xml | 2 +- NMS/NMS-v1_16_R2/pom.xml | 2 +- NMS/NMS-v1_16_R3/pom.xml | 2 +- NMS/NMS-v1_17_R1/pom.xml | 2 +- NMS/NMS-v1_18_R1/pom.xml | 2 +- NMS/NMS-v1_8_R1/pom.xml | 2 +- NMS/NMS-v1_8_R2/pom.xml | 2 +- NMS/NMS-v1_8_R3/pom.xml | 2 +- NMS/NMS-v1_9_R1/pom.xml | 2 +- NMS/NMS-v1_9_R2/pom.xml | 2 +- pom.xml | 2 +- 22 files changed, 22 insertions(+), 22 deletions(-) diff --git a/Compatibility/pom.xml b/Compatibility/pom.xml index 51a3aed2..50a25fd7 100644 --- a/Compatibility/pom.xml +++ b/Compatibility/pom.xml @@ -7,7 +7,7 @@ com.songoda SongodaCore-Modules - 2.6.8 + 2.6.9 ../pom.xml diff --git a/Core/pom.xml b/Core/pom.xml index bf89efe9..5e114dd8 100644 --- a/Core/pom.xml +++ b/Core/pom.xml @@ -7,7 +7,7 @@ com.songoda SongodaCore-Modules - 2.6.8 + 2.6.9 ../pom.xml diff --git a/Core/src/main/java/com/songoda/core/SongodaCore.java b/Core/src/main/java/com/songoda/core/SongodaCore.java index 2c294568..2bafcd2d 100644 --- a/Core/src/main/java/com/songoda/core/SongodaCore.java +++ b/Core/src/main/java/com/songoda/core/SongodaCore.java @@ -53,7 +53,7 @@ public class SongodaCore { /** * @since coreRevision 6 */ - private final static String coreVersion = "2.6.8"; + private final static String coreVersion = "2.6.9"; /** * This is specific to the website api diff --git a/NMS/NMS-API/pom.xml b/NMS/NMS-API/pom.xml index f8252ae3..4f27be37 100644 --- a/NMS/NMS-API/pom.xml +++ b/NMS/NMS-API/pom.xml @@ -7,7 +7,7 @@ com.songoda SongodaCore-Modules - 2.6.8 + 2.6.9 ../../pom.xml diff --git a/NMS/NMS-v1_10_R1/pom.xml b/NMS/NMS-v1_10_R1/pom.xml index 683d92af..e5d7bf26 100644 --- a/NMS/NMS-v1_10_R1/pom.xml +++ b/NMS/NMS-v1_10_R1/pom.xml @@ -7,7 +7,7 @@ com.songoda SongodaCore-Modules - 2.6.8 + 2.6.9 ../../pom.xml diff --git a/NMS/NMS-v1_11_R1/pom.xml b/NMS/NMS-v1_11_R1/pom.xml index 60027daa..358dc839 100644 --- a/NMS/NMS-v1_11_R1/pom.xml +++ b/NMS/NMS-v1_11_R1/pom.xml @@ -7,7 +7,7 @@ com.songoda SongodaCore-Modules - 2.6.8 + 2.6.9 ../../pom.xml diff --git a/NMS/NMS-v1_12_R1/pom.xml b/NMS/NMS-v1_12_R1/pom.xml index 130b13ab..8b3b3548 100644 --- a/NMS/NMS-v1_12_R1/pom.xml +++ b/NMS/NMS-v1_12_R1/pom.xml @@ -7,7 +7,7 @@ com.songoda SongodaCore-Modules - 2.6.8 + 2.6.9 ../../pom.xml diff --git a/NMS/NMS-v1_13_R1/pom.xml b/NMS/NMS-v1_13_R1/pom.xml index 7849c317..84cf24a7 100644 --- a/NMS/NMS-v1_13_R1/pom.xml +++ b/NMS/NMS-v1_13_R1/pom.xml @@ -7,7 +7,7 @@ com.songoda SongodaCore-Modules - 2.6.8 + 2.6.9 ../../pom.xml diff --git a/NMS/NMS-v1_13_R2/pom.xml b/NMS/NMS-v1_13_R2/pom.xml index 61d1c9da..47f5b770 100644 --- a/NMS/NMS-v1_13_R2/pom.xml +++ b/NMS/NMS-v1_13_R2/pom.xml @@ -7,7 +7,7 @@ com.songoda SongodaCore-Modules - 2.6.8 + 2.6.9 ../../pom.xml diff --git a/NMS/NMS-v1_14_R1/pom.xml b/NMS/NMS-v1_14_R1/pom.xml index 6dd2d582..bf61adb4 100644 --- a/NMS/NMS-v1_14_R1/pom.xml +++ b/NMS/NMS-v1_14_R1/pom.xml @@ -7,7 +7,7 @@ com.songoda SongodaCore-Modules - 2.6.8 + 2.6.9 ../../pom.xml diff --git a/NMS/NMS-v1_15_R1/pom.xml b/NMS/NMS-v1_15_R1/pom.xml index f1caf7fb..5abcdb85 100644 --- a/NMS/NMS-v1_15_R1/pom.xml +++ b/NMS/NMS-v1_15_R1/pom.xml @@ -7,7 +7,7 @@ com.songoda SongodaCore-Modules - 2.6.8 + 2.6.9 ../../pom.xml diff --git a/NMS/NMS-v1_16_R1/pom.xml b/NMS/NMS-v1_16_R1/pom.xml index 86d98b26..1ce320ee 100644 --- a/NMS/NMS-v1_16_R1/pom.xml +++ b/NMS/NMS-v1_16_R1/pom.xml @@ -7,7 +7,7 @@ com.songoda SongodaCore-Modules - 2.6.8 + 2.6.9 ../../pom.xml diff --git a/NMS/NMS-v1_16_R2/pom.xml b/NMS/NMS-v1_16_R2/pom.xml index 87a7fa57..587385ba 100644 --- a/NMS/NMS-v1_16_R2/pom.xml +++ b/NMS/NMS-v1_16_R2/pom.xml @@ -7,7 +7,7 @@ com.songoda SongodaCore-Modules - 2.6.8 + 2.6.9 ../../pom.xml diff --git a/NMS/NMS-v1_16_R3/pom.xml b/NMS/NMS-v1_16_R3/pom.xml index 8299e235..a5422a5b 100644 --- a/NMS/NMS-v1_16_R3/pom.xml +++ b/NMS/NMS-v1_16_R3/pom.xml @@ -7,7 +7,7 @@ com.songoda SongodaCore-Modules - 2.6.8 + 2.6.9 ../../pom.xml diff --git a/NMS/NMS-v1_17_R1/pom.xml b/NMS/NMS-v1_17_R1/pom.xml index 6c822597..0b1a0f98 100644 --- a/NMS/NMS-v1_17_R1/pom.xml +++ b/NMS/NMS-v1_17_R1/pom.xml @@ -7,7 +7,7 @@ com.songoda SongodaCore-Modules - 2.6.8 + 2.6.9 ../../pom.xml diff --git a/NMS/NMS-v1_18_R1/pom.xml b/NMS/NMS-v1_18_R1/pom.xml index a1838e1a..74d92ae9 100644 --- a/NMS/NMS-v1_18_R1/pom.xml +++ b/NMS/NMS-v1_18_R1/pom.xml @@ -19,7 +19,7 @@ com.songoda SongodaCore-Modules - 2.6.8 + 2.6.9 ../../pom.xml diff --git a/NMS/NMS-v1_8_R1/pom.xml b/NMS/NMS-v1_8_R1/pom.xml index 4ce34f69..5061198a 100644 --- a/NMS/NMS-v1_8_R1/pom.xml +++ b/NMS/NMS-v1_8_R1/pom.xml @@ -7,7 +7,7 @@ com.songoda SongodaCore-Modules - 2.6.8 + 2.6.9 ../../pom.xml diff --git a/NMS/NMS-v1_8_R2/pom.xml b/NMS/NMS-v1_8_R2/pom.xml index 1688546a..b2784ad3 100644 --- a/NMS/NMS-v1_8_R2/pom.xml +++ b/NMS/NMS-v1_8_R2/pom.xml @@ -7,7 +7,7 @@ com.songoda SongodaCore-Modules - 2.6.8 + 2.6.9 ../../pom.xml diff --git a/NMS/NMS-v1_8_R3/pom.xml b/NMS/NMS-v1_8_R3/pom.xml index 30325eaa..184574a8 100644 --- a/NMS/NMS-v1_8_R3/pom.xml +++ b/NMS/NMS-v1_8_R3/pom.xml @@ -7,7 +7,7 @@ com.songoda SongodaCore-Modules - 2.6.8 + 2.6.9 ../../pom.xml diff --git a/NMS/NMS-v1_9_R1/pom.xml b/NMS/NMS-v1_9_R1/pom.xml index f9eb07ac..bf505a5e 100644 --- a/NMS/NMS-v1_9_R1/pom.xml +++ b/NMS/NMS-v1_9_R1/pom.xml @@ -7,7 +7,7 @@ com.songoda SongodaCore-Modules - 2.6.8 + 2.6.9 ../../pom.xml diff --git a/NMS/NMS-v1_9_R2/pom.xml b/NMS/NMS-v1_9_R2/pom.xml index 5485a8d7..8d38a354 100644 --- a/NMS/NMS-v1_9_R2/pom.xml +++ b/NMS/NMS-v1_9_R2/pom.xml @@ -7,7 +7,7 @@ com.songoda SongodaCore-Modules - 2.6.8 + 2.6.9 ../../pom.xml diff --git a/pom.xml b/pom.xml index 238ed3a7..ac99ee18 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.songoda SongodaCore-Modules - 2.6.8 + 2.6.9 pom