fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added spotless back and reformatted

Browse Source
This commit is contained in:
Sebastian Hartte
2020-07-27 20:07:27 +02:00
parent 49296915c9
commit 780f68952b
593 changed files with 4192 additions and 3969 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/me/GridNode.java
+3 -3
View File
@@ -26,12 +26,12 @@ import java.util.Deque;
import java.util.EnumSet;
import java.util.List;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.block.entity.BlockEntity;
import net.minecraft.util.math.Direction;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.WorldAccess;
import net.minecraft.util.math.Direction;
import net.minecraft.world.World;
import net.minecraft.world.WorldAccess;
import appeng.api.exceptions.FailedConnectionException;
import appeng.api.exceptions.SecurityConnectionException;
src/main/java/appeng/me/GridStorage.java
+1 -1
View File
@@ -66,7 +66,7 @@ public class GridStorage implements IGridStorage {
public void saveState() {
final Grid currentGrid = (Grid) this.getGrid();
if (currentGrid != null) {
currentGrid.saveState();
currentGrid.saveState();
}
}
src/main/java/appeng/me/cache/CraftingGridCache.java
Vendored
+1 -1
View File
@@ -85,8 +85,8 @@ import appeng.helpers.CraftingPatternDetails;
import appeng.me.cluster.implementations.CraftingCPUCluster;
import appeng.me.helpers.BaseActionSource;
import appeng.me.helpers.GenericInterestManager;
import appeng.tile.crafting.CraftingStorageBlockEntity;
import appeng.tile.crafting.CraftingBlockEntity;
import appeng.tile.crafting.CraftingStorageBlockEntity;
public class CraftingGridCache
implements ICraftingGrid, ICraftingProviderHelper, ICellProvider, IMEInventoryHandler<IAEItemStack> {
src/main/java/appeng/me/cache/PathGridCache.java
Vendored
+1 -1
View File
@@ -25,7 +25,6 @@ import java.util.Iterator;
import java.util.List;
import java.util.Set;
import appeng.tile.networking.ControllerBlockEntity;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.server.network.ServerPlayerEntity;
@@ -57,6 +56,7 @@ import appeng.me.pathfinding.ControllerChannelUpdater;
import appeng.me.pathfinding.ControllerValidator;
import appeng.me.pathfinding.IPathItem;
import appeng.me.pathfinding.PathSegment;
import appeng.tile.networking.ControllerBlockEntity;
public class PathGridCache implements IPathingGrid {
src/main/java/appeng/me/cache/TickManagerCache.java
Vendored
-1
View File
@@ -26,7 +26,6 @@ import com.google.common.base.Preconditions;
import net.minecraft.util.crash.CrashException;
import net.minecraft.util.crash.CrashReport;
import net.minecraft.util.crash.CrashReportSection;
import net.minecraft.util.crash.CrashException;
import appeng.api.networking.IGrid;
import appeng.api.networking.IGridHost;
src/main/java/appeng/me/cache/helpers/TickTracker.java
Vendored
-1
View File
@@ -20,7 +20,6 @@ package appeng.me.cache.helpers;
import javax.annotation.Nonnull;
import appeng.api.parts.IPart;
import net.minecraft.util.crash.CrashReportSection;
import appeng.api.networking.IGridNode;
src/main/java/appeng/me/cluster/implementations/CraftingCPUCluster.java
+5 -4
View File
@@ -32,8 +32,8 @@ import net.minecraft.inventory.CraftingInventory;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.nbt.ListTag;
import net.minecraft.util.math.BlockPos;
import net.minecraft.text.Text;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import appeng.api.config.Actionable;
@@ -71,8 +71,8 @@ import appeng.me.cache.CraftingGridCache;
import appeng.me.cluster.IAECluster;
import appeng.me.cluster.MBCalculator;
import appeng.me.helpers.MachineSource;
import appeng.tile.crafting.CraftingMonitorBlockEntity;
import appeng.tile.crafting.CraftingBlockEntity;
import appeng.tile.crafting.CraftingMonitorBlockEntity;
import appeng.util.Platform;
import appeng.util.item.AEItemStack;
@@ -683,8 +683,9 @@ public final class CraftingCPUCluster implements IAECluster, ICraftingCPU {
}
if (details.isCraftable()) {
// FIXME FABRIC BasicEventHooks.firePlayerCraftingEvent((PlayerEntity) FakePlayer.getOrCreate((ServerWorld) getWorld()),
// FIXME FABRIC details.getOutput(ic, this.getWorld()), ic);
// FIXME FABRIC BasicEventHooks.firePlayerCraftingEvent((PlayerEntity)
// FakePlayer.getOrCreate((ServerWorld) getWorld()),
// FIXME FABRIC details.getOutput(ic, this.getWorld()), ic);
for (int x = 0; x < ic.size(); x++) {
final ItemStack output = Platform.getRecipeRemainder(ic.getStack(x));
src/main/java/appeng/me/cluster/implementations/QuantumCluster.java
+3 -3
View File
@@ -212,9 +212,9 @@ public class QuantumCluster implements ILocatable, IAECluster {
try {
if (this.registered) {
// FIXME FABRIC -> onWorldUnload event
// FIXME FABRIC MinecraftForge.EVENT_BUS.unregister(this);
this.registered = false;
}
// FIXME FABRIC MinecraftForge.EVENT_BUS.unregister(this);
this.registered = false;
}
if (this.thisSide != 0) {
this.updateStatus(true);
src/main/java/appeng/me/pathfinding/ControllerValidator.java
+1 -1
View File
@@ -18,12 +18,12 @@
package appeng.me.pathfinding;
import appeng.tile.networking.ControllerBlockEntity;
import net.minecraft.util.math.BlockPos;
import appeng.api.networking.IGridHost;
import appeng.api.networking.IGridNode;
import appeng.api.networking.IGridVisitor;
import appeng.tile.networking.ControllerBlockEntity;
public class ControllerValidator implements IGridVisitor {
src/main/java/appeng/me/storage/AbstractCellInventory.java
+2 -1
View File
@@ -18,10 +18,11 @@
package appeng.me.storage;
import alexiil.mc.lib.attributes.item.FixedItemInv;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.CompoundTag;
import alexiil.mc.lib.attributes.item.FixedItemInv;
import appeng.api.config.FuzzyMode;
import appeng.api.implementations.items.IStorageCell;
import appeng.api.storage.cells.CellState;
src/main/java/appeng/me/storage/BasicCellInventoryHandler.java
+2 -1
View File
@@ -18,10 +18,11 @@
package appeng.me.storage;
import alexiil.mc.lib.attributes.item.FixedItemInv;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.CompoundTag;
import alexiil.mc.lib.attributes.item.FixedItemInv;
import appeng.api.config.FuzzyMode;
import appeng.api.config.IncludeExclude;
import appeng.api.config.Upgrades;
src/main/java/appeng/me/storage/MEMonitorIFluidHandler.java
+10 -8
View File
@@ -18,6 +18,10 @@
package appeng.me.storage;
import java.math.RoundingMode;
import java.util.*;
import java.util.Map.Entry;
import alexiil.mc.lib.attributes.Simulation;
import alexiil.mc.lib.attributes.fluid.FluidVolumeUtil;
import alexiil.mc.lib.attributes.fluid.GroupedFluidInv;
@@ -25,7 +29,7 @@ import alexiil.mc.lib.attributes.fluid.amount.FluidAmount;
import alexiil.mc.lib.attributes.fluid.filter.ExactFluidFilter;
import alexiil.mc.lib.attributes.fluid.volume.FluidKey;
import alexiil.mc.lib.attributes.fluid.volume.FluidVolume;
import appeng.core.Api;
import appeng.api.config.AccessRestriction;
import appeng.api.config.Actionable;
import appeng.api.config.StorageFilter;
@@ -37,12 +41,8 @@ import appeng.api.storage.IStorageChannel;
import appeng.api.storage.channels.IFluidStorageChannel;
import appeng.api.storage.data.IAEFluidStack;
import appeng.api.storage.data.IItemList;
import appeng.fluids.util.AEFluidStack;
import java.math.RoundingMode;
import java.util.*;
import java.util.Map.Entry;
import appeng.core.Api;
import appeng.fluids.util.AEFluidStack;
public class MEMonitorIFluidHandler implements IMEMonitor<IAEFluidStack>, ITickingMonitor {
private final GroupedFluidInv handler;
@@ -68,7 +68,7 @@ public class MEMonitorIFluidHandler implements IMEMonitor<IAEFluidStack>, ITicki
this.listeners.remove(l);
}
private Simulation getFluidAction(Actionable actionable){
private Simulation getFluidAction(Actionable actionable) {
return actionable == Actionable.MODULATE ? Simulation.ACTION : Simulation.SIMULATE;
}
@@ -153,7 +153,9 @@ public class MEMonitorIFluidHandler implements IMEMonitor<IAEFluidStack>, ITicki
IAEFluidStack stack = null;
if (!newAmount.isZero()) {
stack = (old == null || old.aeStack == null ? AEFluidStack.fromFluidVolume(storedFluid.withAmount(newAmount), RoundingMode.DOWN) : old.aeStack.copy());
stack = (old == null || old.aeStack == null
? AEFluidStack.fromFluidVolume(storedFluid.withAmount(newAmount), RoundingMode.DOWN)
: old.aeStack.copy());
}
if (stack != null) {
stack.setStackSize(newSize);