Skip to content

Commit 3b69ff0

Browse files
authored
Add MinecraftVersion#id (#4256)
1 parent 8a14ed8 commit 3b69ff0

File tree

6 files changed

+32
-1
lines changed

6 files changed

+32
-1
lines changed

src/main/java/org/spongepowered/common/SpongeCommon.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ public final class SpongeCommon {
5353
private static final Logger LOGGER = LogManager.getLogger(Launch.instance().id());
5454
private static final SpongeMinecraftVersion MINECRAFT_VERSION = new SpongeMinecraftVersion(
5555
SharedConstants.getCurrentVersion().getName(),
56+
SharedConstants.getCurrentVersion().getId(),
5657
SharedConstants.getCurrentVersion().getProtocolVersion()
5758
);
5859

src/main/java/org/spongepowered/common/SpongeMinecraftVersion.java

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,18 +25,26 @@
2525
package org.spongepowered.common;
2626

2727
import net.minecraft.SharedConstants;
28+
import org.checkerframework.checker.nullness.qual.Nullable;
2829
import org.spongepowered.api.MinecraftVersion;
2930

31+
import java.util.Optional;
3032
import java.util.OptionalInt;
3133
import java.util.StringJoiner;
3234

3335
public final class SpongeMinecraftVersion implements MinecraftVersion {
3436

3537
private final String name;
38+
private final @Nullable String id;
3639
private final int protocol;
3740

3841
public SpongeMinecraftVersion(String name, int protocol) {
42+
this(name, null, protocol);
43+
}
44+
45+
public SpongeMinecraftVersion(String name, @Nullable String id, int protocol) {
3946
this.name = name;
47+
this.id = id;
4048
this.protocol = protocol;
4149
}
4250

@@ -45,6 +53,11 @@ public String name() {
4553
return this.name;
4654
}
4755

56+
@Override
57+
public Optional<String> id() {
58+
return Optional.ofNullable(this.id);
59+
}
60+
4861
@Override
4962
public int protocolVersion() {
5063
return this.protocol;

src/main/java/org/spongepowered/common/network/status/SpongeLegacyMinecraftVersion.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626

2727
import org.spongepowered.api.MinecraftVersion;
2828

29+
import java.util.Optional;
2930
import java.util.OptionalInt;
3031

3132
public class SpongeLegacyMinecraftVersion implements MinecraftVersion {
@@ -52,6 +53,11 @@ public String name() {
5253
return this.name;
5354
}
5455

56+
@Override
57+
public Optional<String> id() {
58+
return Optional.empty();
59+
}
60+
5561
@Override
5662
public int protocolVersion() {
5763
return this.latestVersion;

src/main/java/org/spongepowered/common/network/status/SpongeStatusResponse.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,11 @@ public String name() {
145145
return this.name;
146146
}
147147

148+
@Override
149+
public Optional<String> id() {
150+
return Optional.empty();
151+
}
152+
148153
@Override
149154
public void setName(String name) {
150155
this.name = Objects.requireNonNull(name, "name");

src/mixins/java/org/spongepowered/common/mixin/api/minecraft/network/protocol/status/ServerStatus_VersionMixin_API.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
import org.spongepowered.asm.mixin.Mixin;
3131
import org.spongepowered.asm.mixin.Shadow;
3232

33+
import java.util.Optional;
3334
import java.util.OptionalInt;
3435

3536
@Mixin(ServerStatus.Version.class)
@@ -45,6 +46,11 @@ public String name() {
4546
return this.name;
4647
}
4748

49+
@Override
50+
public Optional<String> id() {
51+
return Optional.empty();
52+
}
53+
4854
@Override
4955
public int protocolVersion() {
5056
return this.protocol;

0 commit comments

Comments
 (0)