Merge pull request #9 from Sefiraat/fix/performance_issues

Performance tweaks
Sefiraat · Jul 17, 2023 · c61222f · c61222f
2 parents 3239b7a + aa302c2
commit c61222f
Show file tree

Hide file tree

Showing 29 changed files with 257 additions and 199 deletions.
diff --git a/dependency-reduced-pom.xml b/dependency-reduced-pom.xml
@@ -37,7 +37,7 @@
               <shadedPattern>io.github.sefiraat.emctech.bstats</shadedPattern>
             </relocation>
             <relocation>
-              <pattern>io.github.sefiraat.sefilib</pattern>
+              <pattern>dev.sefiraat.sefilib</pattern>
               <shadedPattern>io.github.sefiraat.emctech.sefilib</shadedPattern>
             </relocation>
             <relocation>
@@ -78,11 +78,6 @@
       <id>jitpack.io</id>
       <url>https://jitpack.io</url>
     </repository>
-    <repository>
-      <id>sefi-central</id>
-      <name>Sefiraat</name>
-      <url>https://sefiraat.jfrog.io/artifactory/default-maven-local</url>
-    </repository>
     <repository>
       <id>aikar</id>
       <url>https://repo.aikar.co/content/groups/aikar/</url>

diff --git a/pom.xml b/pom.xml
@@ -22,7 +22,7 @@
                             <shadedPattern>io.github.sefiraat.emctech.bstats</shadedPattern>
                         </relocation>
                         <relocation>
-                            <pattern>io.github.sefiraat.sefilib</pattern>
+                            <pattern>dev.sefiraat.sefilib</pattern>
                             <shadedPattern>io.github.sefiraat.emctech.sefilib</shadedPattern>
                         </relocation>
                         <relocation>
@@ -105,11 +105,6 @@
             <id>jitpack.io</id>
             <url>https://jitpack.io</url>
         </repository>
-        <repository>
-            <id>sefi-central</id>
-            <name>Sefiraat</name>
-            <url>https://sefiraat.jfrog.io/artifactory/default-maven-local</url>
-        </repository>
         <repository>
             <id>aikar</id>
             <url>https://repo.aikar.co/content/groups/aikar/</url>
@@ -148,9 +143,9 @@
             <version>3.0.1u2</version>
         </dependency>
         <dependency>
-            <groupId>io.github.sefiraat</groupId>
+            <groupId>dev.sefiraat</groupId>
             <artifactId>SefiLib</artifactId>
-            <version>0.1.0</version>
+            <version>0.2.6</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
@@ -167,9 +162,9 @@
 
         <!-- Supported Plugins -->
         <dependency>
-            <groupId>io.github.sefiraat</groupId>
+            <groupId>dev.sefiraat</groupId>
             <artifactId>networks</artifactId>
-            <version>MODIFIED_1.0.7</version>
+            <version>1.0.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

diff --git a/src/main/java/io/github/sefiraat/emctech/EmcTech.java b/src/main/java/io/github/sefiraat/emctech/EmcTech.java
@@ -1,7 +1,15 @@
 package io.github.sefiraat.emctech;
 
 
-import co.aikar.commands.PaperCommandManager;
+import java.text.MessageFormat;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
+import org.bstats.bukkit.Metrics;
+import org.bukkit.plugin.PluginManager;
+import org.bukkit.plugin.java.JavaPlugin;
+
 import io.github.sefiraat.emctech.commands.EmcTechMain;
 import io.github.sefiraat.emctech.emc.EmcCalculator;
 import io.github.sefiraat.emctech.managers.ConfigManager;
@@ -11,18 +19,8 @@
 import io.github.sefiraat.emctech.slimefun.items.EmcItems;
 import io.github.thebusybiscuit.slimefun4.api.SlimefunAddon;
 import io.github.thebusybiscuit.slimefun4.libraries.dough.updater.GitHubBuildsUpdater;
-import org.bstats.bukkit.Metrics;
-import org.bstats.charts.AdvancedPie;
-import org.bukkit.Material;
-import org.bukkit.plugin.PluginManager;
-import org.bukkit.plugin.java.JavaPlugin;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-import java.text.MessageFormat;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.UUID;
+import co.aikar.commands.PaperCommandManager;
 
 public class EmcTech extends JavaPlugin implements SlimefunAddon {
     private static EmcTech instance;

diff --git a/src/main/java/io/github/sefiraat/emctech/commands/EmcTechMain.java b/src/main/java/io/github/sefiraat/emctech/commands/EmcTechMain.java
@@ -1,5 +1,13 @@
 package io.github.sefiraat.emctech.commands;
 
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+import io.github.sefiraat.emctech.EmcTech;
+import io.github.sefiraat.emctech.emc.EmcStorage;
+import io.github.sefiraat.emctech.utils.EmcUtils;
+import io.github.sefiraat.emctech.utils.Theme;
+
 import co.aikar.commands.BaseCommand;
 import co.aikar.commands.annotation.CommandAlias;
 import co.aikar.commands.annotation.CommandCompletion;
@@ -8,12 +16,6 @@
 import co.aikar.commands.annotation.Description;
 import co.aikar.commands.annotation.Subcommand;
 import co.aikar.commands.bukkit.contexts.OnlinePlayer;
-import io.github.sefiraat.emctech.EmcTech;
-import io.github.sefiraat.emctech.emc.EmcStorage;
-import io.github.sefiraat.emctech.utils.EmcUtils;
-import io.github.sefiraat.emctech.utils.Theme;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
 
 @CommandAlias("emctech|emc")
 public class EmcTechMain extends BaseCommand {

diff --git a/src/main/java/io/github/sefiraat/emctech/emc/EmcCalculator.java b/src/main/java/io/github/sefiraat/emctech/emc/EmcCalculator.java
@@ -1,10 +1,12 @@
 package io.github.sefiraat.emctech.emc;
 
-import io.github.sefiraat.emctech.EmcTech;
-import io.github.sefiraat.emctech.managers.ConfigManager;
-import io.github.sefiraat.emctech.utils.EmcUtils;
-import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem;
-import io.github.thebusybiscuit.slimefun4.implementation.Slimefun;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Nonnull;
+
 import org.bukkit.Bukkit;
 import org.bukkit.Material;
 import org.bukkit.inventory.CookingRecipe;
@@ -15,11 +17,11 @@
 import org.bukkit.inventory.SmithingRecipe;
 import org.bukkit.inventory.StonecuttingRecipe;
 
-import javax.annotation.Nonnull;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import io.github.sefiraat.emctech.EmcTech;
+import io.github.sefiraat.emctech.managers.ConfigManager;
+import io.github.sefiraat.emctech.utils.EmcUtils;
+import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem;
+import io.github.thebusybiscuit.slimefun4.implementation.Slimefun;
 
 public final class EmcCalculator {
 
@@ -29,6 +31,10 @@ public final class EmcCalculator {
     private static final Map<String, Double> SLIMEFUN_EMC_VALUES = new HashMap<>();
     private static final Map<String, Double> VANILLA_EMC_VALUES_MULTIPLIED = new HashMap<>();
     private static final Map<String, Double> SLIMEFUN_EMC_VALUES_MULTIPLIED = new HashMap<>();
+    private static Map<String, Double> vanillaEmcValuesFiltered;
+    private static Map<String, Double> slimefunEmcValuesFiltered;
+    private static Map<String, Double> vanillaEmcValuesMultipliedFiltered;
+    private static Map<String, Double> slimefunEmcValuesMultipliedFiltered;
 
     private EmcCalculator() {
         throw new IllegalStateException("Utility class");
@@ -37,7 +43,11 @@ private EmcCalculator() {
     public static void setup() {
         addBaseValues();
         setupVanilla();
+        vanillaEmcValuesFiltered = cleanMap(new HashMap<>(VANILLA_EMC_VALUES));
+        vanillaEmcValuesMultipliedFiltered = cleanMap(new HashMap<>(VANILLA_EMC_VALUES_MULTIPLIED));
         setupSlimefun();
+        slimefunEmcValuesFiltered = cleanMap(new HashMap<>(SLIMEFUN_EMC_VALUES));
+        slimefunEmcValuesMultipliedFiltered = cleanMap(new HashMap<>(SLIMEFUN_EMC_VALUES_MULTIPLIED));
     }
 
     private static void addBaseValues() {
@@ -473,19 +483,19 @@ public static Map<String, Double> getMultipliedSlimefunEmcValue() {
     }
 
     public static Map<String, Double> getVanillaEmcValuesFiltered() {
-        return cleanMap(new HashMap<>(VANILLA_EMC_VALUES));
+        return vanillaEmcValuesFiltered;
     }
 
     public static Map<String, Double> getSlimefunEmcValuesFiltered() {
-        return cleanMap(new HashMap<>(SLIMEFUN_EMC_VALUES));
+        return slimefunEmcValuesFiltered;
     }
 
     public static Map<String, Double> getMultipliedVanillaEmcValuesFiltered() {
-        return cleanMap(new HashMap<>(VANILLA_EMC_VALUES_MULTIPLIED));
+        return vanillaEmcValuesMultipliedFiltered;
     }
 
     public static Map<String, Double> getMultipliedSlimefunEmcValuesFiltered() {
-        return cleanMap(new HashMap<>(SLIMEFUN_EMC_VALUES_MULTIPLIED));
+        return slimefunEmcValuesMultipliedFiltered;
     }
 
     private static Map<String, Double> cleanMap(Map<String, Double> map) {

diff --git a/src/main/java/io/github/sefiraat/emctech/emc/EmcPlaceholderExpansion.java b/src/main/java/io/github/sefiraat/emctech/emc/EmcPlaceholderExpansion.java
@@ -1,11 +1,13 @@
 package io.github.sefiraat.emctech.emc;
 
-import io.github.sefiraat.emctech.utils.EmcUtils;
-import me.clip.placeholderapi.expansion.PlaceholderExpansion;
 import org.bukkit.OfflinePlayer;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import io.github.sefiraat.emctech.utils.EmcUtils;
+
+import me.clip.placeholderapi.expansion.PlaceholderExpansion;
+
 public class EmcPlaceholderExpansion extends PlaceholderExpansion {
     @Override
     public @NotNull String getIdentifier() {

diff --git a/src/main/java/io/github/sefiraat/emctech/emc/EmcStorage.java b/src/main/java/io/github/sefiraat/emctech/emc/EmcStorage.java
@@ -1,14 +1,16 @@
 package io.github.sefiraat.emctech.emc;
 
-import io.github.sefiraat.emctech.managers.ConfigManager;
-import org.bukkit.entity.Player;
-
-import javax.annotation.Nonnull;
-import javax.annotation.ParametersAreNonnullByDefault;
 import java.text.MessageFormat;
 import java.util.Map;
 import java.util.UUID;
 
+import javax.annotation.Nonnull;
+import javax.annotation.ParametersAreNonnullByDefault;
+
+import org.bukkit.entity.Player;
+
+import io.github.sefiraat.emctech.managers.ConfigManager;
+
 public final class EmcStorage {
 
     private EmcStorage() {

diff --git a/src/main/java/io/github/sefiraat/emctech/managers/ConfigManager.java b/src/main/java/io/github/sefiraat/emctech/managers/ConfigManager.java
@@ -1,13 +1,5 @@
 package io.github.sefiraat.emctech.managers;
 
-import de.leonhard.storage.Json;
-import io.github.sefiraat.emctech.EmcTech;
-import org.bukkit.configuration.ConfigurationSection;
-import org.bukkit.configuration.InvalidConfigurationException;
-import org.bukkit.configuration.file.FileConfiguration;
-import org.bukkit.configuration.file.YamlConfiguration;
-
-import javax.annotation.Nonnull;
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.IOException;
@@ -19,6 +11,17 @@
 import java.util.List;
 import java.util.Map;
 
+import javax.annotation.Nonnull;
+
+import org.bukkit.configuration.ConfigurationSection;
+import org.bukkit.configuration.InvalidConfigurationException;
+import org.bukkit.configuration.file.FileConfiguration;
+import org.bukkit.configuration.file.YamlConfiguration;
+
+import io.github.sefiraat.emctech.EmcTech;
+
+import de.leonhard.storage.Json;
+
 public class ConfigManager {
 
     private static ConfigManager instance;

diff --git a/src/main/java/io/github/sefiraat/emctech/managers/ListenerManager.java b/src/main/java/io/github/sefiraat/emctech/managers/ListenerManager.java
@@ -1,8 +1,9 @@
 package io.github.sefiraat.emctech.managers;
 
-import io.github.sefiraat.emctech.EmcTech;
 import org.bukkit.event.Listener;
 
+import io.github.sefiraat.emctech.EmcTech;
+
 public class ListenerManager {
 
     public ListenerManager() {

diff --git a/src/main/java/io/github/sefiraat/emctech/managers/SupportedPluginManager.java b/src/main/java/io/github/sefiraat/emctech/managers/SupportedPluginManager.java
@@ -1,8 +1,10 @@
 package io.github.sefiraat.emctech.managers;
 
+import org.bukkit.Bukkit;
+
 import com.google.common.base.Preconditions;
+
 import io.github.sefiraat.emctech.emc.EmcPlaceholderExpansion;
-import org.bukkit.Bukkit;
 
 public class SupportedPluginManager {
 

diff --git a/src/main/java/io/github/sefiraat/emctech/runnables/SaveConfigRunnable.java b/src/main/java/io/github/sefiraat/emctech/runnables/SaveConfigRunnable.java
@@ -1,8 +1,9 @@
 package io.github.sefiraat.emctech.runnables;
 
-import io.github.sefiraat.emctech.managers.ConfigManager;
 import org.bukkit.scheduler.BukkitRunnable;
 
+import io.github.sefiraat.emctech.managers.ConfigManager;
+
 public class SaveConfigRunnable extends BukkitRunnable {
 
     @Override

diff --git a/src/main/java/io/github/sefiraat/emctech/slimefun/blocks/Dematerializer.java b/src/main/java/io/github/sefiraat/emctech/slimefun/blocks/Dematerializer.java
@@ -1,5 +1,13 @@
 package io.github.sefiraat.emctech.slimefun.blocks;
 
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
+import org.bukkit.Material;
+import org.bukkit.block.Block;
+import org.bukkit.entity.Player;
+import org.bukkit.inventory.ItemStack;
+
 import io.github.sefiraat.emctech.emc.EmcStorage;
 import io.github.sefiraat.emctech.slimefun.types.OwnedBlockMenuPreset;
 import io.github.sefiraat.emctech.slimefun.types.OwnedVariableTickRateItem;
@@ -15,16 +23,10 @@
 import io.github.thebusybiscuit.slimefun4.libraries.dough.protection.Interaction;
 import io.github.thebusybiscuit.slimefun4.utils.ChestMenuUtils;
 import io.github.thebusybiscuit.slimefun4.utils.SlimefunUtils;
+
 import me.mrCookieSlime.CSCoreLibPlugin.Configuration.Config;
 import me.mrCookieSlime.Slimefun.api.inventory.BlockMenu;
 import me.mrCookieSlime.Slimefun.api.item_transport.ItemTransportFlow;
-import org.bukkit.Material;
-import org.bukkit.block.Block;
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.ItemStack;
-
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
 
 public class Dematerializer extends OwnedVariableTickRateItem implements EnergyNetComponent {
 
@@ -177,10 +179,12 @@ private void setWorking(@Nonnull BlockMenu blockMenu,
                             int requiredPower,
                             int currentPower
     ) {
-        blockMenu.replaceExistingItem(
-            INFO_SLOT,
-            GuiElements.getWorkingOnIcon(name, emcValue, requiredPower, currentPower)
-        );
+        if (blockMenu.hasViewer()) {
+            blockMenu.replaceExistingItem(
+                INFO_SLOT,
+                GuiElements.getWorkingOnIcon(name, emcValue, requiredPower, currentPower)
+            );
+        }
     }
 
     private void reject(@Nonnull BlockMenu blockMenu, @Nonnull ItemStack itemStack) {