diff --git a/src/com/massivecraft/factions/engine/EngineFlagSpawn.java b/src/com/massivecraft/factions/engine/EngineFlagSpawn.java index d26b6c4f..67c6cba0 100644 --- a/src/com/massivecraft/factions/engine/EngineFlagSpawn.java +++ b/src/com/massivecraft/factions/engine/EngineFlagSpawn.java @@ -14,7 +14,7 @@ import com.massivecraft.factions.entity.Faction; import com.massivecraft.factions.entity.MConf; import com.massivecraft.factions.entity.MFlag; import com.massivecraft.massivecore.Engine; -import com.massivecraft.massivecore.collections.BackstringEnumSet; +import com.massivecraft.massivecore.collections.BackstringSet; import com.massivecraft.massivecore.ps.PS; public class EngineFlagSpawn extends Engine @@ -30,7 +30,7 @@ public class EngineFlagSpawn extends Engine // CONSTANTS // -------------------------------------------- // - public static final Set NATURAL_SPAWN_REASONS = new BackstringEnumSet<>(SpawnReason.class, + public static final Set NATURAL_SPAWN_REASONS = new BackstringSet<>(SpawnReason.class, "NATURAL", "JOCKEY", "CHUNK_GEN", diff --git a/src/com/massivecraft/factions/entity/MConf.java b/src/com/massivecraft/factions/entity/MConf.java index 40e92501..8f6fc1e8 100644 --- a/src/com/massivecraft/factions/entity/MConf.java +++ b/src/com/massivecraft/factions/entity/MConf.java @@ -16,7 +16,7 @@ import com.massivecraft.factions.Factions; import com.massivecraft.factions.Rel; import com.massivecraft.factions.engine.EngineChat; import com.massivecraft.factions.event.EventFactionsChunkChangeType; -import com.massivecraft.massivecore.collections.BackstringEnumSet; +import com.massivecraft.massivecore.collections.BackstringSet; import com.massivecraft.massivecore.collections.WorldExceptionSet; import com.massivecraft.massivecore.command.editor.annotation.EditorName; import com.massivecraft.massivecore.command.editor.annotation.EditorType; @@ -538,7 +538,7 @@ public class MConf extends Entity // This way they can be protected in Faction territory. // Interacting with these materials when they are already placed in the terrain results in an edit. - public BackstringEnumSet materialsEditOnInteract = new BackstringEnumSet(Material.class, + public BackstringSet materialsEditOnInteract = new BackstringSet(Material.class, "DIODE_BLOCK_OFF", // Minecraft 1.? "DIODE_BLOCK_ON", // Minecraft 1.? "NOTE_BLOCK", // Minecraft 1.? @@ -552,7 +552,7 @@ public class MConf extends Entity // Interacting with the the terrain holding this item in hand results in an edit. // There's no need to add all block materials here. Only special items other than blocks. - public BackstringEnumSet materialsEditTools = new BackstringEnumSet(Material.class, + public BackstringSet materialsEditTools = new BackstringSet(Material.class, "FIREBALL", // Minecraft 1.? "FLINT_AND_STEEL", // Minecraft 1.? "BUCKET", // Minecraft 1.? @@ -564,7 +564,7 @@ public class MConf extends Entity // The duplication bug found in Spigot 1.8 protocol patch // https://github.com/MassiveCraft/Factions/issues/693 - public BackstringEnumSet materialsEditToolsDupeBug = new BackstringEnumSet(Material.class, + public BackstringSet materialsEditToolsDupeBug = new BackstringSet(Material.class, "CHEST", // Minecraft 1.? "SIGN_POST", // Minecraft 1.? "TRAPPED_CHEST", // Minecraft 1.? @@ -574,7 +574,7 @@ public class MConf extends Entity ); // Interacting with these materials placed in the terrain results in door toggling. - public BackstringEnumSet materialsDoor = new BackstringEnumSet(Material.class, + public BackstringSet materialsDoor = new BackstringSet(Material.class, "WOODEN_DOOR", // Minecraft 1.? "ACACIA_DOOR", // Minecraft 1.8 "BIRCH_DOOR", // Minecraft 1.8 @@ -591,7 +591,7 @@ public class MConf extends Entity ); // Interacting with these materials placed in the terrain results in opening a container. - public BackstringEnumSet materialsContainer = new BackstringEnumSet(Material.class, + public BackstringSet materialsContainer = new BackstringSet(Material.class, "DISPENSER", // Minecraft 1.? "CHEST", // Minecraft 1.? "FURNACE", // Minecraft 1.? @@ -625,26 +625,26 @@ public class MConf extends Entity ); // Interacting with these entities results in an edit. - public BackstringEnumSet entityTypesEditOnInteract = new BackstringEnumSet(EntityType.class, + public BackstringSet entityTypesEditOnInteract = new BackstringSet(EntityType.class, "ITEM_FRAME", // Minecraft 1.? "ARMOR_STAND" // Minecraft 1.8 ); // Damaging these entities results in an edit. - public BackstringEnumSet entityTypesEditOnDamage = new BackstringEnumSet(EntityType.class, + public BackstringSet entityTypesEditOnDamage = new BackstringSet(EntityType.class, "ITEM_FRAME", // Minecraft 1.? "ARMOR_STAND", // Minecraft 1.8 "ENDER_CRYSTAL" // Minecraft 1.10 ); // Interacting with these entities results in opening a container. - public BackstringEnumSet entityTypesContainer = new BackstringEnumSet(EntityType.class, + public BackstringSet entityTypesContainer = new BackstringSet(EntityType.class, "MINECART_CHEST", // Minecraft 1.? "MINECART_HOPPER" // Minecraft 1.? ); // The complete list of entities considered to be monsters. - public BackstringEnumSet entityTypesMonsters = new BackstringEnumSet(EntityType.class, + public BackstringSet entityTypesMonsters = new BackstringSet(EntityType.class, "BLAZE", // Minecraft 1.? "CAVE_SPIDER", // Minecraft 1.? "CREEPER", // Minecraft 1.? @@ -676,7 +676,7 @@ public class MConf extends Entity ); // List of entities considered to be animals. - public BackstringEnumSet entityTypesAnimals = new BackstringEnumSet(EntityType.class, + public BackstringSet entityTypesAnimals = new BackstringSet(EntityType.class, "BAT", // Minecraft 1.? "CHICKEN", // Minecraft 1.? "COW", // Minecraft 1.?