From c4bb41333a7ce33fd58a509a333091e8a870325a Mon Sep 17 00:00:00 2001 From: ulumulu1510 Date: Mon, 27 Feb 2017 19:35:09 +0100 Subject: [PATCH] Enable BackStringEnumSets to be edited from within the editor. --- .../massivecraft/factions/entity/MConf.java | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/src/com/massivecraft/factions/entity/MConf.java b/src/com/massivecraft/factions/entity/MConf.java index dca36d23..40e92501 100644 --- a/src/com/massivecraft/factions/entity/MConf.java +++ b/src/com/massivecraft/factions/entity/MConf.java @@ -7,11 +7,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -import com.massivecraft.massivecore.command.editor.annotation.EditorName; -import com.massivecraft.massivecore.command.editor.annotation.EditorType; -import com.massivecraft.massivecore.command.editor.annotation.EditorTypeInner; -import com.massivecraft.massivecore.command.editor.annotation.EditorVisible; -import com.massivecraft.massivecore.command.type.TypeMillisDiff; import org.bukkit.ChatColor; import org.bukkit.Material; import org.bukkit.entity.EntityType; @@ -23,6 +18,10 @@ import com.massivecraft.factions.engine.EngineChat; import com.massivecraft.factions.event.EventFactionsChunkChangeType; import com.massivecraft.massivecore.collections.BackstringEnumSet; import com.massivecraft.massivecore.collections.WorldExceptionSet; +import com.massivecraft.massivecore.command.editor.annotation.EditorName; +import com.massivecraft.massivecore.command.editor.annotation.EditorType; +import com.massivecraft.massivecore.command.editor.annotation.EditorTypeInner; +import com.massivecraft.massivecore.command.type.TypeMillisDiff; import com.massivecraft.massivecore.store.Entity; import com.massivecraft.massivecore.util.MUtil; import com.massivecraft.massivecore.util.TimeUnit; @@ -539,7 +538,6 @@ 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. - @EditorVisible(false) public BackstringEnumSet materialsEditOnInteract = new BackstringEnumSet(Material.class, "DIODE_BLOCK_OFF", // Minecraft 1.? "DIODE_BLOCK_ON", // Minecraft 1.? @@ -554,7 +552,6 @@ 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. - @EditorVisible(false) public BackstringEnumSet materialsEditTools = new BackstringEnumSet(Material.class, "FIREBALL", // Minecraft 1.? "FLINT_AND_STEEL", // Minecraft 1.? @@ -567,7 +564,6 @@ public class MConf extends Entity // The duplication bug found in Spigot 1.8 protocol patch // https://github.com/MassiveCraft/Factions/issues/693 - @EditorVisible(false) public BackstringEnumSet materialsEditToolsDupeBug = new BackstringEnumSet(Material.class, "CHEST", // Minecraft 1.? "SIGN_POST", // Minecraft 1.? @@ -578,7 +574,6 @@ public class MConf extends Entity ); // Interacting with these materials placed in the terrain results in door toggling. - @EditorVisible(false) public BackstringEnumSet materialsDoor = new BackstringEnumSet(Material.class, "WOODEN_DOOR", // Minecraft 1.? "ACACIA_DOOR", // Minecraft 1.8 @@ -596,7 +591,6 @@ public class MConf extends Entity ); // Interacting with these materials placed in the terrain results in opening a container. - @EditorVisible(false) public BackstringEnumSet materialsContainer = new BackstringEnumSet(Material.class, "DISPENSER", // Minecraft 1.? "CHEST", // Minecraft 1.? @@ -631,14 +625,12 @@ public class MConf extends Entity ); // Interacting with these entities results in an edit. - @EditorVisible(false) public BackstringEnumSet entityTypesEditOnInteract = new BackstringEnumSet(EntityType.class, "ITEM_FRAME", // Minecraft 1.? "ARMOR_STAND" // Minecraft 1.8 ); // Damaging these entities results in an edit. - @EditorVisible(false) public BackstringEnumSet entityTypesEditOnDamage = new BackstringEnumSet(EntityType.class, "ITEM_FRAME", // Minecraft 1.? "ARMOR_STAND", // Minecraft 1.8 @@ -646,14 +638,12 @@ public class MConf extends Entity ); // Interacting with these entities results in opening a container. - @EditorVisible(false) public BackstringEnumSet entityTypesContainer = new BackstringEnumSet(EntityType.class, "MINECART_CHEST", // Minecraft 1.? "MINECART_HOPPER" // Minecraft 1.? ); // The complete list of entities considered to be monsters. - @EditorVisible(false) public BackstringEnumSet entityTypesMonsters = new BackstringEnumSet(EntityType.class, "BLAZE", // Minecraft 1.? "CAVE_SPIDER", // Minecraft 1.? @@ -686,7 +676,6 @@ public class MConf extends Entity ); // List of entities considered to be animals. - @EditorVisible(false) public BackstringEnumSet entityTypesAnimals = new BackstringEnumSet(EntityType.class, "BAT", // Minecraft 1.? "CHICKEN", // Minecraft 1.?