Skip to content

Commit 12fcf20

Browse files
mbaxmbax
committed
Clean up
1 parent 8f7c581 commit 12fcf20

File tree

6 files changed

+26
-25
lines changed

6 files changed

+26
-25
lines changed

‎src/main/java/org/kitteh/spectastic/SpecCommand.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,11 +56,11 @@ public CommandResult execute(@Nonnull CommandSource commandSource, @Nonnull Comm
5656
}
5757
Player player = (Player) commandSource;
5858
GameMode gameMode = player.get(Keys.GAME_MODE).orElse(GameModes.SURVIVAL); // TODO fallback
59-
Optional<String> pastGameMode = player.get(Spectastic.PAST_GAMEMODE);
59+
Optional<String> pastGameMode = player.get(Spectastic.PAST_GAME_MODE);
6060
GameMode newGameMode;
6161
if (pastGameMode.isPresent()) {
6262
newGameMode = Sponge.getRegistry().getType(GameMode.class, pastGameMode.get()).orElse(GameModes.SURVIVAL); // TODO fallback
63-
player.remove(Spectastic.PAST_GAMEMODE);
63+
player.remove(Spectastic.PAST_GAME_MODE);
6464
player.remove(Spectastic.PAST_LOCATION_WORLD);
6565
player.remove(Spectastic.PAST_LOCATION_X);
6666
player.remove(Spectastic.PAST_LOCATION_Y);

‎src/main/java/org/kitteh/spectastic/Spectastic.java‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,12 +57,11 @@
5757
@Plugin(id = "spectastic", name = "Spectastic", version = "1.1.0-SNAPSHOT")
5858
public class Spectastic {
5959
public static final String PERMISSION_SPEC = "spectastic.spec";
60-
public static final Key<Value<String>> PAST_GAMEMODE = KeyFactory.makeSingleKey(String.class, Value.class, DataQuery.of("PastGameMode"));
60+
public static final Key<Value<String>> PAST_GAME_MODE = KeyFactory.makeSingleKey(String.class, Value.class, DataQuery.of("PastGameMode"));
6161
public static final Key<Value<String>> PAST_LOCATION_WORLD = KeyFactory.makeSingleKey(String.class, Value.class, DataQuery.of("PastLocationWorld"));
6262
public static final Key<Value<Double>> PAST_LOCATION_X = KeyFactory.makeSingleKey(Double.class, Value.class, DataQuery.of("PastLocationX"));
6363
public static final Key<Value<Double>> PAST_LOCATION_Y = KeyFactory.makeSingleKey(Double.class, Value.class, DataQuery.of("PastLocationY"));
6464
public static final Key<Value<Double>> PAST_LOCATION_Z = KeyFactory.makeSingleKey(Double.class, Value.class, DataQuery.of("PastLocationZ"));
65-
public static final String FALLBACK = "survival"; // TODO fallback
6665

6766
@Inject
6867
private Game game;
@@ -82,11 +81,11 @@ public void onGameInit(GameInitializationEvent event) {
8281
@Listener
8382
public void playerJoin(ClientConnectionEvent.Join event) {
8483
Player player = event.getTargetEntity();
85-
Optional<String> pastGameMode = player.get(Spectastic.PAST_GAMEMODE);
84+
Optional<String> pastGameMode = player.get(Spectastic.PAST_GAME_MODE);
8685
if (!player.hasPermission(PERMISSION_SPEC) && pastGameMode.isPresent()) {
8786
GameMode newGameMode = Sponge.getRegistry().getType(GameMode.class, pastGameMode.get()).orElse(GameModes.SURVIVAL); // TODO fallback
8887
player.offer(Keys.GAME_MODE, newGameMode);
89-
player.remove(Spectastic.PAST_GAMEMODE);
88+
player.remove(Spectastic.PAST_GAME_MODE);
9089
player.sendMessage(Text.of(TextColors.AQUA, "Having lost permission to /spectate, you are now in " + newGameMode.getName()));
9190
}
9291
}

‎src/main/java/org/kitteh/spectastic/data/gamemode/ImmutablePastGameModeData.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public class ImmutablePastGameModeData extends AbstractImmutableData<ImmutablePa
3737
private final String pastGameMode;
3838

3939
public ImmutablePastGameModeData() {
40-
this(Spectastic.FALLBACK);
40+
this(PastGameModeData.FALLBACK_GAME_MODE);
4141
}
4242

4343
public ImmutablePastGameModeData(String pastGameMode) {
@@ -47,13 +47,13 @@ public ImmutablePastGameModeData(String pastGameMode) {
4747

4848
@Override
4949
protected void registerGetters() {
50-
this.registerFieldGetter(Spectastic.PAST_GAMEMODE, () -> this.pastGameMode);
51-
registerKeyValue(Spectastic.PAST_GAMEMODE, this::pastGameMode);
50+
this.registerFieldGetter(Spectastic.PAST_GAME_MODE, () -> this.pastGameMode);
51+
registerKeyValue(Spectastic.PAST_GAME_MODE, this::pastGameMode);
5252
}
5353

5454
@Nonnull
5555
public ImmutableValue<String> pastGameMode() {
56-
return Sponge.getRegistry().getValueFactory().createValue(Spectastic.PAST_GAMEMODE, Spectastic.FALLBACK, this.pastGameMode).asImmutable();
56+
return Sponge.getRegistry().getValueFactory().createValue(Spectastic.PAST_GAME_MODE, PastGameModeData.FALLBACK_GAME_MODE, this.pastGameMode).asImmutable();
5757
}
5858

5959
@Nonnull
@@ -75,7 +75,7 @@ public int getContentVersion() {
7575
@Nonnull
7676
@Override
7777
public DataContainer toContainer() {
78-
return new MemoryDataContainer().set(Spectastic.PAST_GAMEMODE, this.pastGameMode);
78+
return new MemoryDataContainer().set(Spectastic.PAST_GAME_MODE, this.pastGameMode);
7979
}
8080

8181
@Nonnull

‎src/main/java/org/kitteh/spectastic/data/gamemode/PastGameModeData.java‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,12 @@
3737
import java.util.Optional;
3838

3939
public class PastGameModeData extends AbstractData<PastGameModeData, ImmutablePastGameModeData> {
40+
public static final String FALLBACK_GAME_MODE = "world";
41+
4042
private String pastGameMode;
4143

4244
public PastGameModeData() {
43-
this(Spectastic.FALLBACK);
45+
this(FALLBACK_GAME_MODE);
4446
}
4547

4648
public PastGameModeData(String pastGameMode) {
@@ -50,14 +52,14 @@ public PastGameModeData(String pastGameMode) {
5052

5153
@Nonnull
5254
public Value<String> pastGameMode() {
53-
return Sponge.getRegistry().getValueFactory().createValue(Spectastic.PAST_GAMEMODE, Spectastic.FALLBACK, this.pastGameMode);
55+
return Sponge.getRegistry().getValueFactory().createValue(Spectastic.PAST_GAME_MODE, FALLBACK_GAME_MODE, this.pastGameMode);
5456
}
5557

5658
@Override
5759
protected void registerGettersAndSetters() {
58-
this.registerFieldGetter(Spectastic.PAST_GAMEMODE, () -> this.pastGameMode);
59-
this.registerFieldSetter(Spectastic.PAST_GAMEMODE, value -> this.pastGameMode = Preconditions.checkNotNull(value));
60-
this.registerKeyValue(Spectastic.PAST_GAMEMODE, this::pastGameMode);
60+
this.registerFieldGetter(Spectastic.PAST_GAME_MODE, () -> this.pastGameMode);
61+
this.registerFieldSetter(Spectastic.PAST_GAME_MODE, value -> this.pastGameMode = Preconditions.checkNotNull(value));
62+
this.registerKeyValue(Spectastic.PAST_GAME_MODE, this::pastGameMode);
6163
}
6264

6365
@Nonnull
@@ -69,10 +71,10 @@ public Optional<PastGameModeData> fill(@Nonnull DataHolder dataHolder, @Nonnull
6971
@Nonnull
7072
@Override
7173
public Optional<PastGameModeData> from(@Nonnull DataContainer container) {
72-
if (!container.contains(Spectastic.PAST_GAMEMODE.getQuery())) {
74+
if (!container.contains(Spectastic.PAST_GAME_MODE.getQuery())) {
7375
return Optional.empty();
7476
}
75-
this.pastGameMode = container.getString(Spectastic.PAST_GAMEMODE.getQuery()).get();
77+
this.pastGameMode = container.getString(Spectastic.PAST_GAME_MODE.getQuery()).get();
7678
return Optional.of(this);
7779
}
7880

@@ -101,7 +103,7 @@ public int getContentVersion() {
101103
@Nonnull
102104
@Override
103105
public DataContainer toContainer() {
104-
return super.toContainer().set(Spectastic.PAST_GAMEMODE, this.pastGameMode);
106+
return super.toContainer().set(Spectastic.PAST_GAME_MODE, this.pastGameMode);
105107
}
106108

107109
@Nonnull

‎src/main/java/org/kitteh/spectastic/data/gamemode/PastGameModeDataManipulatorBuilder.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ public Optional<PastGameModeData> createFrom(@Nonnull DataHolder dataHolder) {
4949
@Override
5050
public Optional<PastGameModeData> build(@Nonnull DataView container) throws InvalidDataException {
5151
// TODO check content version once bumped
52-
if (container.contains(Spectastic.PAST_GAMEMODE)) {
53-
return Optional.of(new PastGameModeData(container.getString(Spectastic.PAST_GAMEMODE.getQuery()).get()));
52+
if (container.contains(Spectastic.PAST_GAME_MODE)) {
53+
return Optional.of(new PastGameModeData(container.getString(Spectastic.PAST_GAME_MODE.getQuery()).get()));
5454
}
5555
return Optional.empty();
5656
}

‎src/main/java/org/kitteh/spectastic/data/location/PastLocationData.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,10 @@
3838

3939
public class PastLocationData extends AbstractData<PastLocationData, ImmutablePastLocationData> {
4040
// TODO improve
41-
public static String FALLBACK_WORLD = "world";
42-
public static double FALLBACK_X = 0;
43-
public static double FALLBACK_Y = 70;
44-
public static double FALLBACK_Z = 0;
41+
public static final String FALLBACK_WORLD = "world";
42+
public static final double FALLBACK_X = 0;
43+
public static final double FALLBACK_Y = 70;
44+
public static final double FALLBACK_Z = 0;
4545

4646
public static int VERSION = 1;
4747

0 commit comments

Comments
 (0)