Skip to content

Commit

Permalink
Added the remaining translation nodes
Browse files Browse the repository at this point in the history
  • Loading branch information
@me4502
me4502 committed Nov 16, 2019
1 parent fc0fee3 commit 87fb9f6
Show file tree
Hide file tree
Showing 10 changed files with 147 additions and 43 deletions.
6 changes: 3 additions & 3 deletions worldedit-core/src/main/java/com/sk89q/worldedit/command/SelectionCommands.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -458,8 +458,8 @@ public void size(Actor actor, World world, LocalSession session,

actor.printInfo(TranslatableComponent.of("worldedit.size.type", TextComponent.of(session.getRegionSelector(world).getTypeName())));

for (String line : session.getRegionSelector(world).getInformationLines()) {
actor.printInfo(TextComponent.of(line));
for (Component line : session.getRegionSelector(world).getSelectionInfoLines()) {
actor.print(line);
}
}
BlockVector3 size = region.getMaximumPoint()
Expand Down Expand Up @@ -531,7 +531,7 @@ public void distr(Actor actor, World world, LocalSession session,
BlockDistributionResult res = new BlockDistributionResult(distribution, separateStates);
if (!actor.isPlayer()) res.formatForConsole();
return res.create(finalPage);
}, null);
}, (Component) null);
}

@Command(
Expand Down
14 changes: 14 additions & 0 deletions worldedit-core/src/main/java/com/sk89q/worldedit/regions/RegionSelector.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,12 @@
import com.sk89q.worldedit.extension.platform.Actor;
import com.sk89q.worldedit.math.BlockVector3;
import com.sk89q.worldedit.regions.selector.limit.SelectorLimits;
import com.sk89q.worldedit.util.formatting.text.Component;
import com.sk89q.worldedit.util.formatting.text.TextComponent;
import com.sk89q.worldedit.world.World;

import java.util.List;
import java.util.stream.Collectors;

import javax.annotation.Nullable;

Expand Down Expand Up @@ -154,6 +157,17 @@ public interface RegionSelector {
*
* @return a list of lines describing the region
*/
@Deprecated
List<String> getInformationLines();

/**
* Get lines of information about the selection.
*
* @return a list of lines describing the region.
*/
default List<Component> getSelectionInfoLines() {
return getInformationLines().stream()
.map(TextComponent::of)
.collect(Collectors.toList());
}
}
16 changes: 9 additions & 7 deletions ...re/src/main/java/com/sk89q/worldedit/regions/selector/ConvexPolyhedralRegionSelector.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,9 @@
import com.sk89q.worldedit.regions.RegionSelector;
import com.sk89q.worldedit.regions.polyhedron.Triangle;
import com.sk89q.worldedit.regions.selector.limit.SelectorLimits;
import com.sk89q.worldedit.util.formatting.text.Component;
import com.sk89q.worldedit.util.formatting.text.TextComponent;
import com.sk89q.worldedit.util.formatting.text.TranslatableComponent;
import com.sk89q.worldedit.world.World;

import java.util.ArrayList;
Expand Down Expand Up @@ -182,16 +185,15 @@ public String getTypeName() {
}

@Override
public List<String> getInformationLines() {
List<String> ret = new ArrayList<>();
public List<Component> getSelectionInfoLines() {
List<Component> ret = new ArrayList<>();

ret.add("Vertices: "+region.getVertices().size());
ret.add("Triangles: "+region.getTriangles().size());
ret.add(TranslatableComponent.of("worldedit.selection.convex.info.vertices", TextComponent.of(region.getVertices().size())));
ret.add(TranslatableComponent.of("worldedit.selection.convex.info.triangles", TextComponent.of(region.getTriangles().size())));

return ret;
}


@Override
public void explainPrimarySelection(Actor player, LocalSession session, BlockVector3 pos) {
checkNotNull(player);
Expand All @@ -200,7 +202,7 @@ public void explainPrimarySelection(Actor player, LocalSession session, BlockVec

session.describeCUI(player);

player.print("Started new selection with vertex "+pos+".");
player.printInfo(TranslatableComponent.of("worldedit.selection.convex.explain.primary", TextComponent.of(pos.toString())));
}

@Override
Expand All @@ -211,7 +213,7 @@ public void explainSecondarySelection(Actor player, LocalSession session, BlockV

session.describeCUI(player);

player.print("Added vertex " + pos + " to the selection.");
player.printInfo(TranslatableComponent.of("worldedit.selection.convex.explain.secondary", TextComponent.of(pos.toString())));
}

@Override
Expand Down
31 changes: 21 additions & 10 deletions worldedit-core/src/main/java/com/sk89q/worldedit/regions/selector/CuboidRegionSelector.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,9 @@
import com.sk89q.worldedit.regions.Region;
import com.sk89q.worldedit.regions.RegionSelector;
import com.sk89q.worldedit.regions.selector.limit.SelectorLimits;
import com.sk89q.worldedit.util.formatting.text.Component;
import com.sk89q.worldedit.util.formatting.text.TextComponent;
import com.sk89q.worldedit.util.formatting.text.TranslatableComponent;
import com.sk89q.worldedit.world.World;

import java.util.ArrayList;
Expand Down Expand Up @@ -154,9 +157,13 @@ public void explainPrimarySelection(Actor player, LocalSession session, BlockVec
checkNotNull(pos);

if (position1 != null && position2 != null) {
player.print("First position set to " + position1 + " (" + region.getArea() + ").");
} else {
player.print("First position set to " + position1 + ".");
player.printInfo(TranslatableComponent.of(
"worldedit.selection.cuboid.explain.primary-area",
TextComponent.of(position1.toString()),
TextComponent.of(region.getArea())
));
} else if (position1 != null) {
player.printInfo(TranslatableComponent.of("worldedit.selection.cuboid.explain.primary", TextComponent.of(position1.toString())));
}

session.dispatchCUIEvent(player, new SelectionPointEvent(0, pos, getArea()));
Expand All @@ -169,9 +176,13 @@ public void explainSecondarySelection(Actor player, LocalSession session, BlockV
checkNotNull(pos);

if (position1 != null && position2 != null) {
player.print("Second position set to " + position2 + " (" + region.getArea() + ").");
} else {
player.print("Second position set to " + position2 + ".");
player.printInfo(TranslatableComponent.of(
"worldedit.selection.cuboid.explain.secondary-area",
TextComponent.of(position2.toString()),
TextComponent.of(region.getArea())
));
} else if (position2 != null) {
player.printInfo(TranslatableComponent.of("worldedit.selection.cuboid.explain.secondary", TextComponent.of(position2.toString())));
}

session.dispatchCUIEvent(player, new SelectionPointEvent(1, pos, getArea()));
Expand Down Expand Up @@ -241,15 +252,15 @@ public String getTypeName() {
}

@Override
public List<String> getInformationLines() {
final List<String> lines = new ArrayList<>();
public List<Component> getSelectionInfoLines() {
final List<Component> lines = new ArrayList<>();

if (position1 != null) {
lines.add("Position 1: " + position1);
lines.add(TranslatableComponent.of("worldedit.selection.cuboid.info.pos1", TextComponent.of(position1.toString())));
}

if (position2 != null) {
lines.add("Position 2: " + position2);
lines.add(TranslatableComponent.of("worldedit.selection.cuboid.info.pos2", TextComponent.of(position2.toString())));
}

return lines;
Expand Down
22 changes: 15 additions & 7 deletions ...dedit-core/src/main/java/com/sk89q/worldedit/regions/selector/CylinderRegionSelector.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,9 @@
import com.sk89q.worldedit.regions.Region;
import com.sk89q.worldedit.regions.RegionSelector;
import com.sk89q.worldedit.regions.selector.limit.SelectorLimits;
import com.sk89q.worldedit.util.formatting.text.Component;
import com.sk89q.worldedit.util.formatting.text.TextComponent;
import com.sk89q.worldedit.util.formatting.text.TranslatableComponent;
import com.sk89q.worldedit.world.World;

import java.text.NumberFormat;
Expand Down Expand Up @@ -166,7 +169,7 @@ public boolean selectSecondary(BlockVector3 position, SelectorLimits limits) {

@Override
public void explainPrimarySelection(Actor player, LocalSession session, BlockVector3 pos) {
player.print("Starting a new cylindrical selection at " + pos + ".");
player.printInfo(TranslatableComponent.of("worldedit.selection.cylinder.explain.primary", TextComponent.of(pos.toString())));

session.describeCUI(player);
}
Expand All @@ -176,9 +179,14 @@ public void explainSecondarySelection(Actor player, LocalSession session, BlockV
Vector3 center = region.getCenter();

if (!center.equals(Vector3.ZERO)) {
player.print("Radius set to " + NUMBER_FORMAT.format(region.getRadius().getX()) + "/" + NUMBER_FORMAT.format(region.getRadius().getZ()) + " blocks. (" + region.getArea() + ").");
player.printInfo(TranslatableComponent.of(
"worldedit.selection.cylinder.explain.secondary",
TextComponent.of(NUMBER_FORMAT.format(region.getRadius().getX())),
TextComponent.of(NUMBER_FORMAT.format(region.getRadius().getZ())),
TextComponent.of(region.getArea())
));
} else {
player.printError("You must select the center point before setting the radius.");
player.printError(TranslatableComponent.of("worldedit.selection.cylinder.explain.secondary-missing"));
return;
}

Expand Down Expand Up @@ -233,14 +241,14 @@ public String getTypeName() {
}

@Override
public List<String> getInformationLines() {
final List<String> lines = new ArrayList<>();
public List<Component> getSelectionInfoLines() {
final List<Component> lines = new ArrayList<>();

if (!region.getCenter().equals(Vector3.ZERO)) {
lines.add("Center: " + region.getCenter());
lines.add(TranslatableComponent.of("worldedit.selection.cylinder.info.center", TextComponent.of(region.getCenter().toString())));
}
if (!region.getRadius().equals(Vector2.ZERO)) {
lines.add("Radius: " + region.getRadius());
lines.add(TranslatableComponent.of("worldedit.selection.cylinder.info.radius", TextComponent.of(region.getRadius().toString())));
}

return lines;
Expand Down
33 changes: 25 additions & 8 deletions ...edit-core/src/main/java/com/sk89q/worldedit/regions/selector/EllipsoidRegionSelector.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,9 @@
import com.sk89q.worldedit.regions.Region;
import com.sk89q.worldedit.regions.RegionSelector;
import com.sk89q.worldedit.regions.selector.limit.SelectorLimits;
import com.sk89q.worldedit.util.formatting.text.Component;
import com.sk89q.worldedit.util.formatting.text.TextComponent;
import com.sk89q.worldedit.util.formatting.text.TranslatableComponent;
import com.sk89q.worldedit.world.World;

import java.util.ArrayList;
Expand Down Expand Up @@ -145,9 +148,16 @@ public boolean selectSecondary(BlockVector3 position, SelectorLimits limits) {
@Override
public void explainPrimarySelection(Actor player, LocalSession session, BlockVector3 pos) {
if (isDefined()) {
player.print("Center position set to " + region.getCenter() + " (" + region.getArea() + ").");
player.printInfo(TranslatableComponent.of(
"worldedit.selection.ellipsoid.explain.primary-area",
TextComponent.of(region.getCenter().toString()),
TextComponent.of(region.getArea())
));
} else {
player.print("Center position set to " + region.getCenter() + ".");
player.printInfo(TranslatableComponent.of(
"worldedit.selection.ellipsoid.explain.primary",
TextComponent.of(region.getCenter().toString())
));
}

session.describeCUI(player);
Expand All @@ -156,9 +166,16 @@ public void explainPrimarySelection(Actor player, LocalSession session, BlockVec
@Override
public void explainSecondarySelection(Actor player, LocalSession session, BlockVector3 pos) {
if (isDefined()) {
player.print("Radius set to " + region.getRadius() + " (" + region.getArea() + ").");
player.printInfo(TranslatableComponent.of(
"worldedit.selection.ellipsoid.explain.secondary-area",
TextComponent.of(region.getRadius().toString()),
TextComponent.of(region.getArea())
));
} else {
player.print("Radius set to " + region.getRadius() + ".");
player.printInfo(TranslatableComponent.of(
"worldedit.selection.ellipsoid.explain.secondary",
TextComponent.of(region.getRadius().toString())
));
}

session.describeCUI(player);
Expand Down Expand Up @@ -204,17 +221,17 @@ public String getTypeName() {
}

@Override
public List<String> getInformationLines() {
final List<String> lines = new ArrayList<>();
public List<Component> getSelectionInfoLines() {
final List<Component> lines = new ArrayList<>();

final Vector3 center = region.getCenter();
if (center.lengthSq() > 0) {
lines.add("Center: " + center);
lines.add(TranslatableComponent.of("worldedit.selection.ellipsoid.info.center", TextComponent.of(center.toString())));
}

final Vector3 radius = region.getRadius();
if (radius.lengthSq() > 0) {
lines.add("X/Y/Z radius: " + radius);
lines.add(TranslatableComponent.of("worldedit.selection.ellipsoid.info.radius", TextComponent.of(radius.toString())));
}

return lines;
Expand Down
14 changes: 12 additions & 2 deletions ...ore/src/main/java/com/sk89q/worldedit/regions/selector/ExtendingCuboidRegionSelector.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@
import com.sk89q.worldedit.math.BlockVector3;
import com.sk89q.worldedit.regions.RegionSelector;
import com.sk89q.worldedit.regions.selector.limit.SelectorLimits;
import com.sk89q.worldedit.util.formatting.text.TextComponent;
import com.sk89q.worldedit.util.formatting.text.TranslatableComponent;
import com.sk89q.worldedit.world.World;

import javax.annotation.Nullable;
Expand Down Expand Up @@ -129,14 +131,22 @@ public boolean selectSecondary(BlockVector3 position, SelectorLimits limits) {

@Override
public void explainPrimarySelection(Actor player, LocalSession session, BlockVector3 pos) {
player.print("Started selection at " + pos + " (" + region.getArea() + ").");
player.printInfo(TranslatableComponent.of(
"worldedit.selection.extend.explain.primary",
TextComponent.of(pos.toString()),
TextComponent.of(region.getArea())
));

explainRegionAdjust(player, session);
}

@Override
public void explainSecondarySelection(Actor player, LocalSession session, BlockVector3 pos) {
player.print("Extended selection to encompass " + pos + " (" + region.getArea() + ").");
player.printInfo(TranslatableComponent.of(
"worldedit.selection.extend.explain.secondary",
TextComponent.of(pos.toString()),
TextComponent.of(region.getArea())
));

explainRegionAdjust(player, session);
}
Expand Down
15 changes: 11 additions & 4 deletions ...it-core/src/main/java/com/sk89q/worldedit/regions/selector/Polygonal2DRegionSelector.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,9 @@
import com.sk89q.worldedit.regions.Region;
import com.sk89q.worldedit.regions.RegionSelector;
import com.sk89q.worldedit.regions.selector.limit.SelectorLimits;
import com.sk89q.worldedit.util.formatting.text.Component;
import com.sk89q.worldedit.util.formatting.text.TextComponent;
import com.sk89q.worldedit.util.formatting.text.TranslatableComponent;
import com.sk89q.worldedit.world.World;

import java.util.Collections;
Expand Down Expand Up @@ -163,7 +166,7 @@ public boolean selectSecondary(BlockVector3 position, SelectorLimits limits) {

@Override
public void explainPrimarySelection(Actor player, LocalSession session, BlockVector3 pos) {
player.print("Starting a new polygon at " + pos + ".");
player.printInfo(TranslatableComponent.of("worldedit.selection.polygon2d.explain.primary", TextComponent.of(pos.toString())));

session.dispatchCUIEvent(player, new SelectionShapeEvent(getTypeID()));
session.dispatchCUIEvent(player, new SelectionPoint2DEvent(0, pos, getArea()));
Expand All @@ -172,7 +175,11 @@ public void explainPrimarySelection(Actor player, LocalSession session, BlockVec

@Override
public void explainSecondarySelection(Actor player, LocalSession session, BlockVector3 pos) {
player.print("Added point #" + region.size() + " at " + pos + ".");
player.printInfo(TranslatableComponent.of(
"worldedit.selection.polygon2d.explain.secondary",
TextComponent.of(region.size()),
TextComponent.of(pos.toString())
));

session.dispatchCUIEvent(player, new SelectionPoint2DEvent(region.size() - 1, pos, getArea()));
session.dispatchCUIEvent(player, new SelectionMinMaxEvent(region.getMinimumY(), region.getMaximumY()));
Expand Down Expand Up @@ -230,8 +237,8 @@ public String getTypeName() {
}

@Override
public List<String> getInformationLines() {
return Collections.singletonList("# points: " + region.size());
public List<Component> getSelectionInfoLines() {
return Collections.singletonList(TranslatableComponent.of("worldedit.selection.polygon2d.info", TextComponent.of(region.size())));
}

@Override
Expand Down
10 changes: 8 additions & 2 deletions worldedit-core/src/main/java/com/sk89q/worldedit/regions/selector/SphereRegionSelector.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@
import com.sk89q.worldedit.math.Vector3;
import com.sk89q.worldedit.regions.RegionSelector;
import com.sk89q.worldedit.regions.selector.limit.SelectorLimits;
import com.sk89q.worldedit.util.formatting.text.TextComponent;
import com.sk89q.worldedit.util.formatting.text.TranslatableComponent;
import com.sk89q.worldedit.world.World;

import javax.annotation.Nullable;
Expand Down Expand Up @@ -88,9 +90,13 @@ public boolean selectSecondary(BlockVector3 position, SelectorLimits limits) {
@Override
public void explainSecondarySelection(Actor player, LocalSession session, BlockVector3 pos) {
if (isDefined()) {
player.print("Radius set to " + region.getRadius().getX() + " (" + region.getArea() + ").");
player.printInfo(TranslatableComponent.of(
"worldedit.selection.sphere.explain.secondary-defined",
TextComponent.of(region.getRadius().getX()),
TextComponent.of(region.getArea())
));
} else {
player.print("Radius set to " + region.getRadius().getX() + ".");
player.printInfo(TranslatableComponent.of("worldedit.selection.sphere.explain.secondary", TextComponent.of(region.getRadius().getX())));
}

session.describeCUI(player);
Expand Down
Loading

0 comments on commit 87fb9f6

Please sign in to comment.