Merge remote-tracking branch 'origin/master'

src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/Interfaces/NotPlaceable.java

@@ -1,5 +1,5 @@
-package me.mrCookieSlime.Slimefun.Objects.SlimefunItem.Interfaces;
-
-public interface NotPlaceable {
-
-}
+package me.mrCookieSlime.Slimefun.Objects.SlimefunItem.Interfaces;
+
+public interface NotPlaceable {
+
+}

src/me/mrCookieSlime/Slimefun/Setup/SlimefunSetup.java

@@ -2445,7 +2445,7 @@ public boolean onRightClick(ItemUseEvent e, final Player p, ItemStack item) {
 		0.45)
 		.register(true);
 
-		new SlimefunItem(Categories.WEAPONS, SlimefunItems.SEISMIC_AXE, "SEISMIC_AXE", RecipeType.MAGIC_WORKBENCH,
+		new ExcludedTool(Categories.WEAPONS, SlimefunItems.SEISMIC_AXE, "SEISMIC_AXE", RecipeType.MAGIC_WORKBENCH,
 		new ItemStack[] {SlimefunItems.HARDENED_METAL_INGOT, SlimefunItems.HARDENED_METAL_INGOT, null, SlimefunItems.HARDENED_METAL_INGOT, SlimefunItems.STAFF_ELEMENTAL, null, null, SlimefunItems.STAFF_ELEMENTAL, null})
 		.register(true, new ItemInteractionHandler() {
 

src/me/mrCookieSlime/Slimefun/api/machine/MachineConfig.java

@@ -1,32 +1,32 @@
-package me.mrCookieSlime.Slimefun.api.machine;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import me.mrCookieSlime.CSCoreLibPlugin.Configuration.Config;
-import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.abstractItems.AContainer;
-
-public class MachineConfig extends Config {
-
-	MachineSettings global;
-	Map<String, MachineSettings> children;
-
-	public MachineConfig(String id) {
-		super("plugins/Slimefun/machines/" + id + ".yml");
-
-		this.global = new MachineSettings(this);
-		this.children = new HashMap<String, MachineSettings>();
-	}
-
-	public MachineSettings getGlobalSettings() {
-		return this.global;
-	}
-
-	public MachineSettings getSettings(AContainer item) {
-		if (!this.children.containsKey(item.getID())) {
-			this.children.put(item.getID(), new MachineSettings(this, item));
-		}
-
-		return this.children.get(item.getID());
-	}
-}
+package me.mrCookieSlime.Slimefun.api.machine;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import me.mrCookieSlime.CSCoreLibPlugin.Configuration.Config;
+import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.abstractItems.AContainer;
+
+public class MachineConfig extends Config {
+
+	MachineSettings global;
+	Map<String, MachineSettings> children;
+
+	public MachineConfig(String id) {
+		super("plugins/Slimefun/machines/" + id + ".yml");
+
+		this.global = new MachineSettings(this);
+		this.children = new HashMap<String, MachineSettings>();
+	}
+
+	public MachineSettings getGlobalSettings() {
+		return this.global;
+	}
+
+	public MachineSettings getSettings(AContainer item) {
+		if (!this.children.containsKey(item.getID())) {
+			this.children.put(item.getID(), new MachineSettings(this, item));
+		}
+
+		return this.children.get(item.getID());
+	}
+}

src/me/mrCookieSlime/Slimefun/api/machine/MachineSettings.java

@@ -1,33 +1,33 @@
-package me.mrCookieSlime.Slimefun.api.machine;
-
-import java.util.List;
-
-import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.abstractItems.AContainer;
-
-public class MachineSettings {
-
-	MachineConfig cfg;
-	String prefix = "global";
-
-	public MachineSettings(MachineConfig cfg) {
-		this.cfg = cfg;
-	}
-
-	public MachineSettings(MachineConfig cfg, AContainer machine) {
-		this.cfg = cfg;
-		this.prefix = machine.getID();
-	}
-
-	public String getString(String path) {
-		return this.cfg.getString(prefix + "." + path);
-	}
-
-	public int getInt(String path) {
-		return this.cfg.getInt(prefix + "." + path);
-	}
-
-	public List<String> getStringList(String path) {
-		return this.cfg.getStringList(prefix + "." + path);
-	}
-
-}
+package me.mrCookieSlime.Slimefun.api.machine;
+
+import java.util.List;
+
+import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.abstractItems.AContainer;
+
+public class MachineSettings {
+
+	MachineConfig cfg;
+	String prefix = "global";
+
+	public MachineSettings(MachineConfig cfg) {
+		this.cfg = cfg;
+	}
+
+	public MachineSettings(MachineConfig cfg, AContainer machine) {
+		this.cfg = cfg;
+		this.prefix = machine.getID();
+	}
+
+	public String getString(String path) {
+		return this.cfg.getString(prefix + "." + path);
+	}
+
+	public int getInt(String path) {
+		return this.cfg.getInt(prefix + "." + path);
+	}
+
+	public List<String> getStringList(String path) {
+		return this.cfg.getStringList(prefix + "." + path);
+	}
+
+}

src/me/mrCookieSlime/Slimefun/holograms/Projector.java

@@ -20,7 +20,7 @@
 public class Projector {
 
 	public static ArmorStand getArmorStand(Block projector) {
-		String nametag = ChatColor.translateAlternateColorCodes('&', BlockStorage.getLocationInfo(projector.getLocation(), "text"));
+		String nametag = BlockStorage.getLocationInfo(projector.getLocation(), "text");
 		double offset = Double.valueOf(BlockStorage.getLocationInfo(projector.getLocation(), "offset"));
 		Location l = new Location(projector.getWorld(), projector.getX() + 0.5, projector.getY() + offset, projector.getZ() + 0.5);
 
@@ -45,7 +45,7 @@ public static void openEditor(Player p, final Block projector) {
 			MenuHelper.awaitChatInput(pl, (player, message) -> {
 				ArmorStand hologram = getArmorStand(projector);
 				hologram.setCustomName(ChatColor.translateAlternateColorCodes('&', message));
-				BlockStorage.addBlockInfo(projector, "text", message);
+				BlockStorage.addBlockInfo(projector, "text", hologram.getCustomName());
 				openEditor(player, projector);
 				return false;
 			});