diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/attributes/Processor.java b/src/main/java/io/github/thebusybiscuit/slimefun4/core/attributes/MachineOperator.java similarity index 58% rename from src/main/java/io/github/thebusybiscuit/slimefun4/core/attributes/Processor.java rename to src/main/java/io/github/thebusybiscuit/slimefun4/core/attributes/MachineOperator.java index dbd14ae6b..d5778e858 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/attributes/Processor.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/core/attributes/MachineOperator.java @@ -5,8 +5,13 @@ import javax.annotation.Nonnull; import io.github.thebusybiscuit.slimefun4.core.machines.MachineOperation; import io.github.thebusybiscuit.slimefun4.core.machines.MachineProcessor; -public interface Processor extends ItemAttribute { +public interface MachineOperator extends ItemAttribute { + /** + * This method returns our {@link MachineProcessor} instance. + * + * @return Our {@link MachineProcessor} + */ @Nonnull MachineProcessor getMachineProcessor(); diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/machines/MachineProcessor.java b/src/main/java/io/github/thebusybiscuit/slimefun4/core/machines/MachineProcessor.java index dbdee1339..43129ecb1 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/machines/MachineProcessor.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/core/machines/MachineProcessor.java @@ -23,11 +23,24 @@ public class MachineProcessor { private final Map machines = new HashMap<>(); private ItemStack progressBar; + /** + * This returns the progress bar icon for this {@link MachineProcessor} + * or null if no progress bar was set. + * + * @return The progress bar icon or null + */ @Nullable public ItemStack getProgressBar() { return progressBar; } + /** + * This sets the progress bar icon for this {@link MachineProcessor}. + * You can also set it to null to clear the progress bar. + * + * @param progressBar + * An {@link ItemStack} or null + */ public void setProgressBar(@Nullable ItemStack progressBar) { this.progressBar = progressBar; } diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/reactors/Reactor.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/reactors/Reactor.java index 2bf988182..b305b8bd8 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/reactors/Reactor.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/reactors/Reactor.java @@ -23,7 +23,7 @@ import io.github.thebusybiscuit.cscorelib2.item.CustomItem; import io.github.thebusybiscuit.cscorelib2.protection.ProtectableAction; import io.github.thebusybiscuit.slimefun4.api.events.ReactorExplodeEvent; import io.github.thebusybiscuit.slimefun4.core.attributes.HologramOwner; -import io.github.thebusybiscuit.slimefun4.core.attributes.Processor; +import io.github.thebusybiscuit.slimefun4.core.attributes.MachineOperator; import io.github.thebusybiscuit.slimefun4.core.handlers.BlockBreakHandler; import io.github.thebusybiscuit.slimefun4.core.machines.FuelOperation; import io.github.thebusybiscuit.slimefun4.core.machines.MachineProcessor; @@ -59,7 +59,7 @@ import me.mrCookieSlime.Slimefun.api.item_transport.ItemTransportFlow; * @see NetherStarReactor * */ -public abstract class Reactor extends AbstractEnergyProvider implements HologramOwner, Processor { +public abstract class Reactor extends AbstractEnergyProvider implements HologramOwner, MachineOperator { private static final String MODE = "reactor-mode"; private static final int INFO_SLOT = 49; diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/geo/GEOMiner.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/geo/GEOMiner.java index 05b151298..4df353390 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/geo/GEOMiner.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/geo/GEOMiner.java @@ -19,7 +19,7 @@ import io.github.thebusybiscuit.cscorelib2.item.CustomItem; import io.github.thebusybiscuit.slimefun4.api.geo.GEOResource; import io.github.thebusybiscuit.slimefun4.core.attributes.EnergyNetComponent; import io.github.thebusybiscuit.slimefun4.core.attributes.HologramOwner; -import io.github.thebusybiscuit.slimefun4.core.attributes.Processor; +import io.github.thebusybiscuit.slimefun4.core.attributes.MachineOperator; import io.github.thebusybiscuit.slimefun4.core.attributes.RecipeDisplayItem; import io.github.thebusybiscuit.slimefun4.core.handlers.BlockBreakHandler; import io.github.thebusybiscuit.slimefun4.core.handlers.BlockPlaceHandler; @@ -42,7 +42,7 @@ import me.mrCookieSlime.Slimefun.api.SlimefunItemStack; import me.mrCookieSlime.Slimefun.api.inventory.BlockMenu; import me.mrCookieSlime.Slimefun.api.inventory.BlockMenuPreset; -public class GEOMiner extends SlimefunItem implements RecipeDisplayItem, EnergyNetComponent, InventoryBlock, HologramOwner, Processor { +public class GEOMiner extends SlimefunItem implements RecipeDisplayItem, EnergyNetComponent, InventoryBlock, HologramOwner, MachineOperator { private static final int[] BORDER = { 0, 1, 2, 3, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 26, 27, 35, 36, 44, 45, 53 }; private static final int[] OUTPUT_BORDER = { 19, 20, 21, 22, 23, 24, 25, 28, 34, 37, 43, 46, 47, 48, 49, 50, 51, 52 }; diff --git a/src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/abstractItems/AContainer.java b/src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/abstractItems/AContainer.java index 69f1ae966..6e4b6983e 100644 --- a/src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/abstractItems/AContainer.java +++ b/src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/abstractItems/AContainer.java @@ -22,7 +22,7 @@ import io.github.thebusybiscuit.cscorelib2.item.CustomItem; import io.github.thebusybiscuit.slimefun4.api.SlimefunAddon; import io.github.thebusybiscuit.slimefun4.api.items.ItemState; import io.github.thebusybiscuit.slimefun4.core.attributes.EnergyNetComponent; -import io.github.thebusybiscuit.slimefun4.core.attributes.Processor; +import io.github.thebusybiscuit.slimefun4.core.attributes.MachineOperator; import io.github.thebusybiscuit.slimefun4.core.machines.CraftingOperation; import io.github.thebusybiscuit.slimefun4.core.machines.MachineProcessor; import io.github.thebusybiscuit.slimefun4.core.networks.energy.EnergyNetComponentType; @@ -42,7 +42,7 @@ import me.mrCookieSlime.Slimefun.api.SlimefunItemStack; import me.mrCookieSlime.Slimefun.api.inventory.BlockMenu; import me.mrCookieSlime.Slimefun.api.inventory.BlockMenuPreset; -public abstract class AContainer extends SlimefunItem implements InventoryBlock, EnergyNetComponent, Processor { +public abstract class AContainer extends SlimefunItem implements InventoryBlock, EnergyNetComponent, MachineOperator { private static final int[] BORDER = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 13, 31, 36, 37, 38, 39, 40, 41, 42, 43, 44 }; private static final int[] BORDER_IN = { 9, 10, 11, 12, 18, 21, 27, 28, 29, 30 }; diff --git a/src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/abstractItems/AGenerator.java b/src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/abstractItems/AGenerator.java index 028483de9..d40c8af19 100644 --- a/src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/abstractItems/AGenerator.java +++ b/src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/abstractItems/AGenerator.java @@ -19,7 +19,7 @@ import io.github.thebusybiscuit.cscorelib2.item.CustomItem; import io.github.thebusybiscuit.cscorelib2.protection.ProtectableAction; import io.github.thebusybiscuit.slimefun4.api.SlimefunAddon; import io.github.thebusybiscuit.slimefun4.api.items.ItemState; -import io.github.thebusybiscuit.slimefun4.core.attributes.Processor; +import io.github.thebusybiscuit.slimefun4.core.attributes.MachineOperator; import io.github.thebusybiscuit.slimefun4.core.machines.FuelOperation; import io.github.thebusybiscuit.slimefun4.core.machines.MachineProcessor; import io.github.thebusybiscuit.slimefun4.implementation.SlimefunItems; @@ -39,7 +39,7 @@ import me.mrCookieSlime.Slimefun.api.inventory.BlockMenu; import me.mrCookieSlime.Slimefun.api.inventory.BlockMenuPreset; import me.mrCookieSlime.Slimefun.api.item_transport.ItemTransportFlow; -public abstract class AGenerator extends AbstractEnergyProvider implements Processor { +public abstract class AGenerator extends AbstractEnergyProvider implements MachineOperator { private static final int[] border = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 13, 31, 36, 37, 38, 39, 40, 41, 42, 43, 44 }; private static final int[] border_in = { 9, 10, 11, 12, 18, 21, 27, 28, 29, 30 };