Upstream/bentobox
1
0
Fork 0
mirror of https://github.com/BentoBoxWorld/BentoBox.git synced 2024-11-24 03:35:11 +01:00
Code Issues Projects Releases Wiki Activity

Clearer paster (#1953)

Browse Source 
* WIP - make easier to understand.

* Small refactor of paster to make it easier to understand

* Fix tabs to spaces. Sorry - new editor!

* Fix tabs to spaces

* Fix tab to spaces
This commit is contained in:
tastybento 2022-03-19 16:19:31 +00:00 committed by GitHub
parent 51dbca0f99
commit 6796fceee8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 105 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamInviteAcceptCommand.java
View File

@ -21,7 +21,7 @@ import world.bentobox.bentobox.util.Util;
public class IslandTeamInviteAcceptCommand extends ConfirmableCommand { public class IslandTeamInviteAcceptCommand extends ConfirmableCommand {
private static final String INVALID_INVITE = "commands.island.team.invite.errors.invalid-invite"; private static final String INVALID_INVITE = "commands.island.team.invite.errors.invalid-invite";
private final IslandTeamCommand itc; private final IslandTeamCommand itc;
private UUID playerUUID; private UUID playerUUID;
private UUID prospectiveOwnerUUID; private UUID prospectiveOwnerUUID;

38
src/main/java/world/bentobox/bentobox/api/panels/reader/TemplateReader.java
View File

@ -41,12 +41,12 @@ public class TemplateReader
private static final String BORDER = "border"; private static final String BORDER = "border";
private static final String FORCE_SHOWN = "force-shown"; private static final String FORCE_SHOWN = "force-shown";
private static final String FALLBACK = "fallback"; private static final String FALLBACK = "fallback";
private static final String YML = ".yml"; private static final String YML = ".yml";
private static final String ACTIONS = "actions"; private static final String ACTIONS = "actions";
private static final String TOOLTIP = "tooltip"; private static final String TOOLTIP = "tooltip";
private static final String CLICK_TYPE = "click-type"; private static final String CLICK_TYPE = "click-type";
private static final String CONTENT = "content"; private static final String CONTENT = "content";
private static final String TYPE = "type"; private static final String TYPE = "type";
/** /**
@ -88,7 +88,7 @@ public class TemplateReader
} }
final String panelKey = file.getAbsolutePath() + ":" + panelName; final String panelKey = file.getAbsolutePath() + ":" + panelName;
// Check if panel is already crafted. // Check if panel is already crafted.
if (TemplateReader.loadedPanels.containsKey(panelKey)) if (TemplateReader.loadedPanels.containsKey(panelKey))
{ {
@ -373,14 +373,14 @@ public class TemplateReader
if (actionDataSection != null && actionDataSection.contains(CLICK_TYPE)) if (actionDataSection != null && actionDataSection.contains(CLICK_TYPE))
{ {
clickType = Enums.getIfPresent(ClickType.class, clickType = Enums.getIfPresent(ClickType.class,
actionDataSection.getString(CLICK_TYPE, "UNKNOWN").toUpperCase()). actionDataSection.getString(CLICK_TYPE, "UNKNOWN").toUpperCase()).
or(ClickType.UNKNOWN); or(ClickType.UNKNOWN);
ItemTemplateRecord.ActionRecords actionData = ItemTemplateRecord.ActionRecords actionData =
new ItemTemplateRecord.ActionRecords(clickType, new ItemTemplateRecord.ActionRecords(clickType,
actionKey, actionKey,
actionDataSection.getString(CONTENT), actionDataSection.getString(CONTENT),
actionDataSection.getString(TOOLTIP)); actionDataSection.getString(TOOLTIP));
itemRecord.addAction(actionData); itemRecord.addAction(actionData);
} }
} }
@ -397,15 +397,15 @@ public class TemplateReader
{ {
actionList.forEach(valueMap -> { actionList.forEach(valueMap -> {
ClickType clickType = Enums.getIfPresent(ClickType.class, ClickType clickType = Enums.getIfPresent(ClickType.class,
String.valueOf(valueMap.get(CLICK_TYPE)).toUpperCase()).orNull(); String.valueOf(valueMap.get(CLICK_TYPE)).toUpperCase()).orNull();
if (clickType != null) if (clickType != null)
{ {
ItemTemplateRecord.ActionRecords actionData = ItemTemplateRecord.ActionRecords actionData =
new ItemTemplateRecord.ActionRecords(clickType, new ItemTemplateRecord.ActionRecords(clickType,
valueMap.containsKey(TYPE) ? String.valueOf(valueMap.get(TYPE)) : null, valueMap.containsKey(TYPE) ? String.valueOf(valueMap.get(TYPE)) : null,
valueMap.containsKey(CONTENT) ? String.valueOf(valueMap.get(CONTENT)) : null, valueMap.containsKey(CONTENT) ? String.valueOf(valueMap.get(CONTENT)) : null,
valueMap.containsKey(TOOLTIP) ? String.valueOf(valueMap.get(TOOLTIP)) : null); valueMap.containsKey(TOOLTIP) ? String.valueOf(valueMap.get(TOOLTIP)) : null);
itemRecord.addAction(actionData); itemRecord.addAction(actionData);
} }
}); });

159
src/main/java/world/bentobox/bentobox/blueprints/BlueprintPaster.java
View File

@ -134,99 +134,110 @@ public class BlueprintPaster {
this.location = island.getProtectionCenter().toVector().subtract(off).toLocation(world); this.location = island.getProtectionCenter().toVector().subtract(off).toLocation(world);
} }
private record Bits(Map<Vector, BlueprintBlock> blocks,
Map<Vector, BlueprintBlock> attached,
Map<Vector, List<BlueprintEntity>> entities,
Iterator<Entry<Vector, BlueprintBlock>> it,
Iterator<Entry<Vector, BlueprintBlock>> it2,
Iterator<Entry<Vector, List<BlueprintEntity>>> it3,
int pasteSpeed) {}
/** /**
* The main pasting method * The main pasting method
*/ */
public CompletableFuture<Boolean> paste() { public CompletableFuture<Boolean> paste() {
CompletableFuture<Boolean> result = new CompletableFuture<>(); CompletableFuture<Boolean> result = new CompletableFuture<>();
// Iterators for the various maps to paste // Iterators for the various maps to paste
Map<Vector, BlueprintBlock> blocks = blueprint.getBlocks() == null ? Collections.emptyMap() : blueprint.getBlocks(); final Map<Vector, BlueprintBlock> blocks = blueprint.getBlocks() == null ? Collections.emptyMap() : blueprint.getBlocks();
Map<Vector, BlueprintBlock> attached = blueprint.getAttached() == null ? Collections.emptyMap() : blueprint.getAttached(); final Map<Vector, BlueprintBlock> attached = blueprint.getAttached() == null ? Collections.emptyMap() : blueprint.getAttached();
Map<Vector, List<BlueprintEntity>> entities = blueprint.getEntities() == null ? Collections.emptyMap() : blueprint.getEntities(); final Map<Vector, List<BlueprintEntity>> entities = blueprint.getEntities() == null ? Collections.emptyMap() : blueprint.getEntities();
Iterator<Entry<Vector, BlueprintBlock>> it = blocks.entrySet().iterator();
Iterator<Entry<Vector, BlueprintBlock>> it2 = attached.entrySet().iterator();
Iterator<Entry<Vector, List<BlueprintEntity>>> it3 = entities.entrySet().iterator();
// Initial state & speed // Initial state & speed
pasteState = PasteState.CHUNK_LOAD; pasteState = PasteState.CHUNK_LOAD;
final int pasteSpeed = plugin.getSettings().getPasteSpeed();
// If this is an island OVERWORLD paste, get the island owner. // If this is an island OVERWORLD paste, get the island owner.
final Optional<User> owner = Optional.ofNullable(island) final Optional<User> owner = Optional.ofNullable(island)
.filter(i -> location.getWorld().getEnvironment().equals(World.Environment.NORMAL)) .filter(i -> location.getWorld().getEnvironment().equals(World.Environment.NORMAL))
.map(i -> User.getInstance(i.getOwner())); .map(i -> User.getInstance(i.getOwner()));
// Tell the owner we're pasting blocks and how much time it might take // Tell the owner we're pasting blocks and how much time it might take
owner.ifPresent(user -> { owner.ifPresent(user -> tellOwner(user, blocks.size(), attached.size(), entities.size(), plugin.getSettings().getPasteSpeed()));
// Estimated time: Bits bits = new Bits(blocks, attached, entities,
double total = (double) blocks.size() + attached.size() + entities.size(); blocks.entrySet().iterator(), attached.entrySet().iterator(), entities.entrySet().iterator(),
BigDecimal time = BigDecimal.valueOf(total / (pasteSpeed * 20.0D) + (chunkLoadTime / 1000.0D)).setScale(1, RoundingMode.UP); plugin.getSettings().getPasteSpeed());
user.sendMessage("commands.island.create.pasting.estimated-time", TextVariables.NUMBER, String.valueOf(time.doubleValue())); pastingTask = Bukkit.getScheduler().runTaskTimer(plugin, () -> pasterTask(result, owner, bits), 0L, 1L);
// We're pasting blocks!
user.sendMessage("commands.island.create.pasting.blocks", TextVariables.NUMBER, String.valueOf(blocks.size() + attached.size()));
});
pastingTask = Bukkit.getScheduler().runTaskTimer(plugin, () -> {
long timer = System.currentTimeMillis();
int count = 0;
if (pasteState.equals(PasteState.CHUNK_LOAD)) {
pasteState = PasteState.CHUNK_LOADING;
// Load chunk
Util.getChunkAtAsync(location).thenRun(() -> {
pasteState = PasteState.BLOCKS;
long duration = System.currentTimeMillis() - timer;
if (duration > chunkLoadTime) {
chunkLoadTime = duration;
}
});
}
while (pasteState.equals(PasteState.BLOCKS) && count < pasteSpeed && it.hasNext()) {
pasteBlock(location, it.next());
count++;
}
while (pasteState.equals(PasteState.ATTACHMENTS) && count < pasteSpeed && it2.hasNext()) {
pasteBlock(location, it2.next());
count++;
}
while (pasteState.equals(PasteState.ENTITIES) && count < pasteSpeed && it3.hasNext()) {
pasteEntity(location, it3.next());
count++;
}
// STATE SHIFT
if (pasteState.equals(PasteState.BLOCKS) && !it.hasNext()) {
// Blocks done
// Next paste attachments
pasteState = PasteState.ATTACHMENTS;
}
else if (pasteState.equals(PasteState.ATTACHMENTS) && !it2.hasNext()) {
// Attachments done. Next paste entities
pasteState = PasteState.ENTITIES;
if (entities.size() != 0) {
owner.ifPresent(user -> user.sendMessage("commands.island.create.pasting.entities", TextVariables.NUMBER, String.valueOf(entities.size())));
}
}
else if (pasteState.equals(PasteState.ENTITIES) && !it3.hasNext()) {
pasteState = PasteState.DONE;
owner.ifPresent(user -> user.sendMessage("commands.island.create.pasting.done"));
}
else if (pasteState.equals(PasteState.DONE)) {
// All done. Cancel task
// Set pos1 and 2 if this was a clipboard paste
if (island == null && clipboard != null) {
clipboard.setPos1(pos1);
clipboard.setPos2(pos2);
}
result.complete(true);
pasteState = PasteState.CANCEL;
} else if (pasteState.equals(PasteState.CANCEL)) {
// This state makes sure the follow-on task only ever runs once
pastingTask.cancel();
result.complete(true);
}
}, 0L, 1L);
return result; return result;
} }
private void pasterTask(CompletableFuture<Boolean> result, Optional<User> owner, Bits bits) {
final int pasteSpeed = plugin.getSettings().getPasteSpeed();
long timer = System.currentTimeMillis();
int count = 0;
if (pasteState.equals(PasteState.CHUNK_LOAD)) {
pasteState = PasteState.CHUNK_LOADING;
// Load chunk
Util.getChunkAtAsync(location).thenRun(() -> {
pasteState = PasteState.BLOCKS;
long duration = System.currentTimeMillis() - timer;
if (duration > chunkLoadTime) {
chunkLoadTime = duration;
}
});
}
while (pasteState.equals(PasteState.BLOCKS) && count < pasteSpeed && bits.it.hasNext()) {
pasteBlock(location, bits.it.next());
count++;
}
while (pasteState.equals(PasteState.ATTACHMENTS) && count < pasteSpeed && bits.it2.hasNext()) {
pasteBlock(location, bits.it2.next());
count++;
}
while (pasteState.equals(PasteState.ENTITIES) && count < pasteSpeed && bits.it3.hasNext()) {
pasteEntity(location, bits.it3.next());
count++;
}
// STATE SHIFT
if (pasteState.equals(PasteState.BLOCKS) && !bits.it.hasNext()) {
// Blocks done
// Next paste attachments
pasteState = PasteState.ATTACHMENTS;
}
else if (pasteState.equals(PasteState.ATTACHMENTS) && !bits.it2.hasNext()) {
// Attachments done. Next paste entities
pasteState = PasteState.ENTITIES;
if (bits.entities.size() != 0) {
owner.ifPresent(user -> user.sendMessage("commands.island.create.pasting.entities", TextVariables.NUMBER, String.valueOf(bits.entities.size())));
}
}
else if (pasteState.equals(PasteState.ENTITIES) && !bits.it3.hasNext()) {
pasteState = PasteState.DONE;
owner.ifPresent(user -> user.sendMessage("commands.island.create.pasting.done"));
}
else if (pasteState.equals(PasteState.DONE)) {
// All done. Cancel task
// Set pos1 and 2 if this was a clipboard paste
if (island == null && clipboard != null) {
clipboard.setPos1(pos1);
clipboard.setPos2(pos2);
}
pasteState = PasteState.CANCEL;
result.complete(true);
} else if (pasteState.equals(PasteState.CANCEL)) {
// This state makes sure the follow-on task only ever runs once
pastingTask.cancel();
result.complete(true);
}
}
private void tellOwner(User user, int blocksSize, int attachedSize, int entitiesSize, int pasteSpeed) {
// Estimated time:
double total = (double) blocksSize + attachedSize + entitiesSize;
BigDecimal time = BigDecimal.valueOf(total / (pasteSpeed * 20.0D) + (chunkLoadTime / 1000.0D)).setScale(1, RoundingMode.UP);
user.sendMessage("commands.island.create.pasting.estimated-time", TextVariables.NUMBER, String.valueOf(time.doubleValue()));
// We're pasting blocks!
user.sendMessage("commands.island.create.pasting.blocks", TextVariables.NUMBER, String.valueOf(blocksSize + attachedSize));
}
private void pasteBlock(Location location, Entry<Vector, BlueprintBlock> entry) { private void pasteBlock(Location location, Entry<Vector, BlueprintBlock> entry) {
World world = location.getWorld(); World world = location.getWorld();
Location pasteTo = location.clone().add(entry.getKey()); Location pasteTo = location.clone().add(entry.getKey());