Skip to content

Commit 913e0a7

Browse files
committed
fix enumclassinfos for biome/attribute type
1 parent 15b0264 commit 913e0a7

File tree

1 file changed

+40
-39
lines changed

1 file changed

+40
-39
lines changed

src/main/java/ch/njol/skript/classes/data/BukkitClasses.java

Lines changed: 40 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -18,18 +18,32 @@
1818
*/
1919
package ch.njol.skript.classes.data;
2020

21-
import java.io.StreamCorruptedException;
22-
import java.util.ArrayList;
23-
import java.util.Arrays;
24-
import java.util.List;
25-
import java.util.Locale;
26-
import java.util.Map.Entry;
27-
import java.util.UUID;
28-
import java.util.regex.Matcher;
29-
import java.util.regex.Pattern;
30-
import java.util.stream.Collectors;
31-
21+
import ch.njol.skript.Skript;
22+
import ch.njol.skript.SkriptConfig;
23+
import ch.njol.skript.aliases.Aliases;
24+
import ch.njol.skript.aliases.ItemType;
3225
import ch.njol.skript.bukkitutil.BukkitUtils;
26+
import ch.njol.skript.bukkitutil.EnchantmentUtils;
27+
import ch.njol.skript.bukkitutil.ItemUtils;
28+
import ch.njol.skript.classes.ClassInfo;
29+
import ch.njol.skript.classes.ConfigurationSerializer;
30+
import ch.njol.skript.classes.EnumClassInfo;
31+
import ch.njol.skript.classes.Parser;
32+
import ch.njol.skript.classes.Serializer;
33+
import ch.njol.skript.classes.registry.RegistryClassInfo;
34+
import ch.njol.skript.entity.EntityData;
35+
import ch.njol.skript.expressions.ExprDamageCause;
36+
import ch.njol.skript.expressions.base.EventValueExpression;
37+
import ch.njol.skript.lang.ParseContext;
38+
import ch.njol.skript.lang.util.SimpleLiteral;
39+
import ch.njol.skript.localization.Language;
40+
import ch.njol.skript.registrations.Classes;
41+
import ch.njol.skript.util.BlockUtils;
42+
import ch.njol.skript.util.PotionEffectUtils;
43+
import ch.njol.skript.util.StringMode;
44+
import ch.njol.util.StringUtils;
45+
import ch.njol.yggdrasil.Fields;
46+
import io.papermc.paper.world.MoonPhase;
3347
import org.bukkit.Bukkit;
3448
import org.bukkit.Chunk;
3549
import org.bukkit.Difficulty;
@@ -79,34 +93,19 @@
7993
import org.bukkit.potion.PotionEffectType;
8094
import org.bukkit.util.CachedServerIcon;
8195
import org.bukkit.util.Vector;
82-
83-
import ch.njol.skript.Skript;
84-
import ch.njol.skript.SkriptConfig;
85-
import ch.njol.skript.aliases.Aliases;
86-
import ch.njol.skript.aliases.ItemType;
87-
import ch.njol.skript.bukkitutil.EnchantmentUtils;
88-
import ch.njol.skript.bukkitutil.ItemUtils;
89-
import ch.njol.skript.classes.ClassInfo;
90-
import ch.njol.skript.classes.ConfigurationSerializer;
91-
import ch.njol.skript.classes.EnumClassInfo;
92-
import ch.njol.skript.classes.Parser;
93-
import ch.njol.skript.classes.Serializer;
94-
import ch.njol.skript.classes.registry.RegistryClassInfo;
95-
import ch.njol.skript.entity.EntityData;
96-
import ch.njol.skript.expressions.ExprDamageCause;
97-
import ch.njol.skript.expressions.base.EventValueExpression;
98-
import ch.njol.skript.lang.ParseContext;
99-
import ch.njol.skript.lang.util.SimpleLiteral;
100-
import ch.njol.skript.localization.Language;
101-
import ch.njol.skript.registrations.Classes;
102-
import ch.njol.skript.util.BlockUtils;
103-
import ch.njol.skript.util.PotionEffectUtils;
104-
import ch.njol.skript.util.StringMode;
105-
import ch.njol.util.StringUtils;
106-
import ch.njol.yggdrasil.Fields;
107-
import io.papermc.paper.world.MoonPhase;
10896
import org.jetbrains.annotations.Nullable;
10997

98+
import java.io.StreamCorruptedException;
99+
import java.util.ArrayList;
100+
import java.util.Arrays;
101+
import java.util.List;
102+
import java.util.Locale;
103+
import java.util.Map.Entry;
104+
import java.util.UUID;
105+
import java.util.regex.Matcher;
106+
import java.util.regex.Pattern;
107+
import java.util.stream.Collectors;
108+
110109
/**
111110
* @author Peter Güttinger
112111
*/
@@ -987,7 +986,8 @@ public String toVariableNameString(final ItemStack i) {
987986
if (BukkitUtils.registryExists("BIOME")) {
988987
biomeClassInfo = new RegistryClassInfo<>(Biome.class, Registry.BIOME, "biome", "biomes");
989988
} else {
990-
biomeClassInfo = new EnumClassInfo<>(Biome.class, "biome", "biomes");
989+
//noinspection rawtypes,unchecked
990+
biomeClassInfo = new EnumClassInfo<>((Class) Biome.class, "biome", "biomes");
991991
}
992992
Classes.registerClass(biomeClassInfo
993993
.user("biomes?")
@@ -1481,7 +1481,8 @@ public String toVariableNameString(EnchantmentOffer eo) {
14811481
if (BukkitUtils.registryExists("ATTRIBUTE")) {
14821482
attributeClassInfo = new RegistryClassInfo<>(Attribute.class, Registry.ATTRIBUTE, "attributetype", "attribute types");
14831483
} else {
1484-
attributeClassInfo = new EnumClassInfo<>(Attribute.class, "attributetype", "attribute types");
1484+
//noinspection rawtypes,unchecked
1485+
attributeClassInfo = new EnumClassInfo<>((Class) Attribute.class, "attributetype", "attribute types");
14851486
}
14861487
Classes.registerClass(attributeClassInfo
14871488
.user("attribute ?types?")

0 commit comments

Comments
 (0)