Skip to content

Commit c61222f

Browse files
SefiraatSefiraat
authored
Merge pull request Sefiraat#9 from Sefiraat/fix/performance_issues
Performance tweaks
2 parents 3239b7a + aa302c2 commit c61222f

29 files changed

Lines changed: 257 additions & 199 deletions

‎dependency-reduced-pom.xml‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
<shadedPattern>io.github.sefiraat.emctech.bstats</shadedPattern>
3838
</relocation>
3939
<relocation>
40-
<pattern>io.github.sefiraat.sefilib</pattern>
40+
<pattern>dev.sefiraat.sefilib</pattern>
4141
<shadedPattern>io.github.sefiraat.emctech.sefilib</shadedPattern>
4242
</relocation>
4343
<relocation>
@@ -78,11 +78,6 @@
7878
<id>jitpack.io</id>
7979
<url>https://jitpack.io</url>
8080
</repository>
81-
<repository>
82-
<id>sefi-central</id>
83-
<name>Sefiraat</name>
84-
<url>https://sefiraat.jfrog.io/artifactory/default-maven-local</url>
85-
</repository>
8681
<repository>
8782
<id>aikar</id>
8883
<url>https://repo.aikar.co/content/groups/aikar/</url>

‎pom.xml‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<shadedPattern>io.github.sefiraat.emctech.bstats</shadedPattern>
2323
</relocation>
2424
<relocation>
25-
<pattern>io.github.sefiraat.sefilib</pattern>
25+
<pattern>dev.sefiraat.sefilib</pattern>
2626
<shadedPattern>io.github.sefiraat.emctech.sefilib</shadedPattern>
2727
</relocation>
2828
<relocation>
@@ -105,11 +105,6 @@
105105
<id>jitpack.io</id>
106106
<url>https://jitpack.io</url>
107107
</repository>
108-
<repository>
109-
<id>sefi-central</id>
110-
<name>Sefiraat</name>
111-
<url>https://sefiraat.jfrog.io/artifactory/default-maven-local</url>
112-
</repository>
113108
<repository>
114109
<id>aikar</id>
115110
<url>https://repo.aikar.co/content/groups/aikar/</url>
@@ -148,9 +143,9 @@
148143
<version>3.0.1u2</version>
149144
</dependency>
150145
<dependency>
151-
<groupId>io.github.sefiraat</groupId>
146+
<groupId>dev.sefiraat</groupId>
152147
<artifactId>SefiLib</artifactId>
153-
<version>0.1.0</version>
148+
<version>0.2.6</version>
154149
<scope>compile</scope>
155150
</dependency>
156151
<dependency>
@@ -167,9 +162,9 @@
167162

168163
<!-- Supported Plugins -->
169164
<dependency>
170-
<groupId>io.github.sefiraat</groupId>
165+
<groupId>dev.sefiraat</groupId>
171166
<artifactId>networks</artifactId>
172-
<version>MODIFIED_1.0.7</version>
167+
<version>1.0.0</version>
173168
<scope>provided</scope>
174169
</dependency>
175170
<dependency>

‎src/main/java/io/github/sefiraat/emctech/EmcTech.java‎

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,15 @@
11
package io.github.sefiraat.emctech;
22

33

4-
import co.aikar.commands.PaperCommandManager;
4+
import java.text.MessageFormat;
5+
6+
import javax.annotation.Nonnull;
7+
import javax.annotation.Nullable;
8+
9+
import org.bstats.bukkit.Metrics;
10+
import org.bukkit.plugin.PluginManager;
11+
import org.bukkit.plugin.java.JavaPlugin;
12+
513
import io.github.sefiraat.emctech.commands.EmcTechMain;
614
import io.github.sefiraat.emctech.emc.EmcCalculator;
715
import io.github.sefiraat.emctech.managers.ConfigManager;
@@ -11,18 +19,8 @@
1119
import io.github.sefiraat.emctech.slimefun.items.EmcItems;
1220
import io.github.thebusybiscuit.slimefun4.api.SlimefunAddon;
1321
import io.github.thebusybiscuit.slimefun4.libraries.dough.updater.GitHubBuildsUpdater;
14-
import org.bstats.bukkit.Metrics;
15-
import org.bstats.charts.AdvancedPie;
16-
import org.bukkit.Material;
17-
import org.bukkit.plugin.PluginManager;
18-
import org.bukkit.plugin.java.JavaPlugin;
1922

20-
import javax.annotation.Nonnull;
21-
import javax.annotation.Nullable;
22-
import java.text.MessageFormat;
23-
import java.util.HashMap;
24-
import java.util.Map;
25-
import java.util.UUID;
23+
import co.aikar.commands.PaperCommandManager;
2624

2725
public class EmcTech extends JavaPlugin implements SlimefunAddon {
2826
private static EmcTech instance;

‎src/main/java/io/github/sefiraat/emctech/commands/EmcTechMain.java‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
11
package io.github.sefiraat.emctech.commands;
22

3+
import org.bukkit.command.CommandSender;
4+
import org.bukkit.entity.Player;
5+
6+
import io.github.sefiraat.emctech.EmcTech;
7+
import io.github.sefiraat.emctech.emc.EmcStorage;
8+
import io.github.sefiraat.emctech.utils.EmcUtils;
9+
import io.github.sefiraat.emctech.utils.Theme;
10+
311
import co.aikar.commands.BaseCommand;
412
import co.aikar.commands.annotation.CommandAlias;
513
import co.aikar.commands.annotation.CommandCompletion;
@@ -8,12 +16,6 @@
816
import co.aikar.commands.annotation.Description;
917
import co.aikar.commands.annotation.Subcommand;
1018
import co.aikar.commands.bukkit.contexts.OnlinePlayer;
11-
import io.github.sefiraat.emctech.EmcTech;
12-
import io.github.sefiraat.emctech.emc.EmcStorage;
13-
import io.github.sefiraat.emctech.utils.EmcUtils;
14-
import io.github.sefiraat.emctech.utils.Theme;
15-
import org.bukkit.command.CommandSender;
16-
import org.bukkit.entity.Player;
1719

1820
@CommandAlias("emctech|emc")
1921
public class EmcTechMain extends BaseCommand {

‎src/main/java/io/github/sefiraat/emctech/emc/EmcCalculator.java‎

Lines changed: 24 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
package io.github.sefiraat.emctech.emc;
22

3-
import io.github.sefiraat.emctech.EmcTech;
4-
import io.github.sefiraat.emctech.managers.ConfigManager;
5-
import io.github.sefiraat.emctech.utils.EmcUtils;
6-
import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem;
7-
import io.github.thebusybiscuit.slimefun4.implementation.Slimefun;
3+
import java.util.ArrayList;
4+
import java.util.HashMap;
5+
import java.util.List;
6+
import java.util.Map;
7+
8+
import javax.annotation.Nonnull;
9+
810
import org.bukkit.Bukkit;
911
import org.bukkit.Material;
1012
import org.bukkit.inventory.CookingRecipe;
@@ -15,11 +17,11 @@
1517
import org.bukkit.inventory.SmithingRecipe;
1618
import org.bukkit.inventory.StonecuttingRecipe;
1719

18-
import javax.annotation.Nonnull;
19-
import java.util.ArrayList;
20-
import java.util.HashMap;
21-
import java.util.List;
22-
import java.util.Map;
20+
import io.github.sefiraat.emctech.EmcTech;
21+
import io.github.sefiraat.emctech.managers.ConfigManager;
22+
import io.github.sefiraat.emctech.utils.EmcUtils;
23+
import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem;
24+
import io.github.thebusybiscuit.slimefun4.implementation.Slimefun;
2325

2426
public final class EmcCalculator {
2527

@@ -29,6 +31,10 @@ public final class EmcCalculator {
2931
private static final Map<String, Double> SLIMEFUN_EMC_VALUES = new HashMap<>();
3032
private static final Map<String, Double> VANILLA_EMC_VALUES_MULTIPLIED = new HashMap<>();
3133
private static final Map<String, Double> SLIMEFUN_EMC_VALUES_MULTIPLIED = new HashMap<>();
34+
private static Map<String, Double> vanillaEmcValuesFiltered;
35+
private static Map<String, Double> slimefunEmcValuesFiltered;
36+
private static Map<String, Double> vanillaEmcValuesMultipliedFiltered;
37+
private static Map<String, Double> slimefunEmcValuesMultipliedFiltered;
3238

3339
private EmcCalculator() {
3440
throw new IllegalStateException("Utility class");
@@ -37,7 +43,11 @@ private EmcCalculator() {
3743
public static void setup() {
3844
addBaseValues();
3945
setupVanilla();
46+
vanillaEmcValuesFiltered = cleanMap(new HashMap<>(VANILLA_EMC_VALUES));
47+
vanillaEmcValuesMultipliedFiltered = cleanMap(new HashMap<>(VANILLA_EMC_VALUES_MULTIPLIED));
4048
setupSlimefun();
49+
slimefunEmcValuesFiltered = cleanMap(new HashMap<>(SLIMEFUN_EMC_VALUES));
50+
slimefunEmcValuesMultipliedFiltered = cleanMap(new HashMap<>(SLIMEFUN_EMC_VALUES_MULTIPLIED));
4151
}
4252

4353
private static void addBaseValues() {
@@ -473,19 +483,19 @@ public static Map<String, Double> getMultipliedSlimefunEmcValue() {
473483
}
474484

475485
public static Map<String, Double> getVanillaEmcValuesFiltered() {
476-
return cleanMap(new HashMap<>(VANILLA_EMC_VALUES));
486+
return vanillaEmcValuesFiltered;
477487
}
478488

479489
public static Map<String, Double> getSlimefunEmcValuesFiltered() {
480-
return cleanMap(new HashMap<>(SLIMEFUN_EMC_VALUES));
490+
return slimefunEmcValuesFiltered;
481491
}
482492

483493
public static Map<String, Double> getMultipliedVanillaEmcValuesFiltered() {
484-
return cleanMap(new HashMap<>(VANILLA_EMC_VALUES_MULTIPLIED));
494+
return vanillaEmcValuesMultipliedFiltered;
485495
}
486496

487497
public static Map<String, Double> getMultipliedSlimefunEmcValuesFiltered() {
488-
return cleanMap(new HashMap<>(SLIMEFUN_EMC_VALUES_MULTIPLIED));
498+
return slimefunEmcValuesMultipliedFiltered;
489499
}
490500

491501
private static Map<String, Double> cleanMap(Map<String, Double> map) {

‎src/main/java/io/github/sefiraat/emctech/emc/EmcPlaceholderExpansion.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
package io.github.sefiraat.emctech.emc;
22

3-
import io.github.sefiraat.emctech.utils.EmcUtils;
4-
import me.clip.placeholderapi.expansion.PlaceholderExpansion;
53
import org.bukkit.OfflinePlayer;
64
import org.jetbrains.annotations.NotNull;
75
import org.jetbrains.annotations.Nullable;
86

7+
import io.github.sefiraat.emctech.utils.EmcUtils;
8+
9+
import me.clip.placeholderapi.expansion.PlaceholderExpansion;
10+
911
public class EmcPlaceholderExpansion extends PlaceholderExpansion {
1012
@Override
1113
public @NotNull String getIdentifier() {

‎src/main/java/io/github/sefiraat/emctech/emc/EmcStorage.java‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
11
package io.github.sefiraat.emctech.emc;
22

3-
import io.github.sefiraat.emctech.managers.ConfigManager;
4-
import org.bukkit.entity.Player;
5-
6-
import javax.annotation.Nonnull;
7-
import javax.annotation.ParametersAreNonnullByDefault;
83
import java.text.MessageFormat;
94
import java.util.Map;
105
import java.util.UUID;
116

7+
import javax.annotation.Nonnull;
8+
import javax.annotation.ParametersAreNonnullByDefault;
9+
10+
import org.bukkit.entity.Player;
11+
12+
import io.github.sefiraat.emctech.managers.ConfigManager;
13+
1214
public final class EmcStorage {
1315

1416
private EmcStorage() {

‎src/main/java/io/github/sefiraat/emctech/managers/ConfigManager.java‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,5 @@
11
package io.github.sefiraat.emctech.managers;
22

3-
import de.leonhard.storage.Json;
4-
import io.github.sefiraat.emctech.EmcTech;
5-
import org.bukkit.configuration.ConfigurationSection;
6-
import org.bukkit.configuration.InvalidConfigurationException;
7-
import org.bukkit.configuration.file.FileConfiguration;
8-
import org.bukkit.configuration.file.YamlConfiguration;
9-
10-
import javax.annotation.Nonnull;
113
import java.io.BufferedReader;
124
import java.io.File;
135
import java.io.IOException;
@@ -19,6 +11,17 @@
1911
import java.util.List;
2012
import java.util.Map;
2113

14+
import javax.annotation.Nonnull;
15+
16+
import org.bukkit.configuration.ConfigurationSection;
17+
import org.bukkit.configuration.InvalidConfigurationException;
18+
import org.bukkit.configuration.file.FileConfiguration;
19+
import org.bukkit.configuration.file.YamlConfiguration;
20+
21+
import io.github.sefiraat.emctech.EmcTech;
22+
23+
import de.leonhard.storage.Json;
24+
2225
public class ConfigManager {
2326

2427
private static ConfigManager instance;

‎src/main/java/io/github/sefiraat/emctech/managers/ListenerManager.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
package io.github.sefiraat.emctech.managers;
22

3-
import io.github.sefiraat.emctech.EmcTech;
43
import org.bukkit.event.Listener;
54

5+
import io.github.sefiraat.emctech.EmcTech;
6+
67
public class ListenerManager {
78

89
public ListenerManager() {

‎src/main/java/io/github/sefiraat/emctech/managers/SupportedPluginManager.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
package io.github.sefiraat.emctech.managers;
22

3+
import org.bukkit.Bukkit;
4+
35
import com.google.common.base.Preconditions;
6+
47
import io.github.sefiraat.emctech.emc.EmcPlaceholderExpansion;
5-
import org.bukkit.Bukkit;
68

79
public class SupportedPluginManager {
810

0 commit comments

Comments
 (0)