diff --git a/src/me/mrCookieSlime/Slimefun/Lists/SlimefunItems.java b/src/me/mrCookieSlime/Slimefun/Lists/SlimefunItems.java index f82ce6994..657664379 100644 --- a/src/me/mrCookieSlime/Slimefun/Lists/SlimefunItems.java +++ b/src/me/mrCookieSlime/Slimefun/Lists/SlimefunItems.java @@ -6,6 +6,7 @@ import me.mrCookieSlime.CSCoreLibPlugin.general.Inventory.Item.CustomPotion; import me.mrCookieSlime.CSCoreLibPlugin.general.String.Christmas; import me.mrCookieSlime.CSCoreLibPlugin.general.World.CustomSkull; +import org.bukkit.ChatColor; import org.bukkit.Color; import org.bukkit.FireworkEffect; import org.bukkit.FireworkEffect.Type; @@ -430,49 +431,49 @@ public class SlimefunItems { ItemStack itemB = new ItemStack(Material.FIREWORK_CHARGE); FireworkEffectMeta imB = (FireworkEffectMeta) itemB.getItemMeta(); imB.setEffect(FireworkEffect.builder().with(Type.BURST).with(Type.BURST).withColor(Color.BLACK).build()); - imB.setDisplayName("&8Blank Rune"); + imB.setDisplayName(ChatColor.translateAlternateColorCodes('&', "&8Blank Rune")); itemB.setItemMeta(imB); BLANK_RUNE = itemB; ItemStack itemA = new ItemStack(Material.FIREWORK_CHARGE); FireworkEffectMeta imA = (FireworkEffectMeta) itemA.getItemMeta(); imA.setEffect(FireworkEffect.builder().with(Type.BURST).withColor(Color.AQUA).build()); - imA.setDisplayName("&7Ancient Rune &8&l[&b&lAir&8&l]"); + imA.setDisplayName(ChatColor.translateAlternateColorCodes('&', "&7Ancient Rune &8&l[&b&lAir&8&l]")); itemA.setItemMeta(imA); RUNE_AIR = itemA; ItemStack itemW = new ItemStack(Material.FIREWORK_CHARGE); FireworkEffectMeta imW = (FireworkEffectMeta) itemW.getItemMeta(); imW.setEffect(FireworkEffect.builder().with(Type.BURST).withColor(Color.BLUE).build()); - imW.setDisplayName("&7Ancient Rune &8&l[&1&lWater&8&l]"); + imW.setDisplayName(ChatColor.translateAlternateColorCodes('&', "&7Ancient Rune &8&l[&1&lWater&8&l]")); itemW.setItemMeta(imW); RUNE_WATER = itemW; ItemStack itemF = new ItemStack(Material.FIREWORK_CHARGE); FireworkEffectMeta imF = (FireworkEffectMeta) itemF.getItemMeta(); imF.setEffect(FireworkEffect.builder().with(Type.BURST).withColor(Color.RED).build()); - imF.setDisplayName("&7Ancient Rune &8&l[&4&lFire&8&l]"); + imF.setDisplayName(ChatColor.translateAlternateColorCodes('&', "&7Ancient Rune &8&l[&4&lFire&8&l]")); itemF.setItemMeta(imF); RUNE_FIRE = itemF; ItemStack itemE = new ItemStack(Material.FIREWORK_CHARGE); FireworkEffectMeta imE = (FireworkEffectMeta) itemE.getItemMeta(); imE.setEffect(FireworkEffect.builder().with(Type.BURST).withColor(Color.ORANGE).build()); - imE.setDisplayName("&7Ancient Rune &8&l[&c&lEarth&8&l]"); + imE.setDisplayName(ChatColor.translateAlternateColorCodes('&', "&7Ancient Rune &8&l[&c&lEarth&8&l]")); itemE.setItemMeta(imE); RUNE_EARTH = itemE; ItemStack itemN = new ItemStack(Material.FIREWORK_CHARGE); FireworkEffectMeta imN = (FireworkEffectMeta) itemN.getItemMeta(); imN.setEffect(FireworkEffect.builder().with(Type.BURST).withColor(Color.PURPLE).build()); - imN.setDisplayName("&7Ancient Rune &8&l[&5&lEnder&8&l]"); + imN.setDisplayName(ChatColor.translateAlternateColorCodes('&', "&7Ancient Rune &8&l[&5&lEnder&8&l]")); itemN.setItemMeta(imN); RUNE_ENDER = itemN; ItemStack itemR = new ItemStack(Material.FIREWORK_CHARGE); FireworkEffectMeta imR = (FireworkEffectMeta) itemR.getItemMeta(); imR.setEffect(FireworkEffect.builder().with(Type.BURST).withColor(Color.PURPLE).build()); - imR.setDisplayName("&7Ancient Rune &8&l[&d&lRainbow&8&l]"); + imR.setDisplayName(ChatColor.translateAlternateColorCodes('&', "&7Ancient Rune &8&l[&d&lRainbow&8&l]")); itemR.setItemMeta(imR); RUNE_RAINBOW = itemR; } diff --git a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/abstractItems/AReactor.java b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/abstractItems/AReactor.java index 0ac61f64b..0836f9488 100644 --- a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/abstractItems/AReactor.java +++ b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/abstractItems/AReactor.java @@ -252,6 +252,8 @@ public abstract class AReactor extends SlimefunItem { public abstract boolean needsCooling(); //NOTE: Still needs to be surrounded by water! + public abstract ItemStack getCoolant(); + public int[] getInputSlots() { return new int[] {19, 28, 37, 25, 34, 43}; } @@ -329,7 +331,7 @@ public abstract class AReactor extends SlimefunItem { if (coolant) { if (port != null) { for (int slot: getCoolantSlots()) { - if (SlimefunManager.isItemSimiliar(port.getItemInSlot(slot), SlimefunItems.REACTOR_COOLANT_CELL, true)) { + if (SlimefunManager.isItemSimiliar(port.getItemInSlot(slot), getCoolant(), true)) { port.replaceExistingItem(slot, pushItems(l, port.getItemInSlot(slot), getCoolantSlots())); } } @@ -337,7 +339,7 @@ public abstract class AReactor extends SlimefunItem { boolean explosion = true; for (int slot: getCoolantSlots()) { - if (SlimefunManager.isItemSimiliar(BlockStorage.getInventory(l).getItemInSlot(slot), SlimefunItems.REACTOR_COOLANT_CELL, true)) { + if (SlimefunManager.isItemSimiliar(BlockStorage.getInventory(l).getItemInSlot(slot), getCoolant(), true)) { BlockStorage.getInventory(l).replaceExistingItem(slot, InvUtils.decreaseItem(BlockStorage.getInventory(l).getItemInSlot(slot), 1)); ReactorHologram.update(l, "&b\u2744 &7100%"); explosion = false; diff --git a/src/me/mrCookieSlime/Slimefun/Setup/SlimefunSetup.java b/src/me/mrCookieSlime/Slimefun/Setup/SlimefunSetup.java index a1fcdc24c..1c3e96801 100644 --- a/src/me/mrCookieSlime/Slimefun/Setup/SlimefunSetup.java +++ b/src/me/mrCookieSlime/Slimefun/Setup/SlimefunSetup.java @@ -4916,6 +4916,11 @@ public class SlimefunSetup { public boolean needsCooling() { return true; } + + @Override + public ItemStack getCoolant() { + return SlimefunItems.REACTOR_COOLANT_CELL; + } } .registerChargeableBlock(true, 16384); @@ -4959,6 +4964,11 @@ public class SlimefunSetup { public ItemStack getProgressBar() { return new ItemStack(Material.NETHER_STAR); } + + @Override + public ItemStack getCoolant() { + return null; + } }.registerChargeableBlock(true, 32768); new SlimefunItem(Categories.CARGO, SlimefunItems.CARGO_MOTOR, "CARGO_MOTOR", RecipeType.ENHANCED_CRAFTING_TABLE,