Jika/oc2r
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Append extra name instead of prefixing it.

Browse Source
This commit is contained in:
Florian Nücke
2020-12-01 02:43:03 +01:00
parent 5658a9367f
commit 62396f158f
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/li/cil/oc2/common/device/IdentifiableDeviceImpl.java
View File

@@ -12,16 +12,16 @@ import java.util.*;
public final class IdentifiableDeviceImpl implements IdentifiableDevice {
private final LazyOptional<? extends Device> device;
private final UUID uuid;
@Nullable private final String mainTypeName;
@Nullable private final String typeName;
public IdentifiableDeviceImpl(final LazyOptional<? extends Device> device, final UUID uuid) {
this(device, uuid, null);
}
public IdentifiableDeviceImpl(final LazyOptional<? extends Device> device, final UUID uuid, @Nullable final String mainTypeName) {
public IdentifiableDeviceImpl(final LazyOptional<? extends Device> device, final UUID uuid, @Nullable final String typeName) {
this.device = device;
this.uuid = uuid;
this.mainTypeName = mainTypeName;
this.typeName = typeName;
}
@Override
@@ -31,9 +31,9 @@ public final class IdentifiableDeviceImpl implements IdentifiableDevice {
@Override
public List<String> getTypeNames() {
if (mainTypeName != null) {
if (typeName != null) {
final List<String> typeNames = new ArrayList<>(device.map(Device::getTypeNames).orElse(Collections.emptyList()));
typeNames.add(0, mainTypeName);
typeNames.add(typeName);
return typeNames;
} else {
return device.map(Device::getTypeNames).orElse(Collections.emptyList());