refactored out dependency

This commit is contained in:
2024-04-05 08:53:18 -04:00
parent 0b4873a522
commit 43b212ed42
4 changed files with 19 additions and 12 deletions
+9 -3
View File
@@ -24,8 +24,6 @@ import java.util.EnumSet;
import java.util.HashMap;
import java.util.concurrent.ThreadLocalRandom;
;
/*
* MagicBane engine enumeration class.
*
@@ -36,6 +34,14 @@ import java.util.concurrent.ThreadLocalRandom;
public class mbEnums {
public static <T extends Enum<T>> long toLong(EnumSet<T> enumSet) {
long r = 0;
for (T value : enumSet) {
r |= 1L << value.ordinal();
}
return r;
}
public static <E extends java.lang.Enum<E>> EnumSet<E> fromLong(long bitVector, Class<E> enumClass) {
// Bitvector -> EnumSet without the EnumBitvector dependency
@@ -1582,7 +1588,7 @@ public class mbEnums {
// It is also used as a bitvector flag in the npc
// building slot mechanics.
public enum BuildingGroup implements EnumBitSetHelper<BuildingGroup> {
public enum BuildingGroup {
NONE(0, 0),
TOL(64f, 64f),
BARRACK(32f, 64f),