organized imports, big config update

Mooy1 · Apr 12, 2021 · bf00280 · bf00280
1 parent b88f4ad
commit bf00280
Show file tree

Hide file tree

Showing 48 changed files with 567 additions and 519 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug-report.md b/.github/ISSUE_TEMPLATE/bug-report.md
@@ -29,6 +29,5 @@ assignees: ''
 <!-- You can look under the "Infinity Expansion" Category top left item to find the Plugin version. -->
 
  - Minecraft Version:
- - CS-CoreLib Version:
  - Slimefun Version:
  - Plugin Version: 
diff --git a/pom.xml b/pom.xml
@@ -58,7 +58,7 @@
         <dependency>
             <groupId>io.github.mooy1</groupId>
             <artifactId>InfinityLib</artifactId>
-            <version>54850a5</version>
+            <version>17d0687</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>

diff --git a/src/main/java/io/github/mooy1/infinityexpansion/InfinityExpansion.java b/src/main/java/io/github/mooy1/infinityexpansion/InfinityExpansion.java
@@ -1,16 +1,15 @@
 package io.github.mooy1.infinityexpansion;
 
+import java.util.Arrays;
+import java.util.List;
+import java.util.logging.Level;
+
 import io.github.mooy1.infinityexpansion.commands.GiveRecipe;
 import io.github.mooy1.infinityexpansion.commands.PrintItem;
 import io.github.mooy1.infinityexpansion.commands.SetData;
 import io.github.mooy1.infinitylib.AbstractAddon;
 import io.github.mooy1.infinitylib.bstats.bukkit.Metrics;
 import io.github.mooy1.infinitylib.commands.AbstractCommand;
-import lombok.Getter;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.logging.Level;
 
 public final class InfinityExpansion extends AbstractAddon {
 
@@ -20,33 +19,27 @@ public static InfinityExpansion inst() {
         return instance;
     }
 
-    @Getter
-    private double difficulty = 1;
-
     @Override
     public void onEnable() {
-        super.onEnable();
         instance = this;
+        super.onEnable();
 
-        loadDifficulty();
-
-        getMetrics().addCustomChart(new Metrics.SimplePie("difficulty", () -> String.valueOf(this.difficulty)));
-
+        Setup.setup(this);
+
         if (getServer().getPluginManager().getPlugin("LiteXpansion") != null) {
             runSync(() -> log(Level.WARNING,
                     "########################################################",
                     "LiteXpansion nerfs energy generation in this addon.",
                     "You can disable these nerfs in the LiteXpansion config.",
+                    "Under 'options:' add 'nerf-other-addons: false'",
                     "########################################################"
             ));
         }
-
-        Setup.setup(this);
     }
 
     @Override
-    protected int getMetricsID() {
-        return 8991;
+    protected Metrics setupMetrics() {
+        return new Metrics(this, 8991);
     }
 
     @Override
@@ -59,21 +52,6 @@ protected List<AbstractCommand> getSubCommands() {
         return Arrays.asList(new GiveRecipe(), new SetData(), new PrintItem());        
     }
 
-    private void loadDifficulty() {
-        double val = getConfig().getDouble("balance-options.difficulty");
-        // round to .1 .2 .3 or 1 2 3 etc
-        if (val >= .1 && val < 1) {
-            this.difficulty = ((int) (val * 10)) / 10D;
-        } else if (val >= 1 && val <= 10) {
-            this.difficulty = (int) val;
-        } else {
-            this.difficulty = 1;
-            getConfig().set("balance-options.difficulty", 1);
-            log(Level.WARNING, "Difficulty value was out of bounds, resetting to default!");
-            saveConfig();
-        }
-    }
-
     @Override
     public void onDisable() {
         instance = null;

diff --git a/src/main/java/io/github/mooy1/infinityexpansion/Setup.java b/src/main/java/io/github/mooy1/infinityexpansion/Setup.java
@@ -1,5 +1,17 @@
 package io.github.mooy1.infinityexpansion;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.logging.Level;
+
+import javax.annotation.Nonnull;
+
+import org.bukkit.ChatColor;
+import org.bukkit.configuration.ConfigurationSection;
+import org.bukkit.enchantments.Enchantment;
+import org.bukkit.inventory.meta.ItemMeta;
+
 import io.github.mooy1.infinityexpansion.categories.Categories;
 import io.github.mooy1.infinityexpansion.implementation.SlimefunExtension;
 import io.github.mooy1.infinityexpansion.implementation.blocks.AdvancedAnvil;
@@ -35,16 +47,6 @@
 import io.github.mooy1.infinityexpansion.implementation.storage.StorageUnit;
 import io.github.mooy1.infinityexpansion.utils.Util;
 import me.mrCookieSlime.Slimefun.api.SlimefunItemStack;
-import org.bukkit.ChatColor;
-import org.bukkit.configuration.ConfigurationSection;
-import org.bukkit.enchantments.Enchantment;
-import org.bukkit.inventory.meta.ItemMeta;
-
-import javax.annotation.Nonnull;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.logging.Level;
 
 /**
  * Sets up items

diff --git a/src/main/java/io/github/mooy1/infinityexpansion/categories/Categories.java b/src/main/java/io/github/mooy1/infinityexpansion/categories/Categories.java
@@ -1,11 +1,12 @@
 package io.github.mooy1.infinityexpansion.categories;
 
+import org.bukkit.Material;
+
 import io.github.mooy1.infinityexpansion.InfinityExpansion;
 import io.github.mooy1.infinitylib.slimefun.utils.MultiCategory;
 import io.github.mooy1.infinitylib.slimefun.utils.SubCategory;
 import me.mrCookieSlime.Slimefun.Objects.Category;
 import me.mrCookieSlime.Slimefun.cscorelib2.item.CustomItem;
-import org.bukkit.Material;
 
 /**
  * Categories for this addon

diff --git a/src/main/java/io/github/mooy1/infinityexpansion/categories/InfinityCategory.java b/src/main/java/io/github/mooy1/infinityexpansion/categories/InfinityCategory.java
@@ -1,5 +1,25 @@
 package io.github.mooy1.infinityexpansion.categories;
 
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.Map;
+import java.util.Objects;
+import java.util.UUID;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+import javax.annotation.ParametersAreNonnullByDefault;
+
+import lombok.AllArgsConstructor;
+
+import org.bukkit.ChatColor;
+import org.bukkit.Material;
+import org.bukkit.NamespacedKey;
+import org.bukkit.Sound;
+import org.bukkit.entity.Player;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.PlayerInventory;
+
 import io.github.mooy1.infinityexpansion.InfinityExpansion;
 import io.github.mooy1.infinityexpansion.implementation.blocks.InfinityWorkbench;
 import io.github.mooy1.infinitylib.items.StackUtils;
@@ -12,30 +32,13 @@
 import io.github.thebusybiscuit.slimefun4.core.guide.SlimefunGuideMode;
 import io.github.thebusybiscuit.slimefun4.implementation.SlimefunPlugin;
 import io.github.thebusybiscuit.slimefun4.utils.ChestMenuUtils;
-import lombok.AllArgsConstructor;
 import me.mrCookieSlime.CSCoreLibPlugin.general.Inventory.ChestMenu;
 import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.SlimefunItem;
 import me.mrCookieSlime.Slimefun.api.SlimefunItemStack;
 import me.mrCookieSlime.Slimefun.api.inventory.BlockMenu;
 import me.mrCookieSlime.Slimefun.cscorelib2.collections.Pair;
 import me.mrCookieSlime.Slimefun.cscorelib2.inventory.ItemUtils;
 import me.mrCookieSlime.Slimefun.cscorelib2.item.CustomItem;
-import org.bukkit.ChatColor;
-import org.bukkit.Material;
-import org.bukkit.NamespacedKey;
-import org.bukkit.Sound;
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.ItemStack;
-import org.bukkit.inventory.PlayerInventory;
-
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-import javax.annotation.ParametersAreNonnullByDefault;
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.Map;
-import java.util.Objects;
-import java.util.UUID;
 
 /**
  * A custom category for displaying 6x6 recipes and their sub-recipes

diff --git a/src/main/java/io/github/mooy1/infinityexpansion/commands/GiveRecipe.java b/src/main/java/io/github/mooy1/infinityexpansion/commands/GiveRecipe.java
@@ -1,18 +1,20 @@
 package io.github.mooy1.infinityexpansion.commands;
 
-import io.github.mooy1.infinitylib.commands.AbstractCommand;
-import io.github.thebusybiscuit.slimefun4.core.multiblocks.MultiBlockMachine;
-import io.github.thebusybiscuit.slimefun4.implementation.SlimefunPlugin;
-import me.mrCookieSlime.Slimefun.Lists.RecipeType;
-import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.SlimefunItem;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.annotation.Nonnull;
+
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 
-import javax.annotation.Nonnull;
-import java.util.ArrayList;
-import java.util.List;
+import io.github.mooy1.infinitylib.commands.AbstractCommand;
+import io.github.thebusybiscuit.slimefun4.core.multiblocks.MultiBlockMachine;
+import io.github.thebusybiscuit.slimefun4.implementation.SlimefunPlugin;
+import me.mrCookieSlime.Slimefun.Lists.RecipeType;
+import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.SlimefunItem;
 
 public final class GiveRecipe extends AbstractCommand {
 
@@ -55,12 +57,8 @@ public void onExecute(@Nonnull CommandSender sender, @Nonnull String[] args) {
     @Override
     public void onTab(@Nonnull CommandSender sender, @Nonnull String[] args, @Nonnull List<String> tabs) {
         if (args.length == 2) {
-            int i = 0;
             for (SlimefunItem item : SlimefunPlugin.getRegistry().getEnabledSlimefunItems()) {
                 tabs.add(item.getId());
-                if (i++ == 64) {
-                    break;
-                }
             } 
         }
     }

diff --git a/src/main/java/io/github/mooy1/infinityexpansion/commands/PrintItem.java b/src/main/java/io/github/mooy1/infinityexpansion/commands/PrintItem.java
@@ -1,14 +1,16 @@
 package io.github.mooy1.infinityexpansion.commands;
 
-import io.github.mooy1.infinitylib.commands.AbstractCommand;
+import java.util.List;
+
+import javax.annotation.Nonnull;
+
 import org.bukkit.ChatColor;
 import org.bukkit.Material;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 
-import javax.annotation.Nonnull;
-import java.util.List;
+import io.github.mooy1.infinitylib.commands.AbstractCommand;
 
 public final class PrintItem extends AbstractCommand {
 

diff --git a/src/main/java/io/github/mooy1/infinityexpansion/commands/SetData.java b/src/main/java/io/github/mooy1/infinityexpansion/commands/SetData.java
@@ -1,16 +1,18 @@
 package io.github.mooy1.infinityexpansion.commands;
 
-import io.github.mooy1.infinitylib.commands.AbstractCommand;
-import me.mrCookieSlime.Slimefun.api.BlockStorage;
+import java.util.List;
+
+import javax.annotation.Nonnull;
+
 import org.bukkit.ChatColor;
 import org.bukkit.FluidCollisionMode;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import javax.annotation.Nonnull;
-import java.util.List;
+import io.github.mooy1.infinitylib.commands.AbstractCommand;
+import me.mrCookieSlime.Slimefun.api.BlockStorage;
 
 public final class SetData extends AbstractCommand {
 

diff --git a/src/main/java/io/github/mooy1/infinityexpansion/implementation/SlimefunExtension.java b/src/main/java/io/github/mooy1/infinityexpansion/implementation/SlimefunExtension.java
@@ -1,5 +1,20 @@
 package io.github.mooy1.infinityexpansion.implementation;
 
+import javax.annotation.Nonnull;
+
+import lombok.experimental.UtilityClass;
+
+import org.bukkit.Location;
+import org.bukkit.Material;
+import org.bukkit.World;
+import org.bukkit.block.Block;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.LivingEntity;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.potion.PotionEffect;
+import org.bukkit.potion.PotionEffectType;
+import org.bukkit.util.RayTraceResult;
+
 import io.github.mooy1.infinityexpansion.InfinityExpansion;
 import io.github.mooy1.infinityexpansion.categories.Categories;
 import io.github.mooy1.infinityexpansion.implementation.blocks.InfinityWorkbench;
@@ -14,23 +29,10 @@
 import io.github.thebusybiscuit.slimefun4.implementation.items.electric.reactors.NetherStarReactor;
 import io.github.thebusybiscuit.slimefun4.implementation.items.geo.GEOMiner;
 import io.github.thebusybiscuit.slimefun4.utils.HeadTexture;
-import lombok.experimental.UtilityClass;
 import me.mrCookieSlime.Slimefun.Lists.RecipeType;
 import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.abstractItems.MachineFuel;
 import me.mrCookieSlime.Slimefun.api.BlockStorage;
 import me.mrCookieSlime.Slimefun.api.SlimefunItemStack;
-import org.bukkit.Location;
-import org.bukkit.Material;
-import org.bukkit.World;
-import org.bukkit.block.Block;
-import org.bukkit.entity.Entity;
-import org.bukkit.entity.LivingEntity;
-import org.bukkit.inventory.ItemStack;
-import org.bukkit.potion.PotionEffect;
-import org.bukkit.potion.PotionEffectType;
-import org.bukkit.util.RayTraceResult;
-
-import javax.annotation.Nonnull;
 
 @UtilityClass
 public final class SlimefunExtension {

diff --git a/...main/java/io/github/mooy1/infinityexpansion/implementation/abstracts/AbstractCrafter.java b/...main/java/io/github/mooy1/infinityexpansion/implementation/abstracts/AbstractCrafter.java
@@ -1,13 +1,21 @@
 package io.github.mooy1.infinityexpansion.implementation.abstracts;
 
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
+import org.bukkit.ChatColor;
+import org.bukkit.Location;
+import org.bukkit.block.Block;
+import org.bukkit.entity.Player;
+import org.bukkit.event.block.BlockBreakEvent;
+import org.bukkit.inventory.ItemStack;
+
 import io.github.mooy1.infinityexpansion.utils.Util;
 import io.github.mooy1.infinitylib.slimefun.abstracts.TickingContainer;
 import io.github.mooy1.infinitylib.slimefun.presets.MenuPreset;
-import io.github.mooy1.infinitylib.slimefun.recipes.AdvancedRecipeMap;
 import io.github.mooy1.infinitylib.slimefun.recipes.RecipeMap;
 import io.github.mooy1.infinitylib.slimefun.recipes.inputs.StrictMultiInput;
 import io.github.mooy1.infinitylib.slimefun.recipes.outputs.StrictMultiOutput;
-import io.github.mooy1.infinitylib.slimefun.utils.DelayedRecipeType;
 import io.github.thebusybiscuit.slimefun4.utils.ChestMenuUtils;
 import me.mrCookieSlime.CSCoreLibPlugin.Configuration.Config;
 import me.mrCookieSlime.Slimefun.Lists.RecipeType;
@@ -19,15 +27,6 @@
 import me.mrCookieSlime.Slimefun.api.item_transport.ItemTransportFlow;
 import me.mrCookieSlime.Slimefun.cscorelib2.collections.Pair;
 import me.mrCookieSlime.Slimefun.cscorelib2.inventory.ItemUtils;
-import org.bukkit.ChatColor;
-import org.bukkit.Location;
-import org.bukkit.block.Block;
-import org.bukkit.entity.Player;
-import org.bukkit.event.block.BlockBreakEvent;
-import org.bukkit.inventory.ItemStack;
-
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
 
 /**
  * An abstract crafter
@@ -43,11 +42,12 @@ public abstract class AbstractCrafter extends TickingContainer {
     private static final int[] STATUS_BORDER = {14, 32};
     private static final int STATUS_SLOT = 23;
 
-    private final RecipeMap<StrictMultiInput, StrictMultiOutput> recipes = new AdvancedRecipeMap<>();
+    private final RecipeMap<StrictMultiInput, StrictMultiOutput> recipes;
 
-    public AbstractCrafter(Category category, SlimefunItemStack stack, DelayedRecipeType recipeType, RecipeType type, ItemStack[] recipe) {
+    public AbstractCrafter(Category category, SlimefunItemStack stack,
+                           RecipeMap<StrictMultiInput, StrictMultiOutput> recipes, RecipeType type, ItemStack[] recipe) {
         super(category, stack, type, recipe);
-        recipeType.accept((stacks, itemStack) -> this.recipes.put(new StrictMultiInput(stacks), new StrictMultiOutput(itemStack)));
+        this.recipes = recipes;
     }
 
     @Override