diff --git a/src/main/java/me/mrCookieSlime/Slimefun/holograms/EnergyHologram.java b/src/main/java/io/github/thebusybiscuit/slimefun4/utils/holograms/EnergyHologram.java similarity index 88% rename from src/main/java/me/mrCookieSlime/Slimefun/holograms/EnergyHologram.java rename to src/main/java/io/github/thebusybiscuit/slimefun4/utils/holograms/EnergyHologram.java index 9d763d2cc..bbfeab92b 100644 --- a/src/main/java/me/mrCookieSlime/Slimefun/holograms/EnergyHologram.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/utils/holograms/EnergyHologram.java @@ -1,4 +1,4 @@ -package me.mrCookieSlime.Slimefun.holograms; +package io.github.thebusybiscuit.slimefun4.utils.holograms; import org.bukkit.block.Block; diff --git a/src/main/java/me/mrCookieSlime/Slimefun/holograms/HologramProjectorHologram.java b/src/main/java/io/github/thebusybiscuit/slimefun4/utils/holograms/HologramProjectorHologram.java similarity index 96% rename from src/main/java/me/mrCookieSlime/Slimefun/holograms/HologramProjectorHologram.java rename to src/main/java/io/github/thebusybiscuit/slimefun4/utils/holograms/HologramProjectorHologram.java index 5faa2e73e..4ec607076 100644 --- a/src/main/java/me/mrCookieSlime/Slimefun/holograms/HologramProjectorHologram.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/utils/holograms/HologramProjectorHologram.java @@ -1,4 +1,4 @@ -package me.mrCookieSlime.Slimefun.holograms; +package io.github.thebusybiscuit.slimefun4.utils.holograms; import org.bukkit.ChatColor; import org.bukkit.Location; @@ -45,13 +45,14 @@ public final class HologramProjectorHologram { if (hologram != null) hologram.remove(); } - public static void openEditor(Player p, final Block projector) { + public static void openEditor(Player p, Block projector) { ChestMenu menu = new ChestMenu("Hologram Settings"); menu.addItem(0, new CustomItem(new ItemStack(Material.NAME_TAG), "&7Text &e(Click to edit)", "", "&r" + ChatColor.translateAlternateColorCodes('&', BlockStorage.getLocationInfo(projector.getLocation(), "text")))); menu.addMenuClickHandler(0, (pl, slot, item, action) -> { pl.closeInventory(); SlimefunPlugin.getLocal().sendMessage(pl, "machines.HOLOGRAM_PROJECTOR.enter-text", true); + ChatInput.waitForPlayer(SlimefunPlugin.instance, pl, message -> { ArmorStand hologram = getArmorStand(projector, true); hologram.setCustomName(ChatColor.translateAlternateColorCodes('&', message)); diff --git a/src/main/java/me/mrCookieSlime/Slimefun/holograms/ReactorHologram.java b/src/main/java/io/github/thebusybiscuit/slimefun4/utils/holograms/ReactorHologram.java similarity index 95% rename from src/main/java/me/mrCookieSlime/Slimefun/holograms/ReactorHologram.java rename to src/main/java/io/github/thebusybiscuit/slimefun4/utils/holograms/ReactorHologram.java index 4c8d36454..a80981409 100644 --- a/src/main/java/me/mrCookieSlime/Slimefun/holograms/ReactorHologram.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/utils/holograms/ReactorHologram.java @@ -1,4 +1,4 @@ -package me.mrCookieSlime.Slimefun.holograms; +package io.github.thebusybiscuit.slimefun4.utils.holograms; import org.bukkit.ChatColor; import org.bukkit.Location; diff --git a/src/main/java/me/mrCookieSlime/Slimefun/holograms/SimpleHologram.java b/src/main/java/io/github/thebusybiscuit/slimefun4/utils/holograms/SimpleHologram.java similarity index 96% rename from src/main/java/me/mrCookieSlime/Slimefun/holograms/SimpleHologram.java rename to src/main/java/io/github/thebusybiscuit/slimefun4/utils/holograms/SimpleHologram.java index 44861e717..fbde35185 100644 --- a/src/main/java/me/mrCookieSlime/Slimefun/holograms/SimpleHologram.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/utils/holograms/SimpleHologram.java @@ -1,4 +1,4 @@ -package me.mrCookieSlime.Slimefun.holograms; +package io.github.thebusybiscuit.slimefun4.utils.holograms; import org.bukkit.ChatColor; import org.bukkit.Location; diff --git a/src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/abstractItems/AReactor.java b/src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/abstractItems/AReactor.java index 600bd63e0..16006f7fd 100644 --- a/src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/abstractItems/AReactor.java +++ b/src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/abstractItems/AReactor.java @@ -22,6 +22,8 @@ import io.github.thebusybiscuit.cscorelib2.math.DoubleHandler; import io.github.thebusybiscuit.cscorelib2.protection.ProtectableAction; import io.github.thebusybiscuit.cscorelib2.skull.SkullItem; import io.github.thebusybiscuit.slimefun4.utils.ChestMenuUtils; +import io.github.thebusybiscuit.slimefun4.utils.holograms.ReactorHologram; +import io.github.thebusybiscuit.slimefun4.utils.holograms.SimpleHologram; import me.mrCookieSlime.CSCoreLibPlugin.Configuration.Config; import me.mrCookieSlime.Slimefun.SlimefunPlugin; import me.mrCookieSlime.Slimefun.Lists.RecipeType; @@ -39,8 +41,6 @@ import me.mrCookieSlime.Slimefun.api.energy.EnergyTicker; import me.mrCookieSlime.Slimefun.api.inventory.BlockMenu; import me.mrCookieSlime.Slimefun.api.inventory.BlockMenuPreset; import me.mrCookieSlime.Slimefun.api.item_transport.ItemTransportFlow; -import me.mrCookieSlime.Slimefun.holograms.ReactorHologram; -import me.mrCookieSlime.Slimefun.holograms.SimpleHologram; import me.mrCookieSlime.Slimefun.utils.MachineHelper; public abstract class AReactor extends SlimefunItem implements RecipeDisplayItem { diff --git a/src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/cargo/CargoManagerBlock.java b/src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/cargo/CargoManagerBlock.java index fb20de335..61031d629 100644 --- a/src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/cargo/CargoManagerBlock.java +++ b/src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/cargo/CargoManagerBlock.java @@ -5,6 +5,7 @@ import org.bukkit.block.Block; import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; +import io.github.thebusybiscuit.slimefun4.utils.holograms.SimpleHologram; import me.mrCookieSlime.CSCoreLibPlugin.Configuration.Config; import me.mrCookieSlime.CSCoreLibPlugin.events.ItemUseEvent; import me.mrCookieSlime.Slimefun.Lists.RecipeType; @@ -15,7 +16,6 @@ import me.mrCookieSlime.Slimefun.Objects.handlers.ItemInteractionHandler; import me.mrCookieSlime.Slimefun.api.BlockStorage; import me.mrCookieSlime.Slimefun.api.SlimefunItemStack; import me.mrCookieSlime.Slimefun.api.item_transport.CargoNet; -import me.mrCookieSlime.Slimefun.holograms.SimpleHologram; public class CargoManagerBlock extends SlimefunItem { diff --git a/src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/HologramProjector.java b/src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/HologramProjector.java index 1a8d8af46..ec10cd504 100644 --- a/src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/HologramProjector.java +++ b/src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/HologramProjector.java @@ -4,6 +4,7 @@ import org.bukkit.block.Block; import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; +import io.github.thebusybiscuit.slimefun4.utils.holograms.HologramProjectorHologram; import me.mrCookieSlime.Slimefun.Lists.RecipeType; import me.mrCookieSlime.Slimefun.Objects.Category; import me.mrCookieSlime.Slimefun.Objects.SlimefunBlockHandler; @@ -13,7 +14,6 @@ import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.UnregisterReason; import me.mrCookieSlime.Slimefun.Objects.handlers.ItemInteractionHandler; import me.mrCookieSlime.Slimefun.api.BlockStorage; import me.mrCookieSlime.Slimefun.api.SlimefunItemStack; -import me.mrCookieSlime.Slimefun.holograms.HologramProjectorHologram; public class HologramProjector extends SimpleSlimefunItem { diff --git a/src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/electric/EnergyRegulator.java b/src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/electric/EnergyRegulator.java index 55b6ae75e..0932ebe14 100644 --- a/src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/electric/EnergyRegulator.java +++ b/src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/electric/EnergyRegulator.java @@ -4,6 +4,7 @@ import org.bukkit.block.Block; import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; +import io.github.thebusybiscuit.slimefun4.utils.holograms.SimpleHologram; import me.mrCookieSlime.CSCoreLibPlugin.Configuration.Config; import me.mrCookieSlime.Slimefun.Lists.RecipeType; import me.mrCookieSlime.Slimefun.Objects.Category; @@ -13,7 +14,6 @@ import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.UnregisterReason; import me.mrCookieSlime.Slimefun.Objects.handlers.BlockTicker; import me.mrCookieSlime.Slimefun.api.SlimefunItemStack; import me.mrCookieSlime.Slimefun.api.energy.EnergyNet; -import me.mrCookieSlime.Slimefun.holograms.SimpleHologram; public class EnergyRegulator extends SlimefunItem { diff --git a/src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/electric/geo/GEOMiner.java b/src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/electric/geo/GEOMiner.java index ec4a5c22e..b41a7ad2f 100644 --- a/src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/electric/geo/GEOMiner.java +++ b/src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/electric/geo/GEOMiner.java @@ -11,6 +11,7 @@ import org.bukkit.event.inventory.InventoryClickEvent; import org.bukkit.inventory.ItemStack; import io.github.thebusybiscuit.cscorelib2.item.CustomItem; +import io.github.thebusybiscuit.slimefun4.utils.holograms.SimpleHologram; import me.mrCookieSlime.CSCoreLibPlugin.general.Inventory.ChestMenu.AdvancedMenuClickHandler; import me.mrCookieSlime.CSCoreLibPlugin.general.Inventory.ClickAction; import me.mrCookieSlime.Slimefun.GEO.OreGenResource; @@ -29,7 +30,6 @@ import me.mrCookieSlime.Slimefun.api.SlimefunItemStack; import me.mrCookieSlime.Slimefun.api.energy.ChargableBlock; import me.mrCookieSlime.Slimefun.api.inventory.BlockMenu; import me.mrCookieSlime.Slimefun.api.inventory.BlockMenuPreset; -import me.mrCookieSlime.Slimefun.holograms.SimpleHologram; import me.mrCookieSlime.Slimefun.utils.MachineHelper; public abstract class GEOMiner extends AContainer implements InventoryBlock, RecipeDisplayItem { diff --git a/src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/electric/reactors/NetherStarReactor.java b/src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/electric/reactors/NetherStarReactor.java index f77dff987..52d1ef7e6 100644 --- a/src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/electric/reactors/NetherStarReactor.java +++ b/src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/electric/reactors/NetherStarReactor.java @@ -8,6 +8,7 @@ import org.bukkit.inventory.ItemStack; import org.bukkit.potion.PotionEffect; import org.bukkit.potion.PotionEffectType; +import io.github.thebusybiscuit.slimefun4.utils.holograms.ReactorHologram; import me.mrCookieSlime.Slimefun.Lists.RecipeType; import me.mrCookieSlime.Slimefun.Lists.SlimefunItems; import me.mrCookieSlime.Slimefun.Objects.Category; @@ -15,7 +16,6 @@ import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.abstractItems.AReactor; import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.abstractItems.MachineFuel; import me.mrCookieSlime.Slimefun.api.Slimefun; import me.mrCookieSlime.Slimefun.api.SlimefunItemStack; -import me.mrCookieSlime.Slimefun.holograms.ReactorHologram; public abstract class NetherStarReactor extends AReactor { diff --git a/src/main/java/me/mrCookieSlime/Slimefun/api/energy/EnergyNet.java b/src/main/java/me/mrCookieSlime/Slimefun/api/energy/EnergyNet.java index 1133e8ace..a7c6b1892 100644 --- a/src/main/java/me/mrCookieSlime/Slimefun/api/energy/EnergyNet.java +++ b/src/main/java/me/mrCookieSlime/Slimefun/api/energy/EnergyNet.java @@ -8,14 +8,14 @@ import org.bukkit.Material; import org.bukkit.block.Block; import io.github.thebusybiscuit.cscorelib2.math.DoubleHandler; +import io.github.thebusybiscuit.slimefun4.utils.holograms.EnergyHologram; +import io.github.thebusybiscuit.slimefun4.utils.holograms.SimpleHologram; import me.mrCookieSlime.Slimefun.SlimefunPlugin; import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.SlimefunItem; import me.mrCookieSlime.Slimefun.api.BlockStorage; import me.mrCookieSlime.Slimefun.api.Slimefun; import me.mrCookieSlime.Slimefun.api.network.Network; import me.mrCookieSlime.Slimefun.api.network.NetworkComponent; -import me.mrCookieSlime.Slimefun.holograms.EnergyHologram; -import me.mrCookieSlime.Slimefun.holograms.SimpleHologram; public class EnergyNet extends Network { diff --git a/src/main/java/me/mrCookieSlime/Slimefun/api/item_transport/CargoNet.java b/src/main/java/me/mrCookieSlime/Slimefun/api/item_transport/CargoNet.java index 6cf5ec8eb..02c2be821 100644 --- a/src/main/java/me/mrCookieSlime/Slimefun/api/item_transport/CargoNet.java +++ b/src/main/java/me/mrCookieSlime/Slimefun/api/item_transport/CargoNet.java @@ -24,6 +24,7 @@ import org.bukkit.inventory.meta.ItemMeta; import io.github.thebusybiscuit.cscorelib2.item.CustomItem; import io.github.thebusybiscuit.cscorelib2.math.DoubleHandler; +import io.github.thebusybiscuit.slimefun4.utils.holograms.SimpleHologram; import me.mrCookieSlime.CSCoreLibPlugin.Configuration.Config; import me.mrCookieSlime.CSCoreLibPlugin.general.Inventory.ChestMenu.MenuClickHandler; import me.mrCookieSlime.Slimefun.SlimefunPlugin; @@ -35,7 +36,6 @@ import me.mrCookieSlime.Slimefun.api.inventory.DirtyChestMenu; import me.mrCookieSlime.Slimefun.api.inventory.UniversalBlockMenu; import me.mrCookieSlime.Slimefun.api.network.Network; import me.mrCookieSlime.Slimefun.api.network.NetworkComponent; -import me.mrCookieSlime.Slimefun.holograms.SimpleHologram; public class CargoNet extends Network {