Upstream/EpicAnchors
1
0
Fork 0
mirror of https://github.com/songoda/EpicAnchors.git synced 2024-11-26 03:55:33 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'development'

Browse Source
This commit is contained in:
Brianna 2020-09-01 17:21:07 -05:00
commit 094d07876d
3 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pom.xml
View File

@ -2,7 +2,7 @@
<groupId>com.songoda</groupId> <groupId>com.songoda</groupId>
<artifactId>EpicAnchors</artifactId> <artifactId>EpicAnchors</artifactId>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<version>1.4.9</version> <version>1.4.10</version>
<build> <build>
<defaultGoal>clean install</defaultGoal> <defaultGoal>clean install</defaultGoal>
<finalName>EpicAnchors-${project.version}</finalName> <finalName>EpicAnchors-${project.version}</finalName>
@ -105,7 +105,7 @@
<dependency> <dependency>
<groupId>org.spigotmc</groupId> <groupId>org.spigotmc</groupId>
<artifactId>spigot</artifactId> <artifactId>spigot</artifactId>
<version>1.15</version> <version>1.16.1</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>

22
src/main/java/com/songoda/epicanchors/EpicAnchors.java
View File

@ -9,6 +9,8 @@ import com.songoda.core.configuration.Config;
import com.songoda.core.gui.GuiManager; import com.songoda.core.gui.GuiManager;
import com.songoda.core.hooks.EconomyManager; import com.songoda.core.hooks.EconomyManager;
import com.songoda.core.hooks.HologramManager; import com.songoda.core.hooks.HologramManager;
import com.songoda.core.nms.NmsManager;
import com.songoda.core.nms.nbt.NBTItem;
import com.songoda.core.utils.TextUtils; import com.songoda.core.utils.TextUtils;
import com.songoda.epicanchors.anchor.Anchor; import com.songoda.epicanchors.anchor.Anchor;
import com.songoda.epicanchors.anchor.AnchorManager; import com.songoda.epicanchors.anchor.AnchorManager;
@ -56,6 +58,9 @@ public class EpicAnchors extends SongodaPlugin {
HologramManager.removeAllHolograms(); HologramManager.removeAllHolograms();
} }
@Override
public void onDataLoad() {}
@Override @Override
public void onPluginEnable() { public void onPluginEnable() {
// Run Songoda Updater // Run Songoda Updater
@ -136,7 +141,7 @@ public class EpicAnchors extends SongodaPlugin {
// verify that this is a anchor // verify that this is a anchor
if (anchor.getLocation().getBlock().getType() != Settings.MATERIAL.getMaterial().getMaterial()) return; if (anchor.getLocation().getBlock().getType() != Settings.MATERIAL.getMaterial().getMaterial()) return;
// grab the name // grab the name
String name = Methods.formatName(anchor.getTicksLeft(), false).trim(); String name = Methods.formatName(anchor.getTicksLeft()).trim();
Location location = correctHeight(anchor.getLocation()); Location location = correctHeight(anchor.getLocation());
// create the hologram // create the hologram
HologramManager.updateHologram(location, name); HologramManager.updateHologram(location, name);
@ -168,9 +173,15 @@ public class EpicAnchors extends SongodaPlugin {
} }
public int getTicksFromItem(ItemStack item) { public int getTicksFromItem(ItemStack item) {
NBTItem nbtItem = NmsManager.getNbt().of(item);
if (nbtItem.has("ticks")) {
return nbtItem.getNBTObject("ticks").asInt();
}
// Legacy code. Tries to get the ticks remaining from hidden text.
if (!item.hasItemMeta() || !item.getItemMeta().hasDisplayName()) return 0; if (!item.hasItemMeta() || !item.getItemMeta().hasDisplayName()) return 0;
if (item.getItemMeta().getDisplayName().contains(":")) { if (item.getItemMeta().getDisplayName().contains(":")) {
return NumberUtils.toInt(item.getItemMeta().getDisplayName().replace("\u00A7", "").split(":")[0], 0); return Integer.parseInt(item.getItemMeta().getDisplayName().replace("\u00A7", "").split(":")[0]);
} }
return 0; return 0;
} }
@ -178,7 +189,7 @@ public class EpicAnchors extends SongodaPlugin {
public ItemStack makeAnchorItem(int ticks) { public ItemStack makeAnchorItem(int ticks) {
ItemStack item = Settings.MATERIAL.getMaterial().getItem(); ItemStack item = Settings.MATERIAL.getMaterial().getItem();
ItemMeta meta = item.getItemMeta(); ItemMeta meta = item.getItemMeta();
meta.setDisplayName(Methods.formatName(ticks, true)); meta.setDisplayName(Methods.formatName(ticks));
ArrayList<String> lore = new ArrayList<>(); ArrayList<String> lore = new ArrayList<>();
String[] parts = Settings.LORE.getString().split("\\|"); String[] parts = Settings.LORE.getString().split("\\|");
for (String line : parts) { for (String line : parts) {
@ -186,7 +197,10 @@ public class EpicAnchors extends SongodaPlugin {
} }
meta.setLore(lore); meta.setLore(lore);
item.setItemMeta(meta); item.setItemMeta(meta);
return item;
NBTItem nbtItem = NmsManager.getNbt().of(item);
nbtItem.set("ticks", ticks);
return nbtItem.finish();
} }
public CommandManager getCommandManager() { public CommandManager getCommandManager() {

12
src/main/java/com/songoda/epicanchors/utils/Methods.java
View File

@ -18,19 +18,15 @@ public class Methods {
private static Map<String, Location> serializeCache = new HashMap<>(); private static Map<String, Location> serializeCache = new HashMap<>();
public static String formatName(int ticks2, boolean full) { public static String formatName(int ticks) {
String remaining = TimeUtils.makeReadable((ticks2 / 20L) * 1000L); String remaining = TimeUtils.makeReadable((ticks / 20L) * 1000L);
String name = Settings.NAMETAG.getString().replace("{REMAINING}", (ticks2 <= 0) String name = Settings.NAMETAG.getString().replace("{REMAINING}", (ticks <= 0)
? EpicAnchors.getInstance().getLocale().getMessage("infinite").getMessage() : remaining); ? EpicAnchors.getInstance().getLocale().getMessage("infinite").getMessage() : remaining);
String info = "";
if (full) {
info += TextUtils.convertToInvisibleString(ticks2 + ":");
}
return info + TextUtils.formatText(name); return TextUtils.formatText(name);
} }
/** /**