v27 - cleaned up some more code

pom.xml

@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>me.fhoz</groupId>
     <artifactId>NotEnoughAddons</artifactId>
-    <version>26</version>
+    <version>27</version>
 
     <properties>
         <maven.compiler.source>1.8</maven.compiler.source>

src/main/java/me/fhoz/notenoughaddons/NEAItemSetup.java

@@ -12,7 +12,6 @@
 import me.fhoz.notenoughaddons.items.AngelBlock;
 import me.fhoz.notenoughaddons.boosts.BoostJump;
 import me.fhoz.notenoughaddons.utils.NEAItems;
-import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.abstractItems.AContainer;
 
 import javax.annotation.Nonnull;
 import org.bukkit.Material;

src/main/java/me/fhoz/notenoughaddons/NotEnoughAddons.java

@@ -1,14 +1,9 @@
 package me.fhoz.notenoughaddons;
 
-import java.io.File;
 import io.github.thebusybiscuit.slimefun4.api.SlimefunAddon;
 import io.github.thebusybiscuit.slimefun4.api.player.PlayerProfile;
 import io.github.thebusybiscuit.slimefun4.libraries.dough.collections.Pair;
 import io.github.thebusybiscuit.slimefun4.libraries.dough.config.Config;
-import io.github.thebusybiscuit.slimefun4.libraries.dough.skins.UUIDLookup;
-import io.github.thebusybiscuit.slimefun4.libraries.dough.updater.GitHubBuildsUpdater;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
@@ -20,16 +15,12 @@
 import lombok.SneakyThrows;
 import me.fhoz.notenoughaddons.boosts.BoostJump;
 import me.fhoz.notenoughaddons.items.AngelBlock;
-import me.fhoz.notenoughaddons.utils.Constants;
 import me.fhoz.notenoughaddons.utils.Utils;
 import me.fhoz.notenoughaddons.services.UpdateService;
 import me.mrCookieSlime.Slimefun.api.BlockStorage;
-import org.bstats.bukkit.Metrics;
 import org.bukkit.Bukkit;
-import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
-import org.bukkit.enchantments.Enchantment;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.Recipe;

src/main/java/me/fhoz/notenoughaddons/boosts/BoostJump.java

@@ -1,49 +1,29 @@
 package me.fhoz.notenoughaddons.boosts;
 
-import io.github.thebusybiscuit.slimefun4.core.attributes.RecipeDisplayItem;
 import io.github.thebusybiscuit.slimefun4.core.handlers.ItemUseHandler;
-import io.github.thebusybiscuit.slimefun4.implementation.SlimefunItems;
 import io.github.thebusybiscuit.slimefun4.implementation.items.SimpleSlimefunItem;
-import io.github.thebusybiscuit.slimefun4.implementation.items.electric.machines.ElectricDustWasher;
-import io.github.thebusybiscuit.slimefun4.utils.SlimefunUtils;
 import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType;
 import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup;
 import me.fhoz.notenoughaddons.NotEnoughAddons;
-import me.fhoz.notenoughaddons.utils.Constants;
-import me.fhoz.notenoughaddons.utils.Utils;
 import me.fhoz.notenoughaddons.utils.NEAItems;
-import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.abstractItems.AContainer;
-import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.abstractItems.MachineRecipe;
 import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack;
-import me.mrCookieSlime.Slimefun.api.inventory.BlockMenu;
-import net.md_5.bungee.api.ChatColor;
-import io.github.thebusybiscuit.slimefun4.libraries.dough.items.CustomItemStack;
 
 import org.bukkit.Bukkit;
 import org.bukkit.Effect;
 import org.bukkit.Location;
-import org.bukkit.Material;
 import org.bukkit.Sound;
-import org.bukkit.block.Block;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
 import org.bukkit.event.entity.EntityDamageEvent;
 import org.bukkit.inventory.ItemStack;
-import org.bukkit.inventory.meta.PotionMeta;
-import org.bukkit.potion.PotionEffect;
-import org.bukkit.potion.PotionEffectType;
 import org.bukkit.util.Vector;
-import org.bukkit.inventory.Inventory;
 
-import javax.annotation.Nonnull;
 import javax.annotation.ParametersAreNonnullByDefault;
 
 import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
 
 public class BoostJump extends SimpleSlimefunItem<ItemUseHandler> implements Listener  {
     private static ArrayList<Player> noFallDMGList = new ArrayList<Player>();

src/main/java/me/fhoz/notenoughaddons/items/AngelBlock.java

@@ -1,23 +1,13 @@
 package me.fhoz.notenoughaddons.items;
 
-import io.github.thebusybiscuit.slimefun4.core.attributes.RecipeDisplayItem;
 import io.github.thebusybiscuit.slimefun4.core.handlers.ItemUseHandler;
-import io.github.thebusybiscuit.slimefun4.implementation.SlimefunItems;
 import io.github.thebusybiscuit.slimefun4.implementation.items.SimpleSlimefunItem;
-import io.github.thebusybiscuit.slimefun4.implementation.items.electric.machines.ElectricDustWasher;
-import io.github.thebusybiscuit.slimefun4.utils.SlimefunUtils;
 import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType;
 import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup;
 import me.fhoz.notenoughaddons.NotEnoughAddons;
-import me.fhoz.notenoughaddons.utils.Constants;
 import me.fhoz.notenoughaddons.utils.Utils;
 import me.fhoz.notenoughaddons.utils.NEAItems;
-import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.abstractItems.AContainer;
-import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.abstractItems.MachineRecipe;
 import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack;
-import me.mrCookieSlime.Slimefun.api.inventory.BlockMenu;
-import net.md_5.bungee.api.ChatColor;
-import io.github.thebusybiscuit.slimefun4.libraries.dough.items.CustomItemStack;
 
 import org.bukkit.Bukkit;
 import org.bukkit.Effect;
@@ -27,14 +17,10 @@
 import org.bukkit.block.Block;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
-import org.bukkit.inventory.Inventory;
 
-import javax.annotation.Nonnull;
 import javax.annotation.ParametersAreNonnullByDefault;
 
 import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
 
 
 public class AngelBlock extends SimpleSlimefunItem<ItemUseHandler> {

src/main/java/me/fhoz/notenoughaddons/services/UpdateService.java

@@ -3,23 +3,16 @@
 
 import java.io.File;
 import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.net.URL;
 import java.nio.file.*;
 import java.nio.file.Path;
 import java.nio.file.Files;
-import java.nio.file.StandardCopyOption;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.logging.Level;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
-import org.bukkit.plugin.Plugin;
-
 import io.github.bakedlibs.dough.common.CommonPatterns;
-import io.github.thebusybiscuit.slimefun4.implementation.Slimefun;
 import kong.unirest.GetRequest;
 import kong.unirest.HttpResponse;
 import kong.unirest.JsonNode;

src/main/java/me/fhoz/notenoughaddons/utils/NEAItems.java

@@ -6,7 +6,6 @@
 import io.github.thebusybiscuit.slimefun4.core.attributes.MachineType;
 import io.github.thebusybiscuit.slimefun4.utils.LoreBuilder;
 import me.fhoz.notenoughaddons.machines.BudgetDustFabricator;
-import me.fhoz.notenoughaddons.items.AngelBlock;
 
 import org.bukkit.Material;
 import org.bukkit.enchantments.Enchantment;

src/main/java/me/fhoz/notenoughaddons/utils/Utils.java

@@ -25,11 +25,9 @@
 import javax.crypto.Cipher;  
 
 import java.io.ByteArrayInputStream;
-import java.lang.System.Logger;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.TreeMap;
-import java.util.logging.Level;
 
 public final class Utils {
     static Cipher cipher;