Upstream/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-11-22 11:55:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Fix some flag issues"

Browse Source 
This reverts commit 8b741477
This commit is contained in:
MattBDev 2019-11-18 13:41:46 -05:00
parent 8b7414770f
commit d7aa4a0e1f
15 changed files with 44 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/BlockStateListFlag.java
View File

@ -18,8 +18,8 @@ public class BlockStateListFlag extends ListFlag<Set<BlockType>> {
super(Captions.FLAG_CATEGORY_BLOCK_LIST, name);
}
@Override public String valueToString(Set<BlockType> value) {
return StringMan.join(value, ",");
@Override public String valueToString(Object value) {
return StringMan.join((Set<BlockType>) value, ",");
}
@Override public Set<BlockType> parseValue(final String value) {

4
Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/BooleanFlag.java
View File

@ -9,8 +9,8 @@ public class BooleanFlag extends Flag<Boolean> {
super(Captions.FLAG_CATEGORY_BOOLEAN, name);
}
@Override public String valueToString(Boolean value) {
return value.toString();
@Override public String valueToString(Object value) {
return value + "";
}
@Override public Boolean parseValue(String value) {

2
Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/DoubleFlag.java
View File

@ -8,7 +8,7 @@ public class DoubleFlag extends Flag<Double> {
super(Captions.FLAG_CATEGORY_DECIMAL, name);
}
@Override public String valueToString(Double value) {
@Override public String valueToString(Object value) {
return value.toString();
}

4
Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/EnumFlag.java
View File

@ -15,8 +15,8 @@ public class EnumFlag extends Flag<String> {
this.values = new HashSet<>(Arrays.asList(values));
}
@Override public String valueToString(String value) {
return value;
@Override public String valueToString(Object value) {
return value.toString();
}
@Override public String parseValue(String value) {

2
Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/Flag.java
View File

@ -44,7 +44,7 @@ public abstract class Flag<V> implements StringComparison.StringComparable {
Flags.registerFlag(this);
}
public abstract String valueToString(V value);
public abstract String valueToString(Object value);
@Override public final String toString() {
return "Flag { name='" + getName() + "'}";

37
Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/GameModeFlag.java
View File

@ -2,38 +2,37 @@ package com.github.intellectualsites.plotsquared.plot.flag;
import com.github.intellectualsites.plotsquared.plot.config.Captions;
import com.github.intellectualsites.plotsquared.plot.util.PlotGameMode;
import com.sk89q.worldedit.world.gamemode.GameMode;
import com.sk89q.worldedit.world.gamemode.GameModes;
public class GameModeFlag extends Flag<GameMode> {
public class GameModeFlag extends Flag<PlotGameMode> {
public GameModeFlag(String name) {
super(Captions.FLAG_CATEGORY_GAMEMODE, name);
}
@Override public String valueToString(GameMode value) {
return value.getName();
@Override public String valueToString(Object value) {
return ((PlotGameMode) value).getName();
}
@Override public GameMode parseValue(String value) {
@Override public PlotGameMode parseValue(String value) {
switch (value.toLowerCase()) {
case "creative":
case "c":
case "1":
return GameModes.CREATIVE;
case "adventure":
case "a":
case "2":
return GameModes.ADVENTURE;
case "spectator":
case "sp":
case "3":
return GameModes.SPECTATOR;
case "survival":
case "s":
case "0":
return PlotGameMode.SURVIVAL;
case "creative":
case "c":
case "1":
return PlotGameMode.CREATIVE;
case "adventure":
case "a":
case "2":
return PlotGameMode.ADVENTURE;
case "spectator":
case "sp":
case "3":
return PlotGameMode.SPECTATOR;
default:
return GameModes.SURVIVAL;
return PlotGameMode.NOT_SET;
}
}

2
Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/IntegerFlag.java
View File

@ -13,7 +13,7 @@ public class IntegerFlag extends Flag<Integer> {
return Captions.FLAG_ERROR_INTEGER.getTranslated();
}
@Override public String valueToString(Integer value) {
@Override public String valueToString(Object value) {
return value.toString();
}

4
Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/IntegerListFlag.java
View File

@ -13,8 +13,8 @@ public class IntegerListFlag extends ListFlag<List<Integer>> {
super(Captions.FLAG_CATEGORY_INTEGER_LIST, name);
}
@Override public String valueToString(List<Integer> value) {
return StringMan.join(value, ",");
@Override public String valueToString(Object value) {
return StringMan.join((List<Integer>) value, ",");
}
@Override public List<Integer> parseValue(String value) {

2
Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/IntervalFlag.java
View File

@ -11,7 +11,7 @@ public class IntervalFlag extends Flag<IntervalFlag.Interval> {
super(Captions.FLAG_CATEGORY_INTERVALS, name);
}
@Override public String valueToString(IntervalFlag.Interval value) {
@Override public String valueToString(Object value) {
return value.toString();
}

8
Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/ItemTypeListFlag.java
View File

@ -21,8 +21,8 @@ public class ItemTypeListFlag extends ListFlag<Set<ItemType>> {
super(Captions.FLAG_CATEGORY_BLOCK_LIST, name);
}
@Override public String valueToString(Set<ItemType> value) {
return StringMan.join(value, ",");
@Override public String valueToString(Object value) {
return StringMan.join((Set<BlockType>) value, ",");
}
@Override public Set<ItemType> parseValue(final String value) {
@ -32,4 +32,8 @@ public class ItemTypeListFlag extends ListFlag<Set<ItemType>> {
@Override public String getValueDescription() {
return Captions.FLAG_ERROR_PLOTBLOCKLIST.getTranslated();
}
public boolean contains(Plot plot, BlockState value) {
return contains(plot, value.getBlockType().getItemType());
}
}

2
Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/LongFlag.java
View File

@ -16,7 +16,7 @@ public class LongFlag extends Flag<Long> {
}
}
@Override public String valueToString(Long value) {
@Override public String valueToString(Object value) {
return value.toString();
}

2
Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/PlotWeatherFlag.java
View File

@ -9,7 +9,7 @@ public class PlotWeatherFlag extends Flag<PlotWeather> {
super(Captions.FLAG_CATEGORY_WEATHER, name);
}
@Override public String valueToString(PlotWeather value) {
@Override public String valueToString(Object value) {
return value.toString();
}

2
Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/StringFlag.java
View File

@ -8,7 +8,7 @@ public class StringFlag extends Flag<String> {
super(Captions.FLAG_CATEGORY_STRING, name);
}
@Override public String valueToString(String value) {
@Override public String valueToString(Object value) {
return value.toString();
}

4
Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/StringListFlag.java
View File

@ -13,8 +13,8 @@ public class StringListFlag extends ListFlag<List<String>> {
super(Captions.FLAG_CATEGORY_STRING_LIST, name);
}
@Override public String valueToString(List<String> value) {
return StringMan.join(value, ",");
@Override public String valueToString(Object value) {
return StringMan.join((List<String>) value, ",");
}
@Override public List<String> parseValue(String value) {

3
Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/EventUtil.java
View File

@ -14,6 +14,9 @@ import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
import com.github.intellectualsites.plotsquared.plot.object.Rating;
import com.github.intellectualsites.plotsquared.plot.object.worlds.SinglePlotArea;
import com.github.intellectualsites.plotsquared.plot.util.expiry.ExpireManager;
import com.sk89q.worldedit.world.block.BlockState;
import com.sk89q.worldedit.world.block.BlockType;
import com.sk89q.worldedit.world.block.BlockTypes;
import com.sk89q.worldedit.world.item.ItemType;
import com.sk89q.worldedit.world.item.ItemTypes;
import org.jetbrains.annotations.Nullable;