From 13bf340cd9e4e9a7d7287e6f8eeddf434172e926 Mon Sep 17 00:00:00 2001 From: 90 Date: Mon, 31 Jul 2023 19:04:01 +0100 Subject: [PATCH] Tweak spotless import order --- codeformat/mega.importorder | 16 +++++++++------- .../megacells/definition/MEGACreativeTab.java | 2 +- .../integration/appbot/AppBotIntegration.java | 4 ++-- .../integration/appbot/AppBotItems.java | 6 +++--- .../megacells/service/DecompressionService.java | 8 ++++---- .../_90/megacells/datagen/ModelProvider.java | 4 ++-- .../item/cell/RadioactiveCellInventory.java | 2 +- 7 files changed, 22 insertions(+), 20 deletions(-) diff --git a/codeformat/mega.importorder b/codeformat/mega.importorder index c5b64b24..a371440b 100644 --- a/codeformat/mega.importorder +++ b/codeformat/mega.importorder @@ -1,9 +1,11 @@ -8=gripe -7=me -6=appeng -5=cpw -4=net -3=io +0=java 2=org 1=com -0=java \ No newline at end of file +5=net +3=it +6=cpw +7=appeng +8=appbot +9=me +10=de +11=gripe \ No newline at end of file diff --git a/common/src/main/java/gripe/_90/megacells/definition/MEGACreativeTab.java b/common/src/main/java/gripe/_90/megacells/definition/MEGACreativeTab.java index c75577b1..fd8e64ac 100644 --- a/common/src/main/java/gripe/_90/megacells/definition/MEGACreativeTab.java +++ b/common/src/main/java/gripe/_90/megacells/definition/MEGACreativeTab.java @@ -30,7 +30,7 @@ private static void populateTab(CreativeModeTab.ItemDisplayParameters itemDispla var item = itemDef.asItem(); // For block items, the block controls the creative tab - if (item instanceof AEBaseBlockItem baseItem && baseItem.getBlock()instanceof AEBaseBlock baseBlock) { + if (item instanceof AEBaseBlockItem baseItem && baseItem.getBlock() instanceof AEBaseBlock baseBlock) { baseBlock.addToMainCreativeTab(output); } else if (item instanceof AEBaseItem baseItem) { baseItem.addToMainCreativeTab(output); diff --git a/common/src/main/java/gripe/_90/megacells/integration/appbot/AppBotIntegration.java b/common/src/main/java/gripe/_90/megacells/integration/appbot/AppBotIntegration.java index ff4a0ff8..2327f9fd 100644 --- a/common/src/main/java/gripe/_90/megacells/integration/appbot/AppBotIntegration.java +++ b/common/src/main/java/gripe/_90/megacells/integration/appbot/AppBotIntegration.java @@ -4,11 +4,11 @@ import java.util.List; -import appbot.ABItems; - import appeng.api.upgrades.Upgrades; import appeng.core.localization.GuiText; +import appbot.ABItems; + public final class AppBotIntegration { public static void initUpgrades() { AppBotItems.getPortables() diff --git a/common/src/main/java/gripe/_90/megacells/integration/appbot/AppBotItems.java b/common/src/main/java/gripe/_90/megacells/integration/appbot/AppBotItems.java index da7721d2..9fbb79f0 100644 --- a/common/src/main/java/gripe/_90/megacells/integration/appbot/AppBotItems.java +++ b/common/src/main/java/gripe/_90/megacells/integration/appbot/AppBotItems.java @@ -2,13 +2,13 @@ import java.util.List; -import appbot.item.ManaCellItem; -import appbot.item.PortableManaCellItem; - import appeng.core.definitions.ItemDefinition; import appeng.items.materials.MaterialItem; import appeng.items.storage.StorageTier; +import appbot.item.ManaCellItem; +import appbot.item.PortableManaCellItem; + import gripe._90.megacells.definition.MEGAItems; import gripe._90.megacells.util.Utils; diff --git a/common/src/main/java/gripe/_90/megacells/service/DecompressionService.java b/common/src/main/java/gripe/_90/megacells/service/DecompressionService.java index 56f45171..6baf10da 100644 --- a/common/src/main/java/gripe/_90/megacells/service/DecompressionService.java +++ b/common/src/main/java/gripe/_90/megacells/service/DecompressionService.java @@ -61,22 +61,22 @@ public class DecompressionService implements IGridService, IGridServiceProvider @Override public void addNode(IGridNode node) { - if (node.getOwner()instanceof ChestBlockEntity chest) { + if (node.getOwner() instanceof ChestBlockEntity chest) { chests.add(chest); } - if (node.getOwner()instanceof DriveBlockEntity drive) { + if (node.getOwner() instanceof DriveBlockEntity drive) { drives.add(drive); } } @Override public void removeNode(IGridNode node) { - if (node.getOwner()instanceof ChestBlockEntity chest) { + if (node.getOwner() instanceof ChestBlockEntity chest) { chests.remove(chest); } - if (node.getOwner()instanceof DriveBlockEntity drive) { + if (node.getOwner() instanceof DriveBlockEntity drive) { drives.remove(drive); } } diff --git a/forge/src/main/java/gripe/_90/megacells/datagen/ModelProvider.java b/forge/src/main/java/gripe/_90/megacells/datagen/ModelProvider.java index 53ba7fb4..e3bb2925 100644 --- a/forge/src/main/java/gripe/_90/megacells/datagen/ModelProvider.java +++ b/forge/src/main/java/gripe/_90/megacells/datagen/ModelProvider.java @@ -139,8 +139,8 @@ private void portableModel(ItemDefinition portable, String screenType, Resour var tierSuffix = path.substring(path.lastIndexOf('_') + 1); singleTexture(path, mcLoc("item/generated"), "layer0", Utils.makeId("item/cell/portable/portable_cell_%s_screen".formatted(screenType))) - .texture("layer1", PORTABLE_CELL_LED).texture("layer2", housingTexture) - .texture("layer3", "item/cell/portable/portable_cell_side_%s".formatted(tierSuffix)); + .texture("layer1", PORTABLE_CELL_LED).texture("layer2", housingTexture) + .texture("layer3", "item/cell/portable/portable_cell_side_%s".formatted(tierSuffix)); } private void driveCell(String texture) { diff --git a/forge/src/main/java/gripe/_90/megacells/integration/appmek/item/cell/RadioactiveCellInventory.java b/forge/src/main/java/gripe/_90/megacells/integration/appmek/item/cell/RadioactiveCellInventory.java index 1f6c00c4..8b863a1a 100644 --- a/forge/src/main/java/gripe/_90/megacells/integration/appmek/item/cell/RadioactiveCellInventory.java +++ b/forge/src/main/java/gripe/_90/megacells/integration/appmek/item/cell/RadioactiveCellInventory.java @@ -62,7 +62,7 @@ private CompoundTag getTag() { public static RadioactiveCellInventory createInventory(ItemStack o, ISaveProvider container) { Objects.requireNonNull(o, "Cannot create cell inventory for null itemstack"); - if (!(o.getItem()instanceof MEGARadioactiveCell cellType)) { + if (!(o.getItem() instanceof MEGARadioactiveCell cellType)) { return null; }