Upstream/bentobox
1
0
Fork 0
mirror of https://github.com/BentoBoxWorld/BentoBox.git synced 2025-01-30 12:01:30 +01:00
Code Issues Projects Releases Wiki Activity

Removed unneeded enum values. Improved const names.

Browse Source
This commit is contained in:
tastybento 2018-12-31 11:31:35 -08:00
parent 2528442d6b
commit 0da0d6c6f7
1 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/main/java/world/bentobox/bentobox/schems/Clipboard.java
View File

@ -60,9 +60,7 @@ public class Clipboard {
enum PasteState { enum PasteState {
BLOCKS, BLOCKS,
BLOCKS_DONE,
ATTACHMENTS, ATTACHMENTS,
ATTACHMENTS_DONE,
ENTITIES, ENTITIES,
DONE DONE
} }
@ -72,9 +70,9 @@ public class Clipboard {
private PasteState pasteState; private PasteState pasteState;
// Commonly used texts along this class. // Commonly used texts along this class.
private static final String ATTACHED = "attached."; private static final String ATTACHED_YAML_PREFIX = "attached.";
private static final String ENTITIES = "entities."; private static final String ENTITIES_YAML_PREFIX = "entities.";
private static final String BLOCK = "blocks."; private static final String BLOCKS_YAML_PREFIX = "blocks.";
private static final String BEDROCK = "bedrock"; private static final String BEDROCK = "bedrock";
private static final String INVENTORY = "inventory"; private static final String INVENTORY = "inventory";
private static final String ENTITY = "entity"; private static final String ENTITY = "entity";
@ -208,14 +206,14 @@ public class Clipboard {
// Calculate location for pasting // Calculate location for pasting
Location loc = island.getCenter().toVector().subtract(off).toLocation(world); Location loc = island.getCenter().toVector().subtract(off).toLocation(world);
// Paste // Paste
if (!blockConfig.contains(BLOCK)) { if (!blockConfig.contains(BLOCKS_YAML_PREFIX)) {
plugin.logError("Clipboard has no block data in it to paste!"); plugin.logError("Clipboard has no block data in it to paste!");
return; return;
} }
// Iterators for the various schem sections // Iterators for the various schem sections
Iterator<String> it = blockConfig.getConfigurationSection(BLOCK).getKeys(false).iterator(); Iterator<String> it = blockConfig.getConfigurationSection(BLOCKS_YAML_PREFIX).getKeys(false).iterator();
Iterator<String> it2 = blockConfig.contains(ATTACHED) ? blockConfig.getConfigurationSection(ATTACHED).getKeys(false).iterator() : null; Iterator<String> it2 = blockConfig.contains(ATTACHED_YAML_PREFIX) ? blockConfig.getConfigurationSection(ATTACHED_YAML_PREFIX).getKeys(false).iterator() : null;
Iterator<String> it3 = blockConfig.contains(ENTITIES) ? blockConfig.getConfigurationSection(ENTITIES).getKeys(false).iterator() : null; Iterator<String> it3 = blockConfig.contains(ENTITIES_YAML_PREFIX) ? blockConfig.getConfigurationSection(ENTITIES_YAML_PREFIX).getKeys(false).iterator() : null;
// Initial state & speed // Initial state & speed
pasteState = PasteState.BLOCKS; pasteState = PasteState.BLOCKS;
@ -224,15 +222,15 @@ public class Clipboard {
pastingTask = Bukkit.getScheduler().runTaskTimer(plugin, () -> { pastingTask = Bukkit.getScheduler().runTaskTimer(plugin, () -> {
int count = 0; int count = 0;
while (pasteState.equals(PasteState.BLOCKS) && count < pasteSpeed && it.hasNext()) { while (pasteState.equals(PasteState.BLOCKS) && count < pasteSpeed && it.hasNext()) {
pasteBlock(world, island, loc, blockConfig.getConfigurationSection(BLOCK + it.next())); pasteBlock(world, island, loc, blockConfig.getConfigurationSection(BLOCKS_YAML_PREFIX + it.next()));
count++; count++;
} }
while (it2 != null && pasteState.equals(PasteState.ATTACHMENTS) && count < pasteSpeed && it2.hasNext()) { while (it2 != null && pasteState.equals(PasteState.ATTACHMENTS) && count < pasteSpeed && it2.hasNext()) {
pasteBlock(world, island, loc, blockConfig.getConfigurationSection(ATTACHED + it2.next())); pasteBlock(world, island, loc, blockConfig.getConfigurationSection(ATTACHED_YAML_PREFIX + it2.next()));
count++; count++;
} }
while (it3 != null && pasteState.equals(PasteState.ENTITIES) && count < pasteSpeed && it3.hasNext()) { while (it3 != null && pasteState.equals(PasteState.ENTITIES) && count < pasteSpeed && it3.hasNext()) {
pasteEntity(world, island, loc, blockConfig.getConfigurationSection(ENTITIES + it3.next())); pasteEntity(world, island, loc, blockConfig.getConfigurationSection(ENTITIES_YAML_PREFIX + it3.next()));
count++; count++;
} }
// STATE SHIFT // STATE SHIFT
@ -270,8 +268,8 @@ public class Clipboard {
* @param location - location * @param location - location
*/ */
public void pasteClipboard(Location location) { public void pasteClipboard(Location location) {
if (blockConfig.contains(BLOCK)) { if (blockConfig.contains(BLOCKS_YAML_PREFIX)) {
blockConfig.getConfigurationSection(BLOCK).getKeys(false).forEach(b -> pasteBlock(location.getWorld(), null, location, blockConfig.getConfigurationSection(BLOCK + "." + b))); blockConfig.getConfigurationSection(BLOCKS_YAML_PREFIX).getKeys(false).forEach(b -> pasteBlock(location.getWorld(), null, location, blockConfig.getConfigurationSection(BLOCKS_YAML_PREFIX + "." + b)));
} else { } else {
plugin.logError("Clipboard has no block data in it to paste!"); plugin.logError("Clipboard has no block data in it to paste!");
} }
@ -439,11 +437,11 @@ public class Clipboard {
String pos = x + "," + y + "," + z; String pos = x + "," + y + "," + z;
// Position defines the section // Position defines the section
ConfigurationSection s = blockConfig.createSection(BLOCK + "." + pos); ConfigurationSection s = blockConfig.createSection(BLOCKS_YAML_PREFIX + "." + pos);
// Set entities // Set entities
for (LivingEntity e: entities) { for (LivingEntity e: entities) {
ConfigurationSection en = blockConfig.createSection(ENTITIES + pos + "." + e.getUniqueId()); ConfigurationSection en = blockConfig.createSection(ENTITIES_YAML_PREFIX + pos + "." + e.getUniqueId());
en.set("type", e.getType().name()); en.set("type", e.getType().name());
en.set("name", e.getCustomName()); en.set("name", e.getCustomName());
if (e instanceof Colorable) { if (e instanceof Colorable) {
@ -488,7 +486,7 @@ public class Clipboard {
// Set block data // Set block data
if (bs.getData() instanceof Attachable) { if (bs.getData() instanceof Attachable) {
ConfigurationSection a = blockConfig.createSection(ATTACHED + pos); ConfigurationSection a = blockConfig.createSection(ATTACHED_YAML_PREFIX + pos);
a.set("bd", block.getBlockData().getAsString()); a.set("bd", block.getBlockData().getAsString());
// Placeholder for attachment // Placeholder for attachment
s.set("bd", "minecraft:air"); s.set("bd", "minecraft:air");