Skip to content

Commit d7d1485

Browse files
committed
Restore more backwards compatibility
1 parent a7037be commit d7d1485

20 files changed

Lines changed: 65 additions & 25 deletions

worldedit-core/src/main/java/com/sk89q/worldedit/command/ClipboardCommands.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ public void copy(Actor actor, LocalSession session, EditSession editSession,
104104
Operations.completeLegacy(copy);
105105
session.setClipboard(new ClipboardHolder(clipboard));
106106

107-
copy.getStatusMessages().forEach(actor::print);
107+
copy.getMessages().forEach(actor::print);
108108
}
109109

110110
@Command(
@@ -137,7 +137,7 @@ public void cut(Actor actor, LocalSession session, EditSession editSession,
137137
Operations.completeLegacy(copy);
138138
session.setClipboard(new ClipboardHolder(clipboard));
139139

140-
copy.getStatusMessages().forEach(actor::print);
140+
copy.getMessages().forEach(actor::print);
141141
}
142142

143143
@Command(
@@ -182,7 +182,7 @@ public void paste(Actor actor, World world, LocalSession session, EditSession ed
182182
.maskSource(sourceMask)
183183
.build();
184184
Operations.completeLegacy(operation);
185-
messages.addAll(Lists.newArrayList(operation.getStatusMessages()));
185+
messages.addAll(Lists.newArrayList(operation.getMessages()));
186186
}
187187

188188
if (selectPasted || onlySelect) {

worldedit-core/src/main/java/com/sk89q/worldedit/command/GeneralCommands.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -429,7 +429,7 @@ private static void placementImpl(Actor actor, LocalSession session, Placement p
429429
}
430430

431431
session.setPlacement(placement);
432-
actor.printInfo(placement.getInfo());
432+
actor.printInfo(placement.getInformation());
433433
}
434434

435435
@Command(

worldedit-core/src/main/java/com/sk89q/worldedit/command/RegionCommands.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ public int set(Actor actor, EditSession editSession,
103103
RegionVisitor visitor = new RegionVisitor(region, set);
104104

105105
Operations.completeBlindly(visitor);
106-
List<Component> messages = Lists.newArrayList(visitor.getStatusMessages());
106+
List<Component> messages = Lists.newArrayList(visitor.getMessages());
107107
if (messages.isEmpty()) {
108108
actor.printInfo(Component.translatable("worldedit.set.done"));
109109
} else {

worldedit-core/src/main/java/com/sk89q/worldedit/command/SelectionCommands.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ public void pos(Actor actor, World world, LocalSession session,
156156

157157
session.dispatchCUISelection(actor);
158158

159-
for (Component line : regionSelector.getSelectionInfoLines()) {
159+
for (Component line : regionSelector.getSelectionInformationLines()) {
160160
actor.printInfo(line);
161161
}
162162
actor.printInfo(Component.translatable("worldedit.selection.updated"));
@@ -661,7 +661,7 @@ public void size(Actor actor, World world, LocalSession session,
661661

662662
actor.printInfo(Component.translatable("worldedit.size.type", Component.text(session.getRegionSelector(world).getTypeName())));
663663

664-
for (Component line : session.getRegionSelector(world).getSelectionInfoLines()) {
664+
for (Component line : session.getRegionSelector(world).getSelectionInformationLines()) {
665665
actor.printInfo(line);
666666
}
667667
}

worldedit-core/src/main/java/com/sk89q/worldedit/function/factory/Deform.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ public void cancel() {
189189

190190

191191
@Override
192-
public Iterable<Component> getStatusMessages() {
192+
public Iterable<Component> getMessages() {
193193
return ImmutableList.of(Component.translatable("worldedit.operation.deform.expression",
194194
Component.text(expression.getSource()).color(NamedTextColor.LIGHT_PURPLE)));
195195
}

worldedit-core/src/main/java/com/sk89q/worldedit/function/operation/DelegateOperation.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,8 @@ public void cancel() {
6060
}
6161

6262
@Override
63-
public Iterable<Component> getStatusMessages() {
64-
return Iterables.concat(original.getStatusMessages(), delegate.getStatusMessages());
63+
public Iterable<Component> getMessages() {
64+
return Iterables.concat(original.getMessages(), delegate.getMessages());
6565
}
6666

6767
}

worldedit-core/src/main/java/com/sk89q/worldedit/function/operation/ForwardExtentCopy.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -331,7 +331,7 @@ public void cancel() {
331331
}
332332

333333
@Override
334-
public Iterable<Component> getStatusMessages() {
334+
public Iterable<Component> getMessages() {
335335
return ImmutableList.of(
336336
Component.translatable("worldedit.operation.affected.block",
337337
Component.text(affectedBlocks)).color(NamedTextColor.LIGHT_PURPLE),

worldedit-core/src/main/java/com/sk89q/worldedit/function/operation/Operation.java

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,10 @@
2222
import com.sk89q.worldedit.WorldEdit;
2323
import com.sk89q.worldedit.WorldEditException;
2424
import com.sk89q.worldedit.util.adventure.text.Component;
25+
import com.sk89q.worldedit.util.formatting.LegacyTextHelper;
2526

2627
import java.util.ArrayList;
28+
import java.util.Collections;
2729
import java.util.HashSet;
2830
import java.util.List;
2931
import java.util.Set;
@@ -78,8 +80,29 @@ default void addStatusMessages(List<String> messages) {
7880
* operation.
7981
*
8082
* @return The status messages
83+
* @deprecated use {@link #getMessages()} instead. default implementation returns an empty list.
8184
*/
82-
default Iterable<Component> getStatusMessages() {
85+
@Deprecated
86+
default Iterable<com.sk89q.worldedit.util.formatting.text.Component> getStatusMessages() {
87+
return Collections.emptyList();
88+
}
89+
/**
90+
* Gets an iterable of messages that describe the current status of the
91+
* operation.
92+
*
93+
* @return The status messages
94+
*/
95+
default Iterable<Component> getMessages() {
96+
// TODO Remove legacy code for text3 Components with WorldEdit 8.0.0
97+
Iterable<com.sk89q.worldedit.util.formatting.text.Component> legacyComponents = getStatusMessages();
98+
if (legacyComponents.iterator().hasNext()) {
99+
List<Component> components = new ArrayList<>();
100+
for (com.sk89q.worldedit.util.formatting.text.Component legacyComponent : legacyComponents) {
101+
components.add(LegacyTextHelper.adapt(legacyComponent));
102+
}
103+
return components;
104+
}
105+
83106
// TODO Remove legacy code WorldEdit 8.0.0
84107
List<String> oldMessages = new ArrayList<>();
85108
addStatusMessages(oldMessages);

worldedit-core/src/main/java/com/sk89q/worldedit/function/operation/OperationQueue.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,8 +107,8 @@ public void cancel() {
107107
}
108108

109109
@Override
110-
public Iterable<Component> getStatusMessages() {
111-
return Iterables.concat(operations.stream().map(Operation::getStatusMessages).toList());
110+
public Iterable<Component> getMessages() {
111+
return Iterables.concat(operations.stream().map(Operation::getMessages).toList());
112112
}
113113

114114
}

worldedit-core/src/main/java/com/sk89q/worldedit/function/visitor/BreadthFirstSearch.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ public void cancel() {
184184
}
185185

186186
@Override
187-
public Iterable<Component> getStatusMessages() {
187+
public Iterable<Component> getMessages() {
188188
return ImmutableList.of(Component.translatable(
189189
"worldedit.operation.affected.block",
190190
Component.text(getAffected())

0 commit comments

Comments
 (0)