Various clean-ups

Author: 62832

README.md

@@ -1,20 +1,17 @@
-<center>
-  <h2 align="center">
-    <a href="https://github.com/62832/MEGACells"><img src="https://raw.githubusercontent.com/62832/MEGACells/1.20/img/MEGACELLS.png" alt="MEGA Cells"></a>
-    <p>ME Greater Accumulation: For when kilobytes just won't do.</p>
+<h2 align="center">
+
+  [![MEGA Cells][logo]][this]
+  <br>
+  ME Greater Accumulation: For when kilobytes just won't do.
 
   [![CurseForge Total Downloads][badge_curseforge]][curseforge]
   [![Modrinth Total Downloads][badge_modrinth]][modrinth]
 
-  </h2>
-</center>
-
-<center>
-  <div align="center">
-    <img src="https://raw.githubusercontent.com/62832/MEGACells/1.20/img/scr_cpus.png" alt="Crafting CPUs screenshot" width=360>
-    <img src="https://raw.githubusercontent.com/62832/MEGACells/1.20/img/scr_cells.png" alt="Storage cells screenshot" width=360>
-  </div>
-</center>
+</h2>
+<div align="center">
+  <img src="https://raw.githubusercontent.com/62832/MEGACells/1.20/img/scr_cpus.png" alt="Crafting CPUs screenshot" width=360>
+  <img src="https://raw.githubusercontent.com/62832/MEGACells/1.20/img/scr_cells.png" alt="Storage cells screenshot" width=360>
+</div>
 <br>
 
 ## ![About][header_about]
@@ -38,13 +35,15 @@ All code is licensed under [LGPLv3][lgpl-v3], in adherence to the same license u
 All assets are licensed under [CC BY-NC-SA 3.0][by-nc-sa-3.0], in adherence to the same license used by AE2 and with most deriving from AE2's own assets.
 
 <!-- Images -->
+[logo]: https://raw.githubusercontent.com/62832/MEGACells/1.20/img/MEGACELLS.png
 [badge_curseforge]: https://img.shields.io/badge/dynamic/json?color=e04e14&label=CurseForge&style=for-the-badge&query=downloads.total&url=https%3A%2F%2Fapi.cfwidget.com%2F622112&logo=curseforge
 [badge_modrinth]: https://img.shields.io/modrinth/dt/jjuIRIVr?color=5da545&label=Modrinth&style=for-the-badge&logo=modrinth
 [header_about]: https://raw.githubusercontent.com/62832/MEGACells/1.20/img/header_about.png
 [header_features]: https://raw.githubusercontent.com/62832/MEGACells/1.20/img/header_features.png
 [header_license]: https://raw.githubusercontent.com/62832/MEGACells/1.20/img/header_license.png
 
 <!-- Links -->
+[this]: https://github.com/62832/MEGACells
 [curseforge]: https://www.curseforge.com/minecraft/mc-mods/mega-cells
 [modrinth]: https://modrinth.com/mod/mega
 [ae2]: https://github.com/AppliedEnergistics/Applied-Energistics-2

common/src/data/java/gripe/_90/megacells/datagen/AppBotHousingRecipeProvider.java

@@ -20,8 +20,8 @@
 import vazkii.botania.data.recipes.TerrestrialAgglomerationProvider;
 
 public class AppBotHousingRecipeProvider extends TerrestrialAgglomerationProvider {
-    public AppBotHousingRecipeProvider(PackOutput packOutput) {
-        super(packOutput);
+    public AppBotHousingRecipeProvider(PackOutput output) {
+        super(output);
     }
 
     @Override

common/src/main/java/gripe/_90/megacells/block/MEGAInterfaceBlock.java

@@ -10,34 +10,35 @@
 import net.minecraft.world.level.Level;
 import net.minecraft.world.phys.BlockHitResult;
 
+import appeng.block.AEBaseBlock;
 import appeng.block.AEBaseEntityBlock;
 import appeng.menu.locator.MenuLocators;
 import appeng.util.InteractionUtil;
 
 import gripe._90.megacells.block.entity.MEGAInterfaceBlockEntity;
 
 public class MEGAInterfaceBlock extends AEBaseEntityBlock<MEGAInterfaceBlockEntity> {
-    public MEGAInterfaceBlock(Properties props) {
-        super(props);
+    public MEGAInterfaceBlock() {
+        super(AEBaseBlock.metalProps());
     }
 
     @Override
     public InteractionResult onActivated(
             Level level,
             BlockPos pos,
-            Player p,
+            Player player,
             InteractionHand hand,
             @Nullable ItemStack heldItem,
             BlockHitResult hit) {
-        if (InteractionUtil.isInAlternateUseMode(p)) {
+        if (InteractionUtil.isInAlternateUseMode(player)) {
             return InteractionResult.PASS;
         }
 
-        var be = getBlockEntity(level, pos);
+        var be = this.getBlockEntity(level, pos);
 
         if (be != null) {
             if (!level.isClientSide()) {
-                be.openMenu(p, MenuLocators.forBlockEntity(be));
+                be.openMenu(player, MenuLocators.forBlockEntity(be));
             }
 
             return InteractionResult.sidedSuccess(level.isClientSide());

common/src/main/java/gripe/_90/megacells/block/MEGAPatternProviderBlock.java

@@ -12,9 +12,11 @@
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.block.state.StateDefinition;
+import net.minecraft.world.level.block.state.properties.EnumProperty;
 import net.minecraft.world.phys.BlockHitResult;
 
 import appeng.api.networking.IManagedGridNode;
+import appeng.block.AEBaseBlock;
 import appeng.block.AEBaseEntityBlock;
 import appeng.block.crafting.PatternProviderBlock;
 import appeng.block.crafting.PushDirection;
@@ -31,28 +33,30 @@
 
 @SuppressWarnings("deprecation")
 public class MEGAPatternProviderBlock extends AEBaseEntityBlock<MEGAPatternProviderBlockEntity> {
-    public MEGAPatternProviderBlock(Properties props) {
-        super(props);
-        registerDefaultState(defaultBlockState().setValue(PatternProviderBlock.PUSH_DIRECTION, PushDirection.ALL));
+    private static final EnumProperty<PushDirection> PUSH_DIRECTION = PatternProviderBlock.PUSH_DIRECTION;
+
+    public MEGAPatternProviderBlock() {
+        super(AEBaseBlock.metalProps());
+        registerDefaultState(defaultBlockState().setValue(PUSH_DIRECTION, PushDirection.ALL));
     }
 
     public static PatternProviderLogic createLogic(IManagedGridNode mainNode, PatternProviderLogicHost host) {
         var logic = new PatternProviderLogic(mainNode, host, 18);
-        ((AppEngInternalInventory) logic.getPatternInv())
-                .setFilter(new AEItemDefinitionFilter(AEItems.PROCESSING_PATTERN));
+        var filter = new AEItemDefinitionFilter(AEItems.PROCESSING_PATTERN);
+        ((AppEngInternalInventory) logic.getPatternInv()).setFilter(filter);
         return logic;
     }
 
     @Override
     protected void createBlockStateDefinition(StateDefinition.Builder<Block, BlockState> builder) {
         super.createBlockStateDefinition(builder);
-        builder.add(PatternProviderBlock.PUSH_DIRECTION);
+        builder.add(PUSH_DIRECTION);
     }
 
     @Override
     public void neighborChanged(
             BlockState state, Level level, BlockPos pos, Block block, BlockPos fromPos, boolean isMoving) {
-        var be = this.getBlockEntity(level, pos);
+        var be = getBlockEntity(level, pos);
 
         if (be != null) {
             be.getLogic().updateRedstoneState();
@@ -63,11 +67,11 @@ public void neighborChanged(
     public InteractionResult onActivated(
             Level level,
             BlockPos pos,
-            Player p,
+            Player player,
             InteractionHand hand,
             @Nullable ItemStack heldItem,
             BlockHitResult hit) {
-        if (InteractionUtil.isInAlternateUseMode(p)) {
+        if (InteractionUtil.isInAlternateUseMode(player)) {
             return InteractionResult.PASS;
         }
 
@@ -76,11 +80,11 @@ public InteractionResult onActivated(
             return InteractionResult.sidedSuccess(level.isClientSide());
         }
 
-        var be = this.getBlockEntity(level, pos);
+        var be = getBlockEntity(level, pos);
 
         if (be != null) {
             if (!level.isClientSide()) {
-                be.openMenu(p, MenuLocators.forBlockEntity(be));
+                be.openMenu(player, MenuLocators.forBlockEntity(be));
             }
 
             return InteractionResult.sidedSuccess(level.isClientSide());
@@ -89,12 +93,12 @@ public InteractionResult onActivated(
         return InteractionResult.PASS;
     }
 
-    public void setSide(Level level, BlockPos pos, Direction facing) {
+    private void setSide(Level level, BlockPos pos, Direction facing) {
         var currentState = level.getBlockState(pos);
-        var pushSide =
-                currentState.getValue(PatternProviderBlock.PUSH_DIRECTION).getDirection();
+        var pushSide = currentState.getValue(PUSH_DIRECTION).getDirection();
 
         PushDirection newPushDirection;
+
         if (pushSide == facing.getOpposite()) {
             newPushDirection = PushDirection.fromDirection(facing);
         } else if (pushSide == facing) {
@@ -105,6 +109,6 @@ public void setSide(Level level, BlockPos pos, Direction facing) {
             newPushDirection = PushDirection.fromDirection(Platform.rotateAround(pushSide, facing));
         }
 
-        level.setBlockAndUpdate(pos, currentState.setValue(PatternProviderBlock.PUSH_DIRECTION, newPushDirection));
+        level.setBlockAndUpdate(pos, currentState.setValue(PUSH_DIRECTION, newPushDirection));
     }
 }

common/src/main/java/gripe/_90/megacells/definition/MEGABlocks.java

@@ -43,12 +43,6 @@ public static List<BlockDefinition<?>> getBlocks() {
         return Collections.unmodifiableList(BLOCKS);
     }
 
-    private static final BlockBehaviour.Properties props = BlockBehaviour.Properties.of()
-            .strength(2.2f, 11.0f)
-            .mapColor(MapColor.METAL)
-            .sound(SoundType.METAL)
-            .forceSolidOn();
-
     public static final BlockDefinition<AEDecorativeBlock> SKY_STEEL_BLOCK = block(
             "Sky Steel Block",
             "sky_steel_block",
@@ -107,11 +101,11 @@ public static List<BlockDefinition<?>> getBlocks() {
             () -> AEParts.STORAGE_MONITOR);
 
     public static final BlockDefinition<MEGAInterfaceBlock> MEGA_INTERFACE =
-            block("MEGA Interface", "mega_interface", () -> new MEGAInterfaceBlock(props), AEBaseBlockItem::new);
+            block("MEGA Interface", "mega_interface", MEGAInterfaceBlock::new, AEBaseBlockItem::new);
     public static final BlockDefinition<MEGAPatternProviderBlock> MEGA_PATTERN_PROVIDER = block(
             "MEGA Pattern Provider",
             "mega_pattern_provider",
-            () -> new MEGAPatternProviderBlock(props),
+            MEGAPatternProviderBlock::new,
             MEGAPatternProviderBlockItem::new);
 
     private static <T extends Block> BlockDefinition<T> craftingBlock(

common/src/main/java/gripe/_90/megacells/definition/MEGAConfig.java

@@ -8,12 +8,14 @@
 
 import gripe._90.megacells.MEGACells;
 
-@SuppressWarnings({"FieldCanBeLocal", "FieldMayBeFinal"})
+@SuppressWarnings({"CanBeFinal", "FieldCanBeLocal", "FieldMayBeFinal"})
 @Config(name = MEGACells.MODID)
 public final class MEGAConfig implements ConfigData {
     @ConfigEntry.Gui.Excluded
     public static MEGAConfig INSTANCE;
 
+    private MEGAConfig() {}
+
     @ConfigEntry.Gui.Tooltip
     @ConfigEntry.BoundedDiscrete(min = 2, max = 12)
     private int CompressionChainLimit = 3;

common/src/main/java/gripe/_90/megacells/definition/MEGACreativeTab.java

@@ -22,8 +22,7 @@ public final class MEGACreativeTab {
             .displayItems(MEGACreativeTab::populateTab)
             .build();
 
-    private static void populateTab(
-            CreativeModeTab.ItemDisplayParameters itemDisplayParameters, CreativeModeTab.Output output) {
+    private static void populateTab(CreativeModeTab.ItemDisplayParameters ignored, CreativeModeTab.Output output) {
         var itemDefs = new ArrayList<ItemDefinition<?>>();
         itemDefs.addAll(MEGAItems.getItems());
         itemDefs.addAll(MEGABlocks.getBlocks());

common/src/main/java/gripe/_90/megacells/definition/MEGAItems.java

@@ -8,6 +8,8 @@
 import net.minecraft.Util;
 import net.minecraft.world.item.Item;
 
+import appeng.api.parts.IPart;
+import appeng.api.parts.IPartItem;
 import appeng.api.parts.PartModels;
 import appeng.api.stacks.AEKeyType;
 import appeng.core.definitions.ItemDefinition;
@@ -108,30 +110,21 @@ public static List<ItemDefinition<?>> getItems() {
     public static final ItemDefinition<DecompressionPatternItem> DECOMPRESSION_PATTERN =
             item("Decompression Pattern", "decompression_pattern", DecompressionPatternItem::new);
 
-    public static final ItemDefinition<PartItem<MEGAInterfacePart>> MEGA_INTERFACE = Util.make(() -> {
-        PartModels.registerModels(PartModelsHelper.createModels(MEGAInterfacePart.class));
-        return item(
-                "MEGA Interface",
-                "cable_mega_interface",
-                p -> new PartItem<>(p, MEGAInterfacePart.class, MEGAInterfacePart::new));
-    });
+    public static final ItemDefinition<PartItem<MEGAInterfacePart>> MEGA_INTERFACE =
+            part("MEGA Interface", "cable_mega_interface", MEGAInterfacePart.class, MEGAInterfacePart::new);
     public static final ItemDefinition<MEGAPatternProviderPartItem> MEGA_PATTERN_PROVIDER = Util.make(() -> {
         PartModels.registerModels(PartModelsHelper.createModels(MEGAPatternProviderPart.class));
         return item("MEGA Pattern Provider", "cable_mega_pattern_provider", MEGAPatternProviderPartItem::new);
     });
 
-    public static final ItemDefinition<PartItem<DecompressionModulePart>> DECOMPRESSION_MODULE = Util.make(() -> {
-        PartModels.registerModels(PartModelsHelper.createModels(DecompressionModulePart.class));
-        return item(
-                "MEGA Decompression Module",
-                "decompression_module",
-                p -> new PartItem<>(p, DecompressionModulePart.class, DecompressionModulePart::new));
-    });
+    public static final ItemDefinition<PartItem<DecompressionModulePart>> DECOMPRESSION_MODULE = part(
+            "MEGA Decompression Module",
+            "decompression_module",
+            DecompressionModulePart.class,
+            DecompressionModulePart::new);
 
-    public static final ItemDefinition<PartItem<CellDockPart>> CELL_DOCK = Util.make(() -> {
-        PartModels.registerModels(PartModelsHelper.createModels(CellDockPart.class));
-        return item("ME Cell Dock", "cell_dock", p -> new PartItem<>(p, CellDockPart.class, CellDockPart::new));
-    });
+    public static final ItemDefinition<PartItem<CellDockPart>> CELL_DOCK =
+            part("ME Cell Dock", "cell_dock", CellDockPart.class, CellDockPart::new);
 
     public static List<ItemDefinition<?>> getItemCells() {
         return List.of(ITEM_CELL_1M, ITEM_CELL_4M, ITEM_CELL_16M, ITEM_CELL_64M, ITEM_CELL_256M);
@@ -216,6 +209,12 @@ private static ItemDefinition<MEGAPortableCell> fluidPortable(StorageTier tier)
                 p -> new MEGAPortableCell(p, tier, AEKeyType.fluids(), MEStorageMenu.PORTABLE_FLUID_CELL_TYPE, 0xF1C5));
     }
 
+    private static <T extends IPart> ItemDefinition<PartItem<T>> part(
+            String englishName, String id, Class<T> partClass, Function<IPartItem<T>, T> factory) {
+        PartModels.registerModels(PartModelsHelper.createModels(partClass));
+        return item(englishName, id, p -> new PartItem<>(p, partClass, factory));
+    }
+
     public static <T extends Item> ItemDefinition<T> item(
             String englishName, String id, Function<Item.Properties, T> factory) {
         var definition = new ItemDefinition<>(englishName, MEGACells.makeId(id), factory.apply(new Item.Properties()));

common/src/main/java/gripe/_90/megacells/item/cell/BulkCellInventory.java

@@ -3,6 +3,7 @@
 import static gripe._90.megacells.definition.MEGAItems.COMPRESSION_CARD;
 
 import java.math.BigInteger;
+import java.util.Collections;
 import java.util.Set;
 
 import it.unimi.dsi.fastutil.objects.ObjectLinkedOpenHashSet;
@@ -124,7 +125,8 @@ private Set<IPatternDetails> generateDecompressionPatterns() {
         }
 
         var patterns = new ObjectLinkedOpenHashSet<IPatternDetails>();
-        var decompressionChain = compressionChain.limited().reversed();
+        var decompressionChain = compressionChain.limited();
+        Collections.reverse(decompressionChain);
 
         for (var variant : decompressionChain) {
             if (variant == decompressionChain.get(decompressionChain.size() - 1)) {