Reduced Code Smells

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

@@ -260,7 +260,7 @@ public class SlimefunItem {
 				}
 
 				if (SlimefunPlugin.getSettings().printOutLoading) {
-					Slimefun.getLogger().log(Level.INFO, "Loaded Item \"" + this.id + "\"");
+					Slimefun.getLogger().log(Level.INFO, "Loaded Item \"{0}\"", this.id);
 				}
 			} 
 			else {
@@ -465,7 +465,7 @@ public class SlimefunItem {
 	public static void patchExistingItem(String id, ItemStack stack) {
 		SlimefunItem item = getByID(id);
 		if (item != null) {
-			Slimefun.getLogger().log(Level.INFO, "WARNING - Patching existing Item - " + id);
+			Slimefun.getLogger().log(Level.INFO, "Patching existing Item... {0}", id);
 			Slimefun.getLogger().log(Level.INFO, "This might take a while");
 
 			final ItemStack old = item.getItem();

src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/abstractItems/ADrill.java

@@ -21,7 +21,6 @@ import me.mrCookieSlime.Slimefun.Objects.Category;
 import me.mrCookieSlime.Slimefun.Setup.Messages;
 import me.mrCookieSlime.Slimefun.api.BlockStorage;
 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.api.item_transport.ItemTransportFlow;
 
@@ -77,10 +76,6 @@ public abstract class ADrill extends AContainer {
 				}
 			}
 
-			@Override
-			public void newInstance(BlockMenu menu, Block b) {
-			}
-
 			@Override
 			public boolean canOpen(Block b, Player p) {
 				if (!(p.hasPermission("slimefun.inventory.bypass") || CSCoreLib.getLib().getProtectionManager().canAccessChest(p.getUniqueId(), b, true))) {

src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/abstractItems/AFarm.java

@@ -41,11 +41,6 @@ public abstract class AFarm extends SlimefunItem {
 				constructMenu(this);
 			}
 
-			@Override
-			public void newInstance(BlockMenu menu, Block b) {
-				
-			}
-
 			@Override
 			public boolean canOpen(Block b, Player p) {
 				return p.hasPermission("slimefun.inventory.bypass") || CSCoreLib.getLib().getProtectionManager().canAccessChest(p.getUniqueId(), b, true);
@@ -86,10 +81,6 @@ public abstract class AFarm extends SlimefunItem {
 				constructMenu(this);
 			}
 			
-			@Override
-			public void newInstance(BlockMenu menu, Block b) {
-			}
-
 			@Override
 			public boolean canOpen(Block b, Player p) {
 				return p.hasPermission("slimefun.inventory.bypass") || CSCoreLib.getLib().getProtectionManager().canAccessChest(p.getUniqueId(), b, true);

src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/abstractItems/AGenerator.java

@@ -59,10 +59,6 @@ public abstract class AGenerator extends SlimefunItem {
 				constructMenu(this);
 			}
 
-			@Override
-			public void newInstance(BlockMenu menu, Block b) {
-			}
-
 			@Override
 			public boolean canOpen(Block b, Player p) {
 				return p.hasPermission("slimefun.inventory.bypass") || CSCoreLib.getLib().getProtectionManager().canAccessChest(p.getUniqueId(), b, true);

src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/abstractItems/AReactor.java

@@ -8,6 +8,7 @@ import java.util.Map;
 import java.util.Optional;
 import java.util.Random;
 import java.util.Set;
+import java.util.logging.Level;
 
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
@@ -34,6 +35,7 @@ import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.UnregisterReason;
 import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.machines.ReactorAccessPort;
 import me.mrCookieSlime.Slimefun.Setup.SlimefunManager;
 import me.mrCookieSlime.Slimefun.api.BlockStorage;
+import me.mrCookieSlime.Slimefun.api.Slimefun;
 import me.mrCookieSlime.Slimefun.api.energy.ChargableBlock;
 import me.mrCookieSlime.Slimefun.api.energy.EnergyTicker;
 import me.mrCookieSlime.Slimefun.api.inventory.BlockMenu;
@@ -83,6 +85,7 @@ public abstract class AReactor extends SlimefunItem {
 					if (BlockStorage.getLocationInfo(b.getLocation(), "reactor-mode") == null){
 						BlockStorage.addBlockInfo(b, "reactor-mode", "generator");
 					}
+					
 					if (!BlockStorage.hasBlockInfo(b) || BlockStorage.getLocationInfo(b.getLocation(), "reactor-mode").equals("generator")) {
 						menu.replaceExistingItem(4, new CustomItem(CustomSkull.getItem("eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvOTM0M2NlNThkYTU0Yzc5OTI0YTJjOTMzMWNmYzQxN2ZlOGNjYmJlYTliZTQ1YTdhYzg1ODYwYTZjNzMwIn19fQ=="), "&7Focus: &eElectricity", "", "&6Your Reactor will focus on Power Generation", "&6If your Energy Network doesn't need Power", "&6it will not produce any either", "", "&7> Click to change the Focus to &eProduction"));
 						menu.addMenuClickHandler(4, (p, slot, item, action) -> {
@@ -99,16 +102,18 @@ public abstract class AReactor extends SlimefunItem {
 							return false;
 						});
 					}
-					BlockMenu ap = getAccessPort(b.getLocation());
+					
-					if(ap != null) {
+					BlockMenu port = getAccessPort(b.getLocation());
+					if (port != null) {
 						menu.replaceExistingItem(infoSlot, new CustomItem(new ItemStack(Material.GREEN_WOOL), "&7Access Port", "", "&6Detected", "", "&7> Click to view Access Port"));
 						menu.addMenuClickHandler(infoSlot, (p, slot, item, action) -> {
-							ap.open(p);
+							port.open(p);
 							newInstance(menu, b);
 
 							return false;
 						});
-					} else {
+					} 
+					else {
 						menu.replaceExistingItem(infoSlot, new CustomItem(new ItemStack(Material.RED_WOOL), "&7Access Port", "", "&cNot detected", "", "&7Access Port must be", "&7placed 3 blocks above", "&7a reactor!"));
 						menu.addMenuClickHandler(infoSlot, (p, slot, item, action) -> {
 							newInstance(menu, b);
@@ -118,6 +123,7 @@ public abstract class AReactor extends SlimefunItem {
 					}
 
 				} catch(Exception x) {
+					Slimefun.getLogger().log(Level.SEVERE, "An Error occured when creating a Reactor Menu for Slimefun " + Slimefun.getVersion(), x);
 				}
 			}
 
@@ -145,12 +151,14 @@ public abstract class AReactor extends SlimefunItem {
 							inv.replaceExistingItem(slot, null);
 						}
 					}
+					
 					for (int slot : getCoolantSlots()) {
 						if (inv.getItemInSlot(slot) != null) {
 							b.getWorld().dropItemNaturally(b.getLocation(), inv.getItemInSlot(slot));
 							inv.replaceExistingItem(slot, null);
 						}
 					}
+					
 					for (int slot : getOutputSlots()) {
 						if (inv.getItemInSlot(slot) != null) {
 							b.getWorld().dropItemNaturally(b.getLocation(), inv.getItemInSlot(slot));
@@ -158,6 +166,7 @@ public abstract class AReactor extends SlimefunItem {
 						}
 					}
 				}
+				
 				progress.remove(b.getLocation());
 				processing.remove(b.getLocation());
 				ReactorHologram.remove(b.getLocation());
@@ -170,35 +179,23 @@ public abstract class AReactor extends SlimefunItem {
 
 	private void constructMenu(BlockMenuPreset preset) {
 		for (int i : border) {
-			preset.addItem(i, new CustomItem(new ItemStack(Material.GRAY_STAINED_GLASS_PANE), " "),
+			preset.addItem(i, new CustomItem(new ItemStack(Material.GRAY_STAINED_GLASS_PANE), " "), (p, slot, item, action) -> false);
-					(p, slot, item, action) -> false
-					);
 		}
 
 		for (int i : border_1) {
-			preset.addItem(i, new CustomItem(new ItemStack(Material.LIME_STAINED_GLASS_PANE), " "),
+			preset.addItem(i, new CustomItem(new ItemStack(Material.LIME_STAINED_GLASS_PANE), " "), (p, slot, item, action) -> false);
-					(p, slot, item, action) -> false
-					);
 		}
 
 		for (int i : border_3) {
-			preset.addItem(i, new CustomItem(new ItemStack(Material.GREEN_STAINED_GLASS_PANE), " "),
+			preset.addItem(i, new CustomItem(new ItemStack(Material.GREEN_STAINED_GLASS_PANE), " "), (p, slot, item, action) -> false);
-					(p, slot, item, action) -> false
-					);
 		}
 
-		preset.addItem(22, new CustomItem(new ItemStack(Material.BLACK_STAINED_GLASS_PANE), " "),
+		preset.addItem(22, new CustomItem(new ItemStack(Material.BLACK_STAINED_GLASS_PANE), " "), (p, slot, item, action) -> false);
-				(p, slot, item, action) -> false
-				);
 
-		preset.addItem(1, new CustomItem(SlimefunItems.URANIUM, "&7Fuel Slot", "", "&rThis Slot accepts radioactive Fuel such as:", "&2Uranium &ror &aNeptunium"),
+		preset.addItem(1, new CustomItem(SlimefunItems.URANIUM, "&7Fuel Slot", "", "&rThis Slot accepts radioactive Fuel such as:", "&2Uranium &ror &aNeptunium"), (p, slot, item, action) -> false);
-				(p, slot, item, action) -> false
-				);
 
 		for (int i : border_2) {
-			preset.addItem(i, new CustomItem(new ItemStack(Material.CYAN_STAINED_GLASS_PANE), " "),
+			preset.addItem(i, new CustomItem(new ItemStack(Material.CYAN_STAINED_GLASS_PANE), " "), (p, slot, item, action) -> false);
-					(p, slot, item, action) -> false
-					);
 		}
 
 		if (needsCooling()) {
@@ -208,9 +205,7 @@ public abstract class AReactor extends SlimefunItem {
 			preset.addItem(7, new CustomItem(new ItemStack(Material.BARRIER), "&bCoolant Slot", "", "&rThis Slot accepts Coolant Cells"));
 
 			for (int i : border_4) {
-				preset.addItem(i, new CustomItem(new ItemStack(Material.BARRIER), "&cNo Coolant Required"),
+				preset.addItem(i, new CustomItem(new ItemStack(Material.BARRIER), "&cNo Coolant Required"), (p, slot, item, action) -> false);
-						(p, slot, item, action) -> false
-						);
 			}
 		}
 	}

src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/abstractItems/MachineHelper.java

@@ -3,7 +3,9 @@ package me.mrCookieSlime.Slimefun.Objects.SlimefunItem.abstractItems;
 import org.bukkit.ChatColor;
 import org.bukkit.inventory.ItemStack;
 
-public class MachineHelper {
+public final class MachineHelper {
+	
+	private MachineHelper() {}
 	
 	public static String getTimeLeft(int l) {
 		String timeleft = "";

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

@@ -6,6 +6,7 @@ import java.util.List;
 import java.util.Random;
 import java.util.Set;
 import java.util.UUID;
+import java.util.logging.Level;
 import java.util.stream.Stream;
 
 import org.bukkit.Bukkit;
@@ -3994,16 +3995,12 @@ public final class SlimefunSetup {
 				return 250;
 			}
 
-			@Override
-			public void extraTick(Location l) {
-
-			}
-
 			@Override
 			public ItemStack getProgressBar() {
 				try {
 					return CustomSkull.getItem("eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvYTNhZDhlZTg0OWVkZjA0ZWQ5YTI2Y2EzMzQxZjYwMzNiZDc2ZGNjNDIzMWVkMWVhNjNiNzU2NTc1MWIyN2FjIn19fQ==");
 				} catch (Exception e) {
+					Slimefun.getLogger().log(Level.SEVERE, "An Error occured while creating the Progressbar of a Reactor for Slimefun " + Slimefun.getVersion());
 					return new ItemStack(Material.BLAZE_POWDER);
 				}
 			}
@@ -4012,6 +4009,12 @@ public final class SlimefunSetup {
             public ItemStack getCoolant() {
                 return SlimefunItems.REACTOR_COOLANT_CELL;
             }
+
+			@Override
+			public void extraTick(Location l) {
+				// This machine does not need to perform anything while ticking
+				// The Nether Star Reactor uses this method to generate the Wither Effect
+			}
 		}
 		.registerChargeableBlock(true, 16384);
 

src/me/mrCookieSlime/Slimefun/ancient_altar/AncientAltarListener.java

@@ -73,9 +73,7 @@ public class AncientAltarListener implements Listener {
 					final UUID uuid = stack.getUniqueId();
 					removedItems.add(uuid);
 
-					SlimefunPlugin.instance.getServer().getScheduler().scheduleSyncDelayedTask(SlimefunPlugin.instance, () -> {
+					SlimefunPlugin.instance.getServer().getScheduler().scheduleSyncDelayedTask(SlimefunPlugin.instance, () -> removedItems.remove(uuid), 30L);
-						removedItems.remove(uuid);
-					}, 30L);
 
 					stack.remove();
 					e.getPlayer().getInventory().addItem(fixItemStack(stack.getItemStack(), stack.getCustomName()));

src/me/mrCookieSlime/Slimefun/api/SlimefunBackup.java

@@ -16,7 +16,9 @@ import java.util.zip.ZipOutputStream;
 
 import me.mrCookieSlime.CSCoreLibPlugin.general.Clock;
 
-public class SlimefunBackup {
+public final class SlimefunBackup {
+
+	private SlimefunBackup() {}
 	
 	public static void start() {
 		File folder = new File("data-storage/Slimefun/block-backups");

src/me/mrCookieSlime/Slimefun/api/SlimefunRecipes.java

@@ -5,7 +5,9 @@ import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.abstractItems.AContainer;
 
 import org.bukkit.inventory.ItemStack;
 
-public class SlimefunRecipes {
+public final class SlimefunRecipes {
+
+	private SlimefunRecipes() {}
 	
 	public static void registerMachineRecipe(String machine, int seconds, ItemStack[] input, ItemStack[] output) {
 		for (SlimefunItem item: SlimefunItem.all) {

src/me/mrCookieSlime/Slimefun/api/TickerTask.java

@@ -118,9 +118,7 @@ public class TickerTask implements Runnable {
 												
 												BlockStorage._integrated_removeBlockInfo(l, true);
 												
-												Bukkit.getScheduler().scheduleSyncDelayedTask(SlimefunPlugin.instance, () -> {
+												Bukkit.getScheduler().scheduleSyncDelayedTask(SlimefunPlugin.instance, () -> l.getBlock().setType(Material.AIR));
-													l.getBlock().setType(Material.AIR);
-												});
 											}
 											else {
 												buggedBlocks.put(l, errors);
@@ -156,9 +154,7 @@ public class TickerTask implements Runnable {
 									
 									BlockStorage._integrated_removeBlockInfo(l, true);
 									
-									Bukkit.getScheduler().scheduleSyncDelayedTask(SlimefunPlugin.instance, () -> {
+									Bukkit.getScheduler().scheduleSyncDelayedTask(SlimefunPlugin.instance, () -> l.getBlock().setType(Material.AIR));
-										l.getBlock().setType(Material.AIR);
-									});
 								}
 								else {
 									buggedBlocks.put(l, errors);

src/me/mrCookieSlime/Slimefun/api/energy/ItemEnergy.java

@@ -11,9 +11,11 @@ import org.bukkit.inventory.meta.ItemMeta;
 
 import me.mrCookieSlime.CSCoreLibPlugin.general.Player.PlayerInventory;
 
-public class ItemEnergy {
+public final class ItemEnergy {
 	
-//	"&c&o&8\u21E8 &e\u26A1 &70 / 50 J"
+	private ItemEnergy() {}
+	
+	//	"&c&o&8\u21E8 &e\u26A1 &70 / 50 J"
 	
 	public static float getStoredEnergy(ItemStack item) {
 		if (item == null || item.getType() == null || item.getType() == Material.AIR) return 0F;

src/me/mrCookieSlime/Slimefun/api/inventory/BlockMenuPreset.java

@@ -161,9 +161,7 @@ public abstract class BlockMenuPreset extends ChestMenu {
 	}
 	
 	public void newInstance(final BlockMenu menu, final Location l) {
-		Bukkit.getScheduler().runTask(SlimefunPlugin.instance, () -> {
+		Bukkit.getScheduler().runTask(SlimefunPlugin.instance, () -> newInstance(menu, l.getBlock()));
-			newInstance(menu, l.getBlock());
-		});
 	}
 
 }

src/me/mrCookieSlime/Slimefun/api/item_transport/CargoManager.java

@@ -15,7 +15,9 @@ import me.mrCookieSlime.Slimefun.api.BlockStorage;
 import me.mrCookieSlime.Slimefun.api.inventory.BlockMenu;
 import me.mrCookieSlime.Slimefun.api.inventory.UniversalBlockMenu;
 
-public class CargoManager {
+public final class CargoManager {
+	
+	private CargoManager() {}
 	
 	public static ItemStack withdraw(Block node, BlockStorage storage, Block target, ItemStack template) {
 		if (storage.hasUniversalInventory(target)) {

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

@@ -7,7 +7,9 @@ import org.bukkit.entity.Entity;
 
 import me.mrCookieSlime.CSCoreLibPlugin.general.World.ArmorStandFactory;
 
-public class InfusedHopperHologram {
+public final class InfusedHopperHologram {
+	
+	private InfusedHopperHologram() {}
 	
 	private static final double offset = 1.2;
 	

src/me/mrCookieSlime/Slimefun/hooks/github/GitHubSetup.java

@@ -126,6 +126,7 @@ public final class GitHubSetup {
 			
 			@Override
 			public void onFailure() {
+				// We don't have to do anything on failure
 			}
 			
 			@Override
@@ -154,6 +155,7 @@ public final class GitHubSetup {
 			
 			@Override
 			public void onFailure() {
+				// We don't have to do anything on failure
 			}
 			
 			@Override

src/me/mrCookieSlime/Slimefun/listeners/TalismanListener.java

@@ -98,9 +98,7 @@ public class TalismanListener implements Listener {
 			item.setItemMeta(meta);
 			
 			final int itemSlot = slot;
-			SlimefunPlugin.instance.getServer().getScheduler().runTaskLater(SlimefunPlugin.instance, () -> {
+			SlimefunPlugin.instance.getServer().getScheduler().runTaskLater(SlimefunPlugin.instance, () -> inv.setItem(itemSlot, item), 1L);
-				inv.setItem(itemSlot, item);
-			}, 1L);
 		}
 	}