Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2025-07-12 08:28:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: allow captions in SuggestInputParseException (#2239)

Browse Source 
- Deprecate for removal methods using string message
 - Fixes #2026
This commit is contained in:
Jordan
2023-05-22 19:32:56 +01:00
committed by GitHub
parent 74aff920a8
commit 7c01c1e95e
6 changed files with 76 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockState.java
View File

@ -20,6 +20,7 @@
package com.sk89q.worldedit.world.block;
import com.fastasyncworldedit.core.command.SuggestInputParseException;
import com.fastasyncworldedit.core.configuration.Caption;
import com.fastasyncworldedit.core.function.mask.SingleBlockStateMask;
import com.fastasyncworldedit.core.queue.ITileInput;
import com.fastasyncworldedit.core.registry.state.PropertyKey;
@ -43,6 +44,7 @@ import com.sk89q.worldedit.math.BlockVector3;
import com.sk89q.worldedit.registry.state.AbstractProperty;
import com.sk89q.worldedit.registry.state.Property;
import com.sk89q.worldedit.util.concurrency.LazyReference;
import com.sk89q.worldedit.util.formatting.text.TextComponent;
import com.sk89q.worldedit.util.nbt.CompoundBinaryTag;
import com.sk89q.worldedit.world.registry.BlockMaterial;
@ -150,7 +152,7 @@ public class BlockState implements BlockStateHolder<BlockState>, Pattern {
type = BlockTypes.get(key);
if (type == null) {
String input = key.toString();
throw new SuggestInputParseException("Does not match a valid block type: " + input, input, () -> Stream.of(
throw new SuggestInputParseException(Caption.of("fawe.error.invalid-block-type", TextComponent.of(input)), () -> Stream.of(
BlockTypesCache.values)
.map(BlockType::getId)
.filter(id -> StringMan.blockStateMatches(input, id))
@ -211,8 +213,7 @@ public class BlockState implements BlockStateHolder<BlockState>, Pattern {
String input = charSequence.toString();
BlockType finalType = type;
throw new SuggestInputParseException(
"Invalid property " + key + ":" + input + " for type " + type,
input,
Caption.of("worldedit.error.parser.unknown-property", key + ":" + input, type),
() ->
finalType.getProperties().stream()
.map(Property::getName)
@ -222,8 +223,7 @@ public class BlockState implements BlockStateHolder<BlockState>, Pattern {
);
} else {
throw new SuggestInputParseException(
"No operator for " + state,
"",
Caption.of("fawe.error.no-operator-for-input", state),
() -> Collections.singletonList("=")
);
}

4
worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockTypes.java
View File

@ -20,9 +20,11 @@
package com.sk89q.worldedit.world.block;
import com.fastasyncworldedit.core.command.SuggestInputParseException;
import com.fastasyncworldedit.core.configuration.Caption;
import com.fastasyncworldedit.core.util.StringMan;
import com.sk89q.worldedit.extension.input.InputParseException;
import com.sk89q.worldedit.extension.input.ParserContext;
import com.sk89q.worldedit.util.formatting.text.TextComponent;
import com.sk89q.worldedit.world.registry.LegacyMapper;
import javax.annotation.Nullable;
@ -1967,7 +1969,7 @@ public final class BlockTypes {
}
}
throw new SuggestInputParseException("Does not match a valid block type: " + inputLower, inputLower, () -> Stream.of(
throw new SuggestInputParseException(Caption.of("fawe.error.invalid-block-type", TextComponent.of(input)), () -> Stream.of(
BlockTypesCache.values)
.filter(b -> StringMan.blockStateMatches(inputLower, b.getId()))
.map(BlockType::getId)