From 62396f158f04514539e18d444872bfaf9f8608b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20N=C3=BCcke?= Date: Tue, 1 Dec 2020 02:43:03 +0100 Subject: [PATCH] Append extra name instead of prefixing it. --- .../cil/oc2/common/device/IdentifiableDeviceImpl.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/li/cil/oc2/common/device/IdentifiableDeviceImpl.java b/src/main/java/li/cil/oc2/common/device/IdentifiableDeviceImpl.java index bf3e4ccf..4279d460 100644 --- a/src/main/java/li/cil/oc2/common/device/IdentifiableDeviceImpl.java +++ b/src/main/java/li/cil/oc2/common/device/IdentifiableDeviceImpl.java @@ -12,16 +12,16 @@ import java.util.*; public final class IdentifiableDeviceImpl implements IdentifiableDevice { private final LazyOptional device; private final UUID uuid; - @Nullable private final String mainTypeName; + @Nullable private final String typeName; public IdentifiableDeviceImpl(final LazyOptional device, final UUID uuid) { this(device, uuid, null); } - public IdentifiableDeviceImpl(final LazyOptional device, final UUID uuid, @Nullable final String mainTypeName) { + public IdentifiableDeviceImpl(final LazyOptional 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 getTypeNames() { - if (mainTypeName != null) { + if (typeName != null) { final List 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());