Skip to content

Commit d0bb965

Browse files
MichealAPIMichealAPI
committed
Now using latest version of all dependencies, Spigot and PaperMC excluded for version reasons. Adapted inventories usage to the latest LabCommons version
1 parent a17c18a commit d0bb965

10 files changed

Lines changed: 72 additions & 40 deletions

File tree

‎pom.xml‎

Lines changed: 38 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>it.mikeslab</groupId>
88
<artifactId>Identity</artifactId>
9-
<version>2.0.4.3</version>
9+
<version>2.0.4.4</version>
1010
<packaging>jar</packaging>
1111

1212
<name>Identity</name>
@@ -48,6 +48,7 @@
4848
<goal>shade</goal>
4949
</goals>
5050
<configuration>
51+
5152
<shadedArtifactAttached>true</shadedArtifactAttached>
5253
<relocations>
5354
<relocation>
@@ -59,9 +60,33 @@
5960
<pattern>net.wesjd.anvilgui</pattern>
6061
<shadedPattern>it.mikeslab.identity.api.anvilgui</shadedPattern>
6162
</relocation>
63+
64+
<relocation>
65+
<pattern>com.cryptomorin.xseries</pattern>
66+
<shadedPattern>it.mikeslab.identity.api.various.util</shadedPattern>
67+
</relocation>
6268
</relocations>
6369

6470
<outputDirectory>target/shaded</outputDirectory>
71+
72+
<filters>
73+
<filter>
74+
<artifact>*:*</artifact>
75+
<excludes>
76+
<exclude>com/cryptomorin/xseries/XBiome*</exclude>
77+
<exclude>com/cryptomorin/xseries/NMSExtras*</exclude>
78+
<exclude>com/cryptomorin/xseries/NoteBlockMusic*</exclude>
79+
<exclude>com/cryptomorin/xseries/SkullCacheListener*</exclude>
80+
<exclude>com/cryptomorin/xseries/XTag*</exclude>
81+
<exclude>com/cryptomorin/xseries/XWorldBorder*</exclude>
82+
<exclude>com/cryptomorin/xseries/XEnchantment*</exclude>
83+
<exclude>com/cryptomorin/xseries/XBlock*</exclude>
84+
<exclude>com/cryptomorin/xseries/XParticle*</exclude>
85+
<exclude>com/cryptomorin/xseries/XEntity*</exclude>
86+
<exclude>net/kyori/**</exclude>
87+
</excludes>
88+
</filter>
89+
</filters>
6590
</configuration>
6691
</execution>
6792
</executions>
@@ -156,20 +181,21 @@
156181
<dependency>
157182
<groupId>it.mikeslab</groupId>
158183
<artifactId>LabCommons</artifactId>
159-
<version>2.4.1.3.7</version>
184+
<version>2.4.1.4.4</version>
185+
<scope>provided</scope>
160186
</dependency>
161187

162188
<dependency>
163189
<groupId>org.projectlombok</groupId>
164190
<artifactId>lombok</artifactId>
165-
<version>1.18.32</version>
191+
<version>1.18.36</version>
166192
<scope>provided</scope>
167193
</dependency>
168194

169195
<dependency>
170196
<groupId>net.wesjd</groupId>
171197
<artifactId>anvilgui</artifactId>
172-
<version>1.9.6-SNAPSHOT</version>
198+
<version>1.10.4-SNAPSHOT</version>
173199
</dependency>
174200

175201
<dependency>
@@ -200,7 +226,14 @@
200226
<dependency>
201227
<groupId>net.kyori</groupId>
202228
<artifactId>adventure-api</artifactId>
203-
<version>4.17.0</version>
229+
<version>4.19.0</version>
230+
</dependency>
231+
232+
<dependency>
233+
<groupId>com.github.cryptomorin</groupId>
234+
<artifactId>XSeries</artifactId>
235+
<version>13.0.0</version>
236+
<scope>compile</scope>
204237
</dependency>
205238

206239
<dependency>

‎src/main/java/it/mikeslab/identity/IdentityPlugin.java‎

Lines changed: 21 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -97,13 +97,13 @@ public void onEnable() {
9797

9898
this.audiences = BukkitAudiences.create(this);
9999

100-
this.messageHelper = new MessageHelperImpl(audiences);
100+
this.messageHelper = new MessageHelperImpl();
101101

102102
this.initConfig();
103103

104104
this.setMongoLoggingToInfo();
105105

106-
FormatUtil.printStartupInfos(this, audiences, "9C00FF");
106+
FormatUtil.printStartupInfos(this, "9C00FF");
107107

108108
this.initInventories();
109109

@@ -232,25 +232,27 @@ private CompletableFuture<Boolean> initDatabase() {
232232
private void initConfig() {
233233

234234
// default config
235-
File configFile = new File(getDataFolder(), "config.yml");
236-
237-
File languageConfigFile = new File(getDataFolder(), "language.yml");
238-
239-
File antiSpamConfigFile = new File(getDataFolder(), "antispam.yml");
240-
241-
save(languageConfigFile.getName(), false);
242-
save(configFile.getName(), false);
243-
save(antiSpamConfigFile.getName(), false);
244-
245-
this.language = LabCommons.registerConfigurable(LanguageKey.class)
246-
.loadConfiguration(languageConfigFile);
235+
String languageConfigFileName = "language.yml";
236+
String configFileName = "config.yml";
237+
String antiSpamConfigFileName = "antispam.yml";
238+
239+
save(languageConfigFileName, false);
240+
save(configFileName, false);
241+
save(antiSpamConfigFileName, false);
242+
243+
this.language = LabCommons.registerConfigurable(
244+
this.getDataFolder(),
245+
languageConfigFileName,
246+
LanguageKey.class
247+
);
247248

248-
this.customConfig = LabCommons.registerConfigurable(ConfigKey.class)
249-
.loadConfiguration(configFile);
249+
this.customConfig = LabCommons.registerConfigurable(
250+
this.getDataFolder(),
251+
configFileName,
252+
ConfigKey.class
253+
);
250254

251-
this.antiSpamConfig = Configurable
252-
.newInstance()
253-
.loadConfiguration(antiSpamConfigFile);
255+
this.antiSpamConfig = Configurable.newInstance(this.getDataFolder(), antiSpamConfigFileName);
254256

255257
this.checkDebugMode();
256258

‎src/main/java/it/mikeslab/identity/command/IdentityCommand.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public IdentityCommand(final IdentityPlugin instance) {
3535

3636
@Default
3737
public void defaultCommand(CommandSender sender) {
38-
FormatUtil.sendRunningInfos(instance.getAudiences().sender(sender), instance, "9C00FF");
38+
FormatUtil.sendRunningInfos(sender, instance, "9C00FF");
3939
}
4040

4141
@Subcommand("setup")

‎src/main/java/it/mikeslab/identity/event/PlayerListener.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ public void onPlayerQuit(PlayerQuitEvent event) {
6161
// todo evaluate if this is necessary, removing on quit
6262
instance.getGuiConfigRegistrar()
6363
.getPlayerInventories()
64-
.remove(playerUUID);
64+
.destroy(playerUUID);
6565
}
6666

6767
}

‎src/main/java/it/mikeslab/identity/inventory/action/ActionRegistrarImpl.java‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,21 @@
22

33
// import com.cryptomorin.xseries.XSound;
44

5+
import com.cryptomorin.xseries.XPotion;
6+
import com.cryptomorin.xseries.XSound;
57
import com.google.common.collect.ArrayListMultimap;
68
import com.google.common.collect.Multimap;
79
import it.mikeslab.commons.api.component.ComponentsUtil;
810
import it.mikeslab.commons.api.inventory.CustomInventory;
911
import it.mikeslab.commons.api.inventory.pojo.action.GuiAction;
1012
import it.mikeslab.commons.api.inventory.util.action.ActionRegistrar;
11-
import it.mikeslab.commons.api.various.util.XPotion;
12-
import it.mikeslab.commons.api.various.util.XSound;
1313
import it.mikeslab.identity.IdentityPlugin;
1414
import it.mikeslab.identity.util.SetupMap;
1515
import lombok.RequiredArgsConstructor;
1616
import net.kyori.adventure.text.Component;
1717
import org.bukkit.Bukkit;
18-
import org.bukkit.Location;
19-
import org.bukkit.Sound;
2018
import org.bukkit.command.ConsoleCommandSender;
2119
import org.bukkit.entity.Player;
22-
import org.bukkit.potion.PotionEffect;
2320

2421
import java.util.UUID;
2522

‎src/main/java/it/mikeslab/identity/inventory/config/GuiConfigRegistrar.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@ public Set<String> getInventoryKeys() {
262262
*/
263263
public Optional<String> fromCustomGuiId(int id, UUID uuid) {
264264

265-
for(Map.Entry<String, CustomInventory> entry : playerInventories.get(uuid).entrySet()) {
265+
for(Map.Entry<String, CustomInventory> entry : playerInventories.getCachedInventories(uuid).entrySet()) {
266266

267267
if(entry.getValue().getId() == id) {
268268
return Optional.of(entry.getKey());

‎src/main/java/it/mikeslab/identity/inventory/config/condition/ConditionParserImpl.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import java.util.Map;
88
import java.util.function.Supplier;
99

10+
// todo Move to LabCommons
1011
public class ConditionParserImpl implements ConditionParser {
1112

1213
@Override

‎src/main/java/it/mikeslab/identity/preset/PresetsManager.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
import it.mikeslab.commons.api.inventory.util.config.FileUtil;
55
import it.mikeslab.commons.api.logger.LogUtils;
66
import it.mikeslab.commons.api.various.message.MessageHelperImpl;
7-
import it.mikeslab.commons.api.various.util.XPotion;
87
import it.mikeslab.identity.IdentityPlugin;
98
import it.mikeslab.identity.config.ConfigKey;
109
import it.mikeslab.identity.config.lang.LanguageKey;
@@ -128,7 +127,7 @@ public void extractDefaults() {
128127
settingSection.set("extract-defaults", false);
129128

130129
this.saveConfig(
131-
instance.getCustomConfig().getFile(),
130+
instance.getCustomConfig().buildFile(),
132131
instance.getCustomConfig().getConfiguration()
133132
);
134133

‎src/main/java/it/mikeslab/identity/util/SetupMap.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public SetupMap(IdentityPlugin instance) {
3030
* @param uuid The player UUID
3131
*/
3232
public void forceExpiration(UUID uuid) {
33-
for (String keyId : this.get(uuid).keySet()) {
33+
for (String keyId : this.getCachedInventories(uuid).keySet()) {
3434
this.forceExpiration(uuid, keyId);
3535
}
3636
}
@@ -50,7 +50,7 @@ public void load(UUID uuid) {
5050
instance.getGuiConfigRegistrar().getGuis() // Recreates a CustomInventory instance for each player
5151
);
5252

53-
this.put(uuid, inventoryMap);
53+
this.putAll(uuid, inventoryMap);
5454

5555
}
5656

@@ -68,10 +68,10 @@ public CustomInventory getInventory(UUID playerUUID, String inventoryId) {
6868
System.currentTimeMillis()
6969
);
7070

71-
return this.get(playerUUID).get(inventoryId);
71+
return this.getCachedInventories(playerUUID).get(inventoryId);
7272
}
7373

74-
CustomInventory customInventory = this.get(playerUUID).get(inventoryId);
74+
CustomInventory customInventory = this.getCachedInventories(playerUUID).get(inventoryId);
7575
long lastAccess = this.lastAccessMap.get(playerUUID).getOrDefault(inventoryId, -1L);
7676

7777
boolean expired = System.currentTimeMillis() - lastAccess > EXPIRATION_TIME;
@@ -113,7 +113,7 @@ public void setLastAccess(UUID playerUUID, String inventoryId, long value) {
113113

114114

115115
public boolean containsInventory(UUID playerUUID, String arg) {
116-
return this.get(playerUUID).containsKey(arg);
116+
return this.getCachedInventories(playerUUID).containsKey(arg);
117117
}
118118

119119
public void clearInventoryMap() {

‎src/main/resources/plugin.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Identity
22
version: '${project.version}'
33
main: it.mikeslab.identity.IdentityPlugin
44
api-version: '1.16'
5-
depend: [PlaceholderAPI]
5+
depend: [PlaceholderAPI, LabCommons]
66
softdepend:
77
- AuthMe
88

0 commit comments

Comments
 (0)