Added spotless back and reformatted

src/main/java/appeng/util/FakePlayer.java

@@ -1,10 +1,18 @@
 package appeng.util;
 
+import java.util.Objects;
+import java.util.UUID;
+import java.util.WeakHashMap;
+
+import javax.annotation.Nullable;
+
 import com.mojang.authlib.GameProfile;
+
 import io.netty.util.concurrent.CompleteFuture;
 import io.netty.util.concurrent.Future;
 import io.netty.util.concurrent.GenericFutureListener;
 import io.netty.util.concurrent.SucceededFuture;
+
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.network.ClientConnection;
 import net.minecraft.network.NetworkSide;
@@ -17,23 +25,19 @@ import net.minecraft.server.world.ServerWorld;
 import net.minecraft.util.math.Vec3d;
 import net.minecraft.world.World;
 
-import javax.annotation.Nullable;
-import java.util.Objects;
-import java.util.UUID;
-import java.util.WeakHashMap;
-
 public class FakePlayer extends ServerPlayerEntity {
     private static final WeakHashMap<World, FakePlayer> FAKE_PLAYERS = new WeakHashMap<>();
 
-    private static final GameProfile PROFILE = new GameProfile(UUID.fromString("60C173A5-E1E6-4B87-85B1-272CE424521D"), "[AppEng2]");
+    private static final GameProfile PROFILE = new GameProfile(UUID.fromString("60C173A5-E1E6-4B87-85B1-272CE424521D"),
+            "[AppEng2]");
 
     private FakePlayer(ServerWorld world) {
         super(world.getServer(), world, PROFILE, new ServerPlayerInteractionManager(world));
     }
 
     /**
-     * DO NOT COPY THE PLAYER ANYWHERE!
-     * It will keep the world alive, always call this method if you need it.
+     * DO NOT COPY THE PLAYER ANYWHERE! It will keep the world alive, always call
+     * this method if you need it.
      */
     public static FakePlayer getOrCreate(ServerWorld world) {
         Objects.requireNonNull(world);
@@ -49,7 +53,8 @@ public class FakePlayer extends ServerPlayerEntity {
     }
 
     public static boolean isFakePlayer(PlayerEntity player) {
-        // FIXME FABRIC: Is there a reliable way of detecting fake players of other mods???
+        // FIXME FABRIC: Is there a reliable way of detecting fake players of other
+        // mods???
         return player instanceof FakePlayer;
     }
 
@@ -57,6 +62,7 @@ public class FakePlayer extends ServerPlayerEntity {
     public void tick() {
     }
 
-    // FIXME: We should probably find and override all methods that access the networkHandler
+    // FIXME: We should probably find and override all methods that access the
+    // networkHandler
 
 }

src/main/java/appeng/util/InventoryAdaptor.java

@@ -18,18 +18,20 @@
 
 package appeng.util;
 
+import net.minecraft.block.entity.BlockEntity;
+import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.math.Direction;
+
 import alexiil.mc.lib.attributes.SearchOptions;
 import alexiil.mc.lib.attributes.item.FixedItemInv;
 import alexiil.mc.lib.attributes.item.ItemAttributes;
+
 import appeng.api.config.FuzzyMode;
 import appeng.util.inv.AdaptorFixedInv;
 import appeng.util.inv.AdaptorItemHandlerPlayerInv;
 import appeng.util.inv.IInventoryDestination;
 import appeng.util.inv.ItemSlot;
-import net.minecraft.block.entity.BlockEntity;
-import net.minecraft.entity.player.PlayerEntity;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.math.Direction;
 
 /**
  * Universal Facade for other inventories. Used to conveniently interact with
@@ -42,7 +44,8 @@ public abstract class InventoryAdaptor implements Iterable<ItemSlot> {
         if (te == null) {
             return null;
         }
-        FixedItemInv inv = ItemAttributes.FIXED_INV.get(te.getWorld(), te.getPos(), SearchOptions.inDirection(d.getOpposite()));
+        FixedItemInv inv = ItemAttributes.FIXED_INV.get(te.getWorld(), te.getPos(),
+                SearchOptions.inDirection(d.getOpposite()));
 
         if (inv == ItemAttributes.FIXED_INV.defaultValue) {
             return null;
@@ -65,10 +68,10 @@ public abstract class InventoryAdaptor implements Iterable<ItemSlot> {
 
     // return what was extracted.
     public abstract ItemStack removeSimilarItems(int amount, ItemStack filter, FuzzyMode fuzzyMode,
-                                                 IInventoryDestination destination);
+            IInventoryDestination destination);
 
     public abstract ItemStack simulateSimilarRemove(int amount, ItemStack filter, FuzzyMode fuzzyMode,
-                                                    IInventoryDestination destination);
+            IInventoryDestination destination);
 
     // return what isn't used...
     public abstract ItemStack addItems(ItemStack toBeAdded);

src/main/java/appeng/util/Platform.java

@@ -18,8 +18,47 @@
 
 package appeng.util;
 
+import java.text.DecimalFormat;
+import java.util.*;
+
+import javax.annotation.Nullable;
+
+import com.google.common.base.Preconditions;
+import com.google.common.collect.Iterables;
+
+import net.fabricmc.api.EnvType;
+import net.fabricmc.api.Environment;
+import net.fabricmc.loader.api.FabricLoader;
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockState;
+import net.minecraft.block.entity.BlockEntity;
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.item.TooltipContext;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.ItemEntity;
+import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.inventory.CraftingInventory;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.item.Items;
+import net.minecraft.recipe.Recipe;
+import net.minecraft.server.integrated.IntegratedServer;
+import net.minecraft.server.world.ServerWorld;
+import net.minecraft.text.LiteralText;
+import net.minecraft.text.Text;
+import net.minecraft.text.TranslatableText;
+import net.minecraft.util.Formatting;
+import net.minecraft.util.Identifier;
+import net.minecraft.util.Util;
+import net.minecraft.util.hit.EntityHitResult;
+import net.minecraft.util.hit.HitResult;
+import net.minecraft.util.math.*;
+import net.minecraft.util.registry.Registry;
+import net.minecraft.world.RayTraceContext;
+import net.minecraft.world.World;
+
 import alexiil.mc.lib.attributes.fluid.volume.FluidVolume;
-import appeng.core.Api;
+
 import appeng.api.config.*;
 import appeng.api.definitions.IItemDefinition;
 import appeng.api.definitions.IMaterials;
@@ -58,42 +97,6 @@ import appeng.util.helpers.ItemComparisonHelper;
 import appeng.util.helpers.P2PHelper;
 import appeng.util.item.AEItemStack;
 import appeng.util.prioritylist.IPartitionList;
-import com.google.common.base.Preconditions;
-import com.google.common.collect.Iterables;
-import net.fabricmc.api.EnvType;
-import net.fabricmc.api.Environment;
-import net.fabricmc.loader.api.FabricLoader;
-import net.minecraft.block.Block;
-import net.minecraft.block.BlockState;
-import net.minecraft.block.entity.BlockEntity;
-import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.item.TooltipContext;
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.ItemEntity;
-import net.minecraft.entity.player.PlayerEntity;
-import net.minecraft.inventory.CraftingInventory;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.item.Items;
-import net.minecraft.recipe.Recipe;
-import net.minecraft.server.integrated.IntegratedServer;
-import net.minecraft.server.world.ServerWorld;
-import net.minecraft.text.LiteralText;
-import net.minecraft.text.Text;
-import net.minecraft.text.TranslatableText;
-import net.minecraft.util.Formatting;
-import net.minecraft.util.Identifier;
-import net.minecraft.util.Util;
-import net.minecraft.util.hit.EntityHitResult;
-import net.minecraft.util.hit.HitResult;
-import net.minecraft.util.math.*;
-import net.minecraft.util.registry.Registry;
-import net.minecraft.world.RayTraceContext;
-import net.minecraft.world.World;
-
-import javax.annotation.Nullable;
-import java.text.DecimalFormat;
-import java.util.*;
 
 /**
  * @author AlgorithmX2
@@ -193,7 +196,7 @@ public class Platform {
      * @return True if client-side classes (such as Renderers) are available.
      */
     public static boolean hasClientClasses() {
-        return FABRIC.getEnvironmentType() ==  EnvType.CLIENT;
+        return FABRIC.getEnvironmentType() == EnvType.CLIENT;
     }
 
     /*
@@ -239,8 +242,9 @@ public class Platform {
 
                     final ISecurityGrid sg = g.getCache(ISecurityGrid.class);
                     if (!sg.hasPermission(player, requiredPermission)) {
-                        player.sendSystemMessage(new TranslatableText("appliedenergistics2.permission_denied")
-                                .formatted(Formatting.RED), Util.NIL_UUID);
+                        player.sendSystemMessage(
+                                new TranslatableText("appliedenergistics2.permission_denied").formatted(Formatting.RED),
+                                Util.NIL_UUID);
                         // FIXME trace logging?
                         return false;
                     }
@@ -635,14 +639,16 @@ public class Platform {
     }
 
     public static LookDirection getPlayerRay(final PlayerEntity playerIn) {
-        // FIXME this currently cant be modded in Fabric, see net.minecraft.server.network.ServerPlayerInteractionManager.processBlockBreakingAction
+        // FIXME this currently cant be modded in Fabric, see
+        // net.minecraft.server.network.ServerPlayerInteractionManager.processBlockBreakingAction
         double reachDistance = 36.0D;
         return getPlayerRay(playerIn, reachDistance);
     }
 
     public static LookDirection getPlayerRay(final PlayerEntity playerIn, double reachDistance) {
         final double x = playerIn.prevX + (playerIn.getX() - playerIn.prevX);
-        final double y = playerIn.prevY + (playerIn.getY() - playerIn.prevY) + playerIn.getEyeHeight(playerIn.getPose());
+        final double y = playerIn.prevY + (playerIn.getY() - playerIn.prevY)
+                + playerIn.getEyeHeight(playerIn.getPose());
         final double z = playerIn.prevZ + (playerIn.getZ() - playerIn.prevZ);
 
         final float playerPitch = playerIn.prevPitch + (playerIn.pitch - playerIn.prevPitch);
@@ -682,9 +688,8 @@ public class Platform {
 
         final Vec3d vec31 = vec3.add(f7 * d3, f6 * d3, f8 * d3);
 
-        final Box bb = new Box(Math.min(vec3.x, vec31.x), Math.min(vec3.y, vec31.y),
-                Math.min(vec3.z, vec31.z), Math.max(vec3.x, vec31.x), Math.max(vec3.y, vec31.y),
-                Math.max(vec3.z, vec31.z)).expand(16, 16, 16);
+        final Box bb = new Box(Math.min(vec3.x, vec31.x), Math.min(vec3.y, vec31.y), Math.min(vec3.z, vec31.z),
+                Math.max(vec3.x, vec31.x), Math.max(vec3.y, vec31.y), Math.max(vec3.z, vec31.z)).expand(16, 16, 16);
 
         Entity entity = null;
         double closest = 9999999.0D;
@@ -986,8 +991,8 @@ public class Platform {
                 break;
         }
 
-        player.refreshPositionAndAngles(tile.getPos().getX() + 0.5, tile.getPos().getY() + 0.5, tile.getPos().getZ() + 0.5,
-                yaw, pitch);
+        player.refreshPositionAndAngles(tile.getPos().getX() + 0.5, tile.getPos().getY() + 0.5,
+                tile.getPos().getZ() + 0.5, yaw, pitch);
     }
 
     public static boolean canAccess(final AENetworkProxy gridProxy, final IActionSource src) {
@@ -1143,7 +1148,7 @@ public class Platform {
 
     public static boolean isSearchModeAvailable(SearchBoxMode mode) {
         if (mode.isRequiresJei()) {
-           return ReiFacade.instance().isEnabled();
+            return ReiFacade.instance().isEnabled();
         }
         return true;
     }

src/main/java/appeng/util/helpers/ItemHandlerUtil.java

@@ -18,10 +18,11 @@
 
 package appeng.util.helpers;
 
-import alexiil.mc.lib.attributes.item.FixedItemInv;
 import net.minecraft.inventory.CraftingInventory;
 import net.minecraft.item.ItemStack;
 
+import alexiil.mc.lib.attributes.item.FixedItemInv;
+
 public class ItemHandlerUtil {
     private ItemHandlerUtil() {
     }

src/main/java/appeng/util/inv/AdaptorFixedInv.java

@@ -18,17 +18,20 @@
 
 package appeng.util.inv;
 
+import java.util.Iterator;
+
+import org.jetbrains.annotations.NotNull;
+
+import net.minecraft.item.ItemStack;
+
 import alexiil.mc.lib.attributes.Simulation;
 import alexiil.mc.lib.attributes.item.FixedItemInv;
 import alexiil.mc.lib.attributes.item.ItemTransferable;
 import alexiil.mc.lib.attributes.item.filter.ItemFilter;
+
 import appeng.api.config.FuzzyMode;
 import appeng.util.InventoryAdaptor;
 import appeng.util.Platform;
-import net.minecraft.item.ItemStack;
-import org.jetbrains.annotations.NotNull;
-
-import java.util.Iterator;
 
 public class AdaptorFixedInv extends InventoryAdaptor {
     protected final FixedItemInv itemHandler;
@@ -63,7 +66,8 @@ public class AdaptorFixedInv extends InventoryAdaptor {
         ItemFilter itemFilter = destination != null ? destination::canInsert : stack -> true;
         if (!filter.isEmpty()) {
             if (destination != null) {
-                itemFilter = stack -> Platform.itemComparisons().isSameItem(stack, filter) && destination.canInsert(stack);    
+                itemFilter = stack -> Platform.itemComparisons().isSameItem(stack, filter)
+                        && destination.canInsert(stack);
             } else {
                 itemFilter = stack -> Platform.itemComparisons().isSameItem(stack, filter);
             }
@@ -76,7 +80,8 @@ public class AdaptorFixedInv extends InventoryAdaptor {
         ItemFilter itemFilter = destination != null ? destination::canInsert : stack -> true;
         if (!filter.isEmpty()) {
             if (destination != null) {
-                itemFilter = stack -> Platform.itemComparisons().isFuzzyEqualItem(stack, filter, fuzzyMode) && destination.canInsert(stack);
+                itemFilter = stack -> Platform.itemComparisons().isFuzzyEqualItem(stack, filter, fuzzyMode)
+                        && destination.canInsert(stack);
             } else {
                 itemFilter = stack -> Platform.itemComparisons().isFuzzyEqualItem(stack, filter, fuzzyMode);
             }
@@ -119,7 +124,7 @@ public class AdaptorFixedInv extends InventoryAdaptor {
             return ItemStack.EMPTY;
         }
 
-       return this.transferable.attemptInsertion(itemsToAdd, simulate ? Simulation.SIMULATE : Simulation.ACTION);
+        return this.transferable.attemptInsertion(itemsToAdd, simulate ? Simulation.SIMULATE : Simulation.ACTION);
     }
 
     @Override

src/main/java/appeng/util/inv/AdaptorItemHandlerPlayerInv.java

@@ -18,12 +18,14 @@
 
 package appeng.util.inv;
 
-import alexiil.mc.lib.attributes.Simulation;
-import alexiil.mc.lib.attributes.item.compat.FixedInventoryVanillaWrapper;
-import appeng.util.Platform;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.ItemStack;
 
+import alexiil.mc.lib.attributes.Simulation;
+import alexiil.mc.lib.attributes.item.compat.FixedInventoryVanillaWrapper;
+
+import appeng.util.Platform;
+
 public class AdaptorItemHandlerPlayerInv extends AdaptorFixedInv {
 
     public AdaptorItemHandlerPlayerInv(final PlayerEntity playerInv) {

src/main/java/appeng/util/inv/IAEAppEngInventory.java

@@ -18,9 +18,10 @@
 
 package appeng.util.inv;
 
-import alexiil.mc.lib.attributes.item.FixedItemInv;
 import net.minecraft.item.ItemStack;
 
+import alexiil.mc.lib.attributes.item.FixedItemInv;
+
 public interface IAEAppEngInventory {
     void saveChanges();
 

src/main/java/appeng/util/inv/ItemHandlerIterator.java

@@ -46,7 +46,8 @@ class ItemHandlerIterator implements Iterator<ItemSlot> {
         if (this.slot >= this.itemHandler.getSlotCount()) {
             throw new NoSuchElementException();
         }
-        this.itemSlot.setExtractable(!this.itemHandler.getSlot(this.slot).attemptAnyExtraction(1, Simulation.SIMULATE).isEmpty());
+        this.itemSlot.setExtractable(
+                !this.itemHandler.getSlot(this.slot).attemptAnyExtraction(1, Simulation.SIMULATE).isEmpty());
         this.itemSlot.setItemStack(this.itemHandler.getInvStack(this.slot));
         this.itemSlot.setSlot(this.slot);
         this.slot++;

src/main/java/appeng/util/inv/WrapperChainedItemHandler.java

@@ -18,12 +18,12 @@
 
 package appeng.util.inv;
 
+import java.util.Arrays;
+
 import alexiil.mc.lib.attributes.item.FixedItemInv;
 import alexiil.mc.lib.attributes.item.impl.CombinedFixedItemInv;
 import alexiil.mc.lib.attributes.item.impl.DelegatingFixedItemInv;
 
-import java.util.Arrays;
-
 // FIXME could be replaced by CombinedFixedItemInv directly
 public class WrapperChainedItemHandler extends DelegatingFixedItemInv {
 

src/main/java/appeng/util/inv/WrapperCursorItemHandler.java

@@ -18,9 +18,10 @@
 
 package appeng.util.inv;
 
+import net.minecraft.entity.player.PlayerInventory;
+
 import alexiil.mc.lib.attributes.item.compat.FixedInventoryVanillaWrapper;
 import alexiil.mc.lib.attributes.item.impl.DelegatingFixedItemInv;
-import net.minecraft.entity.player.PlayerInventory;
 
 public class WrapperCursorItemHandler extends DelegatingFixedItemInv {
 

src/main/java/appeng/util/inv/WrapperFilteredItemHandler.java

@@ -21,13 +21,14 @@ package appeng.util.inv;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
+import net.minecraft.item.ItemStack;
+
 import alexiil.mc.lib.attributes.ListenerRemovalToken;
 import alexiil.mc.lib.attributes.ListenerToken;
 import alexiil.mc.lib.attributes.Simulation;
+import alexiil.mc.lib.attributes.item.FixedItemInv;
 import alexiil.mc.lib.attributes.item.InvMarkDirtyListener;
 import alexiil.mc.lib.attributes.item.filter.ItemFilter;
-import net.minecraft.item.ItemStack;
-import alexiil.mc.lib.attributes.item.FixedItemInv;
 
 import appeng.util.inv.filter.IAEItemFilter;
 

src/main/java/appeng/util/inv/WrapperInvItemHandler.java

@@ -18,9 +18,10 @@
 
 package appeng.util.inv;
 
+import net.minecraft.entity.player.PlayerEntity;
+
 import alexiil.mc.lib.attributes.item.FixedItemInv;
 import alexiil.mc.lib.attributes.item.compat.InventoryFixedWrapper;
-import net.minecraft.entity.player.PlayerEntity;
 
 public class WrapperInvItemHandler extends InventoryFixedWrapper {
 

src/main/java/appeng/util/inv/WrapperSupplierItemHandler.java

@@ -20,16 +20,17 @@ package appeng.util.inv;
 
 import java.util.function.Supplier;
 
+import javax.annotation.Nullable;
+
+import net.minecraft.item.ItemStack;
+
 import alexiil.mc.lib.attributes.ListenerRemovalToken;
 import alexiil.mc.lib.attributes.ListenerToken;
 import alexiil.mc.lib.attributes.Simulation;
+import alexiil.mc.lib.attributes.item.FixedItemInv;
 import alexiil.mc.lib.attributes.item.GroupedItemInv;
 import alexiil.mc.lib.attributes.item.InvMarkDirtyListener;
 import alexiil.mc.lib.attributes.item.impl.DelegatingGroupedItemInv;
-import net.minecraft.item.ItemStack;
-import alexiil.mc.lib.attributes.item.FixedItemInv;
-
-import javax.annotation.Nullable;
 
 public class WrapperSupplierItemHandler implements FixedItemInv {
     private final Supplier<FixedItemInv> sourceHandler;

src/main/java/appeng/util/inv/filter/AEItemDefinitionFilter.java

@@ -18,9 +18,10 @@
 
 package appeng.util.inv.filter;
 
-import alexiil.mc.lib.attributes.item.FixedItemInv;
 import net.minecraft.item.ItemStack;
 
+import alexiil.mc.lib.attributes.item.FixedItemInv;
+
 import appeng.api.definitions.IItemDefinition;
 
 public class AEItemDefinitionFilter implements IAEItemFilter {

src/main/java/appeng/util/inv/filter/AEItemFilters.java

@@ -18,9 +18,10 @@
 
 package appeng.util.inv.filter;
 
-import alexiil.mc.lib.attributes.item.FixedItemInv;
 import net.minecraft.item.ItemStack;
 
+import alexiil.mc.lib.attributes.item.FixedItemInv;
+
 public class AEItemFilters {
     public static final IAEItemFilter INSERT_ONLY = new InsertOnlyFilter();
     public static final IAEItemFilter EXTRACT_ONLY = new ExtractOnlyFilter();

src/main/java/appeng/util/inv/filter/IAEItemFilter.java

@@ -18,9 +18,10 @@
 
 package appeng.util.inv.filter;
 
-import alexiil.mc.lib.attributes.item.FixedItemInv;
 import net.minecraft.item.ItemStack;
 
+import alexiil.mc.lib.attributes.item.FixedItemInv;
+
 public interface IAEItemFilter {
     boolean allowExtract(FixedItemInv inv, int slot, int amount);
 

src/main/java/appeng/util/item/AEItemStack.java

@@ -24,13 +24,14 @@ import java.util.Objects;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
+import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.network.PacketByteBuf;
 import net.minecraft.text.Text;
-import net.fabricmc.api.EnvType;
+import net.minecraft.util.registry.Registry;
 
 import appeng.api.config.FuzzyMode;
 import appeng.api.storage.IStorageChannel;
@@ -38,7 +39,6 @@ import appeng.api.storage.channels.IItemStorageChannel;
 import appeng.api.storage.data.IAEItemStack;
 import appeng.core.Api;
 import appeng.util.Platform;
-import net.minecraft.util.registry.Registry;
 
 public final class AEItemStack extends AEStack<IAEItemStack> implements IAEItemStack {
     private static final String NBT_STACKSIZE = "cnt";
@@ -159,8 +159,7 @@ public final class AEItemStack extends AEStack<IAEItemStack> implements IAEItemS
 
     @Override
     public ItemStack createItemStack() {
-        return Platform.copyStackWithSize(this.getDefinition(),
-                (int) Math.min(Integer.MAX_VALUE, this.getStackSize()));
+        return Platform.copyStackWithSize(this.getDefinition(), (int) Math.min(Integer.MAX_VALUE, this.getStackSize()));
     }
 
     @Override

src/main/java/appeng/util/iterators/InvIterator.java

@@ -20,9 +20,10 @@ package appeng.util.iterators;
 
 import java.util.Iterator;
 
-import alexiil.mc.lib.attributes.item.FixedItemInv;
 import net.minecraft.item.ItemStack;
 
+import alexiil.mc.lib.attributes.item.FixedItemInv;
+
 public final class InvIterator implements Iterator<ItemStack> {
     private final FixedItemInv inventory;
     private final int size;