mirror/Slimefun4
mirror/Slimefun4
1
Fork 0
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-19 19:25:48 +00:00
Code Releases Activity

Replaced all § with &

Browse Source
This commit is contained in:
BuildTools 2016-11-23 18:21:19 +01:00
parent 3e470d87fb
commit 6f8ef1acfe
5 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/abstractItems/AReactor.java
View File

@ -309,22 +309,23 @@ public abstract class AReactor extends SlimefunItem {
}
});
ItemStack item = getProgressBar().clone();
ItemMeta im = item.getItemMeta();
im.setDisplayName(" ");
List<String> lore = new ArrayList<String>();
lore.add(MachineHelper.getProgress(timeleft, processing.get(l).getTicks()));
lore.add(MachineHelper.getCoolant(timeleft, processing.get(l).getTicks()));
lore.add("");
lore.add(MachineHelper.getTimeLeft(timeleft / 2));
im.setLore(lore);
item.setItemMeta(im);
BlockStorage.getInventory(l).replaceExistingItem(22, item);
if (needsCooling()) {
boolean coolant = (processing.get(l).getTicks() - timeleft) % 25 == 0;
ItemStack item = getProgressBar().clone();
ItemMeta im = item.getItemMeta();
im.setDisplayName(" ");
List<String> lore = new ArrayList<String>();
lore.add(MachineHelper.getProgress(timeleft, processing.get(l).getTicks()));
lore.add(MachineHelper.getCoolant(timeleft, processing.get(l).getTicks()));
lore.add("");
lore.add(MachineHelper.getTimeLeft(timeleft / 2));
im.setLore(lore);
item.setItemMeta(im);
BlockStorage.getInventory(l).replaceExistingItem(22, item);
if (coolant) {
if (port != null) {
for (int slot: getCoolantSlots()) {

2
src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/abstractItems/MachineHelper.java
View File

@ -14,7 +14,7 @@ public class MachineHelper {
l -= minutes * 60;
final int seconds = (int)l;
timeleft = String.valueOf(timeleft) + seconds + "s";
return "&7" + timeleft + " left";
return ChatColor.translateAlternateColorCodes('&', "&7" + timeleft + " left");
}
public static String getProgress(int time, int total) {

3
src/me/mrCookieSlime/Slimefun/holograms/CargoHologram.java
View File

@ -2,6 +2,7 @@ package me.mrCookieSlime.Slimefun.holograms;
import me.mrCookieSlime.Slimefun.SlimefunStartup;
import org.bukkit.ChatColor;
import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.block.Block;
@ -16,7 +17,7 @@ public class CargoHologram {
@Override
public void run() {
ArmorStand hologram = getArmorStand(b);
hologram.setCustomName(name);
hologram.setCustomName(ChatColor.translateAlternateColorCodes('&', name));
}
});
}

3
src/me/mrCookieSlime/Slimefun/holograms/EnergyHologram.java
View File

@ -4,6 +4,7 @@ import me.mrCookieSlime.CSCoreLibPlugin.general.Math.DoubleHandler;
import me.mrCookieSlime.Slimefun.SlimefunStartup;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.Location;
import org.bukkit.block.Block;
import org.bukkit.entity.ArmorStand;
@ -21,7 +22,7 @@ public class EnergyHologram {
@Override
public void run() {
ArmorStand hologram = getArmorStand(b);
hologram.setCustomName(name);
hologram.setCustomName(ChatColor.translateAlternateColorCodes('&', name));
}
});
}

6
src/me/mrCookieSlime/Slimefun/holograms/ReactorHologram.java
View File

@ -1,5 +1,6 @@
package me.mrCookieSlime.Slimefun.holograms;
import org.bukkit.ChatColor;
import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.entity.ArmorStand;
@ -20,7 +21,7 @@ public class ReactorHologram {
}
ArmorStand hologram = ArmorStandFactory.createHidden(l);
hologram.setCustomNameVisible(true);
hologram.setCustomNameVisible(false);
hologram.setCustomName(null);
return hologram;
}
@ -31,7 +32,8 @@ public class ReactorHologram {
@Override
public void run() {
ArmorStand hologram = getArmorStand(l);
hologram.setCustomName(name);
if (!hologram.isCustomNameVisible()) hologram.setCustomNameVisible(true);
hologram.setCustomName(ChatColor.translateAlternateColorCodes('&', name));
}
});
}