Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion SpongeAPI
1 change: 1 addition & 0 deletions src/main/java/org/spongepowered/common/SpongeCommon.java
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ public final class SpongeCommon {
private static final Logger LOGGER = LogManager.getLogger(Launch.instance().id());
private static final SpongeMinecraftVersion MINECRAFT_VERSION = new SpongeMinecraftVersion(
SharedConstants.getCurrentVersion().getName(),
SharedConstants.getCurrentVersion().getId(),
SharedConstants.getCurrentVersion().getProtocolVersion()
);

Expand Down
13 changes: 13 additions & 0 deletions src/main/java/org/spongepowered/common/SpongeMinecraftVersion.java
Original file line number Diff line number Diff line change
Expand Up @@ -25,18 +25,26 @@
package org.spongepowered.common;

import net.minecraft.SharedConstants;
import org.checkerframework.checker.nullness.qual.Nullable;
import org.spongepowered.api.MinecraftVersion;

import java.util.Optional;
import java.util.OptionalInt;
import java.util.StringJoiner;

public final class SpongeMinecraftVersion implements MinecraftVersion {

private final String name;
private final @Nullable String id;
private final int protocol;

public SpongeMinecraftVersion(String name, int protocol) {
this(name, null, protocol);
}

public SpongeMinecraftVersion(String name, @Nullable String id, int protocol) {
this.name = name;
this.id = id;
this.protocol = protocol;
}

Expand All @@ -45,6 +53,11 @@ public String name() {
return this.name;
}

@Override
public Optional<String> id() {
return Optional.ofNullable(this.id);
}

@Override
public int protocolVersion() {
return this.protocol;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@

import org.spongepowered.api.MinecraftVersion;

import java.util.Optional;
import java.util.OptionalInt;

public class SpongeLegacyMinecraftVersion implements MinecraftVersion {
Expand All @@ -52,6 +53,11 @@ public String name() {
return this.name;
}

@Override
public Optional<String> id() {
return Optional.empty();
}

@Override
public int protocolVersion() {
return this.latestVersion;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,11 @@ public String name() {
return this.name;
}

@Override
public Optional<String> id() {
return Optional.empty();
}

@Override
public void setName(String name) {
this.name = Objects.requireNonNull(name, "name");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow;

import java.util.Optional;
import java.util.OptionalInt;

@Mixin(ServerStatus.Version.class)
Expand All @@ -45,6 +46,11 @@ public String name() {
return this.name;
}

@Override
public Optional<String> id() {
return Optional.empty();
}

@Override
public int protocolVersion() {
return this.protocol;
Expand Down