From 177bfaa930c620ecd507152bcf76613b75db7639 Mon Sep 17 00:00:00 2001 From: Jesse Boyd Date: Fri, 17 Aug 2018 18:33:37 +1000 Subject: [PATCH] Rename setCopyEntities to setCopyingEntities --- .../java/com/boydti/fawe/object/schematic/Schematic.java | 5 +---- .../src/main/java/com/sk89q/worldedit/EditSession.java | 4 ++-- .../java/com/sk89q/worldedit/command/ClipboardCommands.java | 4 ++-- .../worldedit/function/operation/ForwardExtentCopy.java | 6 +++--- .../main/java/com/sk89q/worldedit/session/PasteBuilder.java | 2 +- 5 files changed, 9 insertions(+), 12 deletions(-) diff --git a/worldedit-core/src/main/java/com/boydti/fawe/object/schematic/Schematic.java b/worldedit-core/src/main/java/com/boydti/fawe/object/schematic/Schematic.java index 1cb37536a..46268ff1b 100644 --- a/worldedit-core/src/main/java/com/boydti/fawe/object/schematic/Schematic.java +++ b/worldedit-core/src/main/java/com/boydti/fawe/object/schematic/Schematic.java @@ -1,6 +1,5 @@ package com.boydti.fawe.object.schematic; -import com.boydti.fawe.config.Settings; import com.boydti.fawe.object.HasFaweQueue; import com.boydti.fawe.object.clipboard.FaweClipboard; import com.boydti.fawe.object.clipboard.ReadOnlyClipboard; @@ -11,7 +10,6 @@ import com.sk89q.worldedit.MaxChangedBlocksException; import com.sk89q.worldedit.MutableBlockVector2D; import com.sk89q.worldedit.Vector; import com.sk89q.worldedit.WorldEditException; -import com.sk89q.worldedit.blocks.BaseBlock; import com.sk89q.worldedit.world.block.BlockState; import com.sk89q.worldedit.entity.Entity; import com.sk89q.worldedit.extent.Extent; @@ -37,7 +35,6 @@ import java.io.File; import java.io.FileOutputStream; import java.io.IOException; import java.io.OutputStream; -import java.util.function.Consumer; import javax.annotation.Nullable; @@ -150,7 +147,7 @@ public class Schematic { if (transform != null && !transform.isIdentity()) { copy.setTransform(transform); } - copy.setCopyEntities(copyEntities); + copy.setCopyingEntities(copyEntities); if (sourceMask != null) { new MaskTraverser(sourceMask).reset(extent); copy.setSourceMask(sourceMask); diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/EditSession.java b/worldedit-core/src/main/java/com/sk89q/worldedit/EditSession.java index 981e610f4..ebd4b64d1 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/EditSession.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/EditSession.java @@ -1832,7 +1832,7 @@ public class EditSession extends AbstractDelegateExtent implements HasFaweQueue, final Vector size = region.getMaximumPoint().subtract(region.getMinimumPoint()).add(1, 1, 1); final Vector to = region.getMinimumPoint(); final ForwardExtentCopy copy = new ForwardExtentCopy(EditSession.this, region, EditSession.this, to); - copy.setCopyEntities(copyEntities); + copy.setCopyingEntities(copyEntities); copy.setCopyBiomes(copyBiomes); copy.setRepetitions(count); copy.setTransform(new AffineTransform().translate(dir.multiply(size))); @@ -1890,7 +1890,7 @@ public class EditSession extends AbstractDelegateExtent implements HasFaweQueue, final BlockReplace remove = replacement instanceof ExistingPattern ? null : new BlockReplace(EditSession.this, replacement); copy.setCopyBiomes(copyBiomes); - copy.setCopyEntities(copyEntities); + copy.setCopyingEntities(copyEntities); copy.setSourceFunction(remove); copy.setRepetitions(1); Mask sourceMask = getSourceMask(); diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/command/ClipboardCommands.java b/worldedit-core/src/main/java/com/sk89q/worldedit/command/ClipboardCommands.java index 6ed0097b4..f2cd419d1 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/command/ClipboardCommands.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/command/ClipboardCommands.java @@ -165,7 +165,7 @@ public class ClipboardCommands extends MethodCommands { clipboard.setOrigin(session.getPlacementPosition(player)); ForwardExtentCopy copy = new ForwardExtentCopy(editSession, region, clipboard, region.getMinimumPoint()); - copy.setCopyEntities(!skipEntities); + copy.setCopyingEntities(!skipEntities); copy.setCopyBiomes(copyBiomes); Mask sourceMask = editSession.getSourceMask(); if (sourceMask != null) { @@ -255,7 +255,7 @@ public class ClipboardCommands extends MethodCommands { clipboard.setOrigin(session.getPlacementPosition(player)); ForwardExtentCopy copy = new ForwardExtentCopy(editSession, region, clipboard, region.getMinimumPoint()); copy.setSourceFunction(new BlockReplace(editSession, leavePattern)); - copy.setCopyEntities(!skipEntities); + copy.setCopyingEntities(!skipEntities); copy.setCopyBiomes(copyBiomes); Mask sourceMask = editSession.getSourceMask(); if (sourceMask != null) { diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/function/operation/ForwardExtentCopy.java b/worldedit-core/src/main/java/com/sk89q/worldedit/function/operation/ForwardExtentCopy.java index 1cc0be51a..2ebaacb39 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/function/operation/ForwardExtentCopy.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/function/operation/ForwardExtentCopy.java @@ -149,11 +149,11 @@ public class ForwardExtentCopy implements Operation { return sourceMask; } - public void setCopyEntities(boolean copyEntities) { + public void setCopyingEntities(boolean copyEntities) { this.copyEntities = copyEntities; } - public boolean isCopyEntities() { + public boolean isCopyingEntities() { return copyEntities; } @@ -347,7 +347,7 @@ public class ForwardExtentCopy implements Operation { blockCopy = new RegionVisitor(region, copy, queue instanceof MappedFaweQueue ? (MappedFaweQueue) queue : null); } - List entities = isCopyEntities() ? source.getEntities(region) : new ArrayList<>(); + List entities = isCopyingEntities() ? source.getEntities(region) : new ArrayList<>(); for (int i = 0; i < repetitions; i++) { Operations.completeBlindly(blockCopy); diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/session/PasteBuilder.java b/worldedit-core/src/main/java/com/sk89q/worldedit/session/PasteBuilder.java index 3284b9a95..ee8061800 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/session/PasteBuilder.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/session/PasteBuilder.java @@ -113,7 +113,7 @@ public class PasteBuilder { } ForwardExtentCopy copy = new ForwardExtentCopy(extent, clipboard.getRegion(), clipboard.getOrigin(), targetExtent, to); copy.setTransform(transform); - copy.setCopyEntities(!ignoreEntities); + copy.setCopyingEntities(!ignoreEntities); copy.setCopyBiomes((!ignoreBiomes) && (!(clipboard instanceof BlockArrayClipboard) || ((BlockArrayClipboard) clipboard).IMP.hasBiomes())); if (this.canApply != null) { copy.setFilterFunction(this.canApply);