Skip to content

Commit 2bc3b2c

Browse files
committed
Use Registry instead of Enums
1 parent 736114b commit 2bc3b2c

3 files changed

Lines changed: 6 additions & 11 deletions

File tree

src/main/java/com/wasteofplastic/invswitcher/InvSwitcher.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,12 @@
11
package com.wasteofplastic.invswitcher;
22

33

4-
import java.util.Arrays;
54
import java.util.HashSet;
6-
import java.util.List;
75
import java.util.Objects;
86
import java.util.Set;
97
import java.util.stream.Collectors;
108

119
import org.bukkit.Bukkit;
12-
import org.bukkit.Material;
1310
import org.bukkit.World;
1411

1512
import com.wasteofplastic.invswitcher.listeners.PlayerListener;
@@ -26,9 +23,6 @@
2623
*/
2724
public class InvSwitcher extends Addon {
2825

29-
protected static final List<Material> MAT = Arrays.stream(Material.values())
30-
.filter(m -> !m.name().startsWith("LEGACY")).toList();
31-
3226
private Store store;
3327

3428
private Settings settings;

src/main/java/com/wasteofplastic/invswitcher/Store.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636

3737
import org.bukkit.Bukkit;
3838
import org.bukkit.Material;
39+
import org.bukkit.Registry;
3940
import org.bukkit.Statistic;
4041
import org.bukkit.World;
4142
import org.bukkit.advancement.Advancement;
@@ -275,26 +276,26 @@ private CompletableFuture<InventoryStorage> saveStats(InventoryStorage store, Pl
275276

276277
private void saveStatistics(CompletableFuture<InventoryStorage> result, InventoryStorage store, Player player,
277278
String worldName) {
278-
Arrays.stream(Statistic.values()).forEach(s -> {
279+
Registry.STATISTIC.forEach(s -> {
279280
Map<Material, Integer> map;
280281
Map<EntityType, Integer> entMap;
281282
switch (s.getType()) {
282283
case BLOCK -> {
283-
map = InvSwitcher.MAT.stream().filter(Material::isBlock).filter(m -> player.getStatistic(s, m) > 0)
284+
map = Registry.MATERIAL.stream().filter(Material::isBlock).filter(m -> player.getStatistic(s, m) > 0)
284285
.collect(Collectors.toMap(k -> k, v -> player.getStatistic(s, v)));
285286
if (!map.isEmpty()) {
286287
store.getBlockStats(worldName).put(s, map);
287288
}
288289
}
289290
case ITEM -> {
290-
map = InvSwitcher.MAT.stream().filter(Material::isItem).filter(m -> player.getStatistic(s, m) > 0)
291+
map = Registry.MATERIAL.stream().filter(Material::isItem).filter(m -> player.getStatistic(s, m) > 0)
291292
.collect(Collectors.toMap(k -> k, v -> player.getStatistic(s, v)));
292293
if (!map.isEmpty()) {
293294
store.getItemStats(worldName).put(s, map);
294295
}
295296
}
296297
case ENTITY -> {
297-
entMap = Arrays.stream(EntityType.values()).filter(EntityType::isAlive)
298+
entMap = Registry.ENTITY_TYPE.stream().filter(EntityType::isAlive)
298299
.filter(m -> player.getStatistic(s, m) > 0)
299300
.collect(Collectors.toMap(k -> k, v -> player.getStatistic(s, v)));
300301
if (!entMap.isEmpty()) {

src/main/resources/addon.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: InvSwitcher
22
main: com.wasteofplastic.invswitcher.InvSwitcher
33
version: ${version}${build.number}
4-
api-version: 2.7.1
4+
api-version: 3.0.0
55

66
authors: tastybento
77

0 commit comments

Comments
 (0)