From 343941b0f08487d5a13e27004483b3bfda01e287 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20N=C3=BCcke?= Date: Tue, 3 Aug 2021 01:59:28 +0200 Subject: [PATCH] Some more static imports for consistency. --- .../li/cil/oc2/api/bus/device/object/ObjectDevice.java | 4 ++-- .../oc2/client/gui/AbstractMachineInventoryScreen.java | 4 ++-- .../oc2/client/gui/AbstractMachineTerminalScreen.java | 4 ++-- .../java/li/cil/oc2/client/gui/widget/ImageButton.java | 9 +++++---- .../li/cil/oc2/client/gui/widget/ToggleImageButton.java | 9 +++++---- .../cil/oc2/common/bus/device/rpc/TypeNameRPCDevice.java | 8 +++++--- src/main/java/li/cil/oc2/common/entity/RobotEntity.java | 5 +++-- src/main/java/li/cil/oc2/data/ModLootTableProvider.java | 4 ++-- 8 files changed, 26 insertions(+), 21 deletions(-) diff --git a/src/main/java/li/cil/oc2/api/bus/device/object/ObjectDevice.java b/src/main/java/li/cil/oc2/api/bus/device/object/ObjectDevice.java index 93e3fe10..4f25a333 100644 --- a/src/main/java/li/cil/oc2/api/bus/device/object/ObjectDevice.java +++ b/src/main/java/li/cil/oc2/api/bus/device/object/ObjectDevice.java @@ -5,9 +5,9 @@ import li.cil.oc2.api.bus.device.rpc.RPCMethod; import javax.annotation.Nullable; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; +import static java.util.Arrays.asList; import static java.util.Collections.emptyList; import static java.util.Collections.singletonList; @@ -51,7 +51,7 @@ public final class ObjectDevice implements RPCDevice { * @param typeNames the type names of the device. */ public ObjectDevice(final Object object, final String... typeNames) { - this(object, Arrays.asList(typeNames)); + this(object, asList(typeNames)); } /** diff --git a/src/main/java/li/cil/oc2/client/gui/AbstractMachineInventoryScreen.java b/src/main/java/li/cil/oc2/client/gui/AbstractMachineInventoryScreen.java index 5e5a42e4..3f95e5df 100644 --- a/src/main/java/li/cil/oc2/client/gui/AbstractMachineInventoryScreen.java +++ b/src/main/java/li/cil/oc2/client/gui/AbstractMachineInventoryScreen.java @@ -13,9 +13,9 @@ import net.minecraft.util.text.ITextProperties; import net.minecraft.util.text.TextFormatting; import net.minecraft.util.text.TranslationTextComponent; -import java.util.Arrays; import java.util.List; +import static java.util.Arrays.asList; import static li.cil.oc2.common.util.TooltipUtils.withColor; public abstract class AbstractMachineInventoryScreen extends AbstractContainerScreen { @@ -83,7 +83,7 @@ public abstract class AbstractMachineInventoryScreen tooltip = Arrays.asList( + final List tooltip = asList( new TranslationTextComponent(Constants.TOOLTIP_ENERGY, withColor(energyStored + "/" + energyCapacity, TextFormatting.GREEN)), new TranslationTextComponent(Constants.TOOLTIP_ENERGY_CONSUMPTION, withColor(String.valueOf(energyConsumption), TextFormatting.GREEN)) ); diff --git a/src/main/java/li/cil/oc2/client/gui/AbstractMachineTerminalScreen.java b/src/main/java/li/cil/oc2/client/gui/AbstractMachineTerminalScreen.java index 06d206d7..e2e613cc 100644 --- a/src/main/java/li/cil/oc2/client/gui/AbstractMachineTerminalScreen.java +++ b/src/main/java/li/cil/oc2/client/gui/AbstractMachineTerminalScreen.java @@ -14,9 +14,9 @@ import net.minecraft.util.text.TextFormatting; import net.minecraft.util.text.TranslationTextComponent; import net.minecraftforge.fml.client.gui.GuiUtils; -import java.util.Arrays; import java.util.List; +import static java.util.Arrays.asList; import static li.cil.oc2.common.util.TooltipUtils.withColor; public abstract class AbstractMachineTerminalScreen extends AbstractContainerScreen { @@ -56,7 +56,7 @@ public abstract class AbstractMachineTerminalScreen tooltip = Arrays.asList( + final List tooltip = asList( new TranslationTextComponent(Constants.TOOLTIP_ENERGY, withColor(energyStored + "/" + energyCapacity, TextFormatting.GREEN)), new TranslationTextComponent(Constants.TOOLTIP_ENERGY_CONSUMPTION, withColor(String.valueOf(energyConsumption), TextFormatting.GREEN)) ); diff --git a/src/main/java/li/cil/oc2/client/gui/widget/ImageButton.java b/src/main/java/li/cil/oc2/client/gui/widget/ImageButton.java index bf2a1f82..638619be 100644 --- a/src/main/java/li/cil/oc2/client/gui/widget/ImageButton.java +++ b/src/main/java/li/cil/oc2/client/gui/widget/ImageButton.java @@ -11,10 +11,11 @@ import net.minecraft.util.text.TextFormatting; import net.minecraftforge.fml.client.gui.GuiUtils; import javax.annotation.Nullable; -import java.util.Arrays; -import java.util.Collections; import java.util.List; +import static java.util.Arrays.asList; +import static java.util.Collections.singletonList; + public abstract class ImageButton extends AbstractButton { private static final long PRESS_DURATION = 200; private static final long TOOLTIP_DELAY = 250; @@ -40,9 +41,9 @@ public abstract class ImageButton extends AbstractButton { super(x, y, width, height, caption); this.parent = parent; if (description == null) { - this.tooltip = Collections.singletonList(caption); + this.tooltip = singletonList(caption); } else { - this.tooltip = Arrays.asList(caption, new StringTextComponent("").withStyle(style -> style.withColor(Color.fromLegacyFormat(TextFormatting.GRAY))).append(description)); + this.tooltip = asList(caption, new StringTextComponent("").withStyle(style -> style.withColor(Color.fromLegacyFormat(TextFormatting.GRAY))).append(description)); } this.baseImage = baseImage; this.pressedImage = pressedImage; diff --git a/src/main/java/li/cil/oc2/client/gui/widget/ToggleImageButton.java b/src/main/java/li/cil/oc2/client/gui/widget/ToggleImageButton.java index dce7aaf5..f13d6c55 100644 --- a/src/main/java/li/cil/oc2/client/gui/widget/ToggleImageButton.java +++ b/src/main/java/li/cil/oc2/client/gui/widget/ToggleImageButton.java @@ -11,10 +11,11 @@ import net.minecraft.util.text.TextFormatting; import net.minecraftforge.fml.client.gui.GuiUtils; import javax.annotation.Nullable; -import java.util.Arrays; -import java.util.Collections; import java.util.List; +import static java.util.Arrays.asList; +import static java.util.Collections.singletonList; + public abstract class ToggleImageButton extends AbstractButton { private static final long PRESS_DURATION = 200; private static final long TOOLTIP_DELAY = 250; @@ -44,9 +45,9 @@ public abstract class ToggleImageButton extends AbstractButton { super(x, y, width, height, caption); this.parent = parent; if (description == null) { - this.tooltip = Collections.singletonList(caption); + this.tooltip = singletonList(caption); } else { - this.tooltip = Arrays.asList(caption, new StringTextComponent("").withStyle(style -> style.withColor(Color.fromLegacyFormat(TextFormatting.GRAY))).append(description)); + this.tooltip = asList(caption, new StringTextComponent("").withStyle(style -> style.withColor(Color.fromLegacyFormat(TextFormatting.GRAY))).append(description)); } this.baseImage = baseImage; this.pressedImage = pressedImage; diff --git a/src/main/java/li/cil/oc2/common/bus/device/rpc/TypeNameRPCDevice.java b/src/main/java/li/cil/oc2/common/bus/device/rpc/TypeNameRPCDevice.java index 3f5f5bb1..d8baa7c1 100644 --- a/src/main/java/li/cil/oc2/common/bus/device/rpc/TypeNameRPCDevice.java +++ b/src/main/java/li/cil/oc2/common/bus/device/rpc/TypeNameRPCDevice.java @@ -4,9 +4,11 @@ import li.cil.oc2.api.bus.device.ItemDevice; import li.cil.oc2.api.bus.device.rpc.RPCDevice; import li.cil.oc2.api.bus.device.rpc.RPCMethod; -import java.util.Collections; import java.util.List; +import static java.util.Collections.emptyList; +import static java.util.Collections.singletonList; + public final class TypeNameRPCDevice implements RPCDevice, ItemDevice { private final String typeName; @@ -16,11 +18,11 @@ public final class TypeNameRPCDevice implements RPCDevice, ItemDevice { @Override public List getTypeNames() { - return Collections.singletonList(typeName); + return singletonList(typeName); } @Override public List getMethods() { - return Collections.emptyList(); + return emptyList(); } } diff --git a/src/main/java/li/cil/oc2/common/entity/RobotEntity.java b/src/main/java/li/cil/oc2/common/entity/RobotEntity.java index d7eaa34f..af682392 100644 --- a/src/main/java/li/cil/oc2/common/entity/RobotEntity.java +++ b/src/main/java/li/cil/oc2/common/entity/RobotEntity.java @@ -75,6 +75,7 @@ import java.nio.ByteBuffer; import java.util.*; import java.util.function.Consumer; +import static java.util.Collections.singleton; import static li.cil.oc2.common.Constants.*; public final class RobotEntity extends Entity implements Robot { @@ -726,12 +727,12 @@ public final class RobotEntity extends Entity implements Robot { @Override public Optional>> getNeighbors() { - return Optional.of(Collections.singleton(LazyOptional.of(() -> deviceItems.busElement))); + return Optional.of(singleton(LazyOptional.of(() -> deviceItems.busElement))); } @Override public Collection getLocalDevices() { - return Collections.singleton(device); + return singleton(device); } @Override diff --git a/src/main/java/li/cil/oc2/data/ModLootTableProvider.java b/src/main/java/li/cil/oc2/data/ModLootTableProvider.java index f5f67842..742fbfb2 100644 --- a/src/main/java/li/cil/oc2/data/ModLootTableProvider.java +++ b/src/main/java/li/cil/oc2/data/ModLootTableProvider.java @@ -11,7 +11,6 @@ import net.minecraft.loot.*; import net.minecraft.loot.functions.CopyNbt; import net.minecraft.util.ResourceLocation; -import java.util.Collections; import java.util.List; import java.util.Map; import java.util.function.BiConsumer; @@ -20,6 +19,7 @@ import java.util.function.Supplier; import java.util.stream.Collectors; import java.util.stream.StreamSupport; +import static java.util.Collections.singletonList; import static java.util.Objects.requireNonNull; import static li.cil.oc2.common.Constants.*; @@ -35,7 +35,7 @@ public final class ModLootTableProvider extends LootTableProvider { @Override protected List>>, LootParameterSet>> getTables() { - return Collections.singletonList(Pair.of(ModBlockLootTables::new, LootParameterSets.BLOCK)); + return singletonList(Pair.of(ModBlockLootTables::new, LootParameterSets.BLOCK)); } public static final class ModBlockLootTables extends BlockLootTables {