Reformatted, and ported back some enhancements from the Forge version.
This commit is contained in:
@@ -18,13 +18,7 @@
|
||||
|
||||
package appeng.helpers;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collection;
|
||||
import java.util.Comparator;
|
||||
import java.util.HashSet;
|
||||
import java.util.List;
|
||||
import java.util.Objects;
|
||||
import java.util.Set;
|
||||
import java.util.*;
|
||||
import java.util.function.Function;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
@@ -308,11 +302,9 @@ public class CraftingPatternDetails implements ICraftingPatternDetails, Comparab
|
||||
* Merges all equal entries into a single one while adding their total stack
|
||||
* sizes.
|
||||
*
|
||||
* @throws IllegalStateException if the result would be empty.
|
||||
*
|
||||
* @param collection the collection to condense
|
||||
*
|
||||
* @return a non empty list of condensed stacks.
|
||||
* @throws IllegalStateException if the result would be empty.
|
||||
*/
|
||||
private List<IAEItemStack> condenseStacks(Collection<IAEItemStack> collection) {
|
||||
final List<IAEItemStack> merged = collection.stream().filter(Objects::nonNull)
|
||||
|
||||
@@ -18,13 +18,7 @@
|
||||
|
||||
package appeng.helpers;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collection;
|
||||
import java.util.EnumSet;
|
||||
import java.util.HashSet;
|
||||
import java.util.Iterator;
|
||||
import java.util.List;
|
||||
import java.util.Optional;
|
||||
import java.util.*;
|
||||
|
||||
import javax.annotation.Nullable;
|
||||
|
||||
@@ -49,7 +43,6 @@ import net.minecraft.util.math.Vec3d;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import alexiil.mc.lib.attributes.AttributeList;
|
||||
import alexiil.mc.lib.attributes.AttributeProvider;
|
||||
import alexiil.mc.lib.attributes.Simulation;
|
||||
import alexiil.mc.lib.attributes.item.FixedItemInv;
|
||||
|
||||
@@ -74,11 +67,7 @@ import appeng.api.networking.ticking.IGridTickable;
|
||||
import appeng.api.networking.ticking.TickRateModulation;
|
||||
import appeng.api.networking.ticking.TickingRequest;
|
||||
import appeng.api.parts.IPart;
|
||||
import appeng.api.storage.IMEInventory;
|
||||
import appeng.api.storage.IMEMonitor;
|
||||
import appeng.api.storage.IStorageChannel;
|
||||
import appeng.api.storage.IStorageMonitorable;
|
||||
import appeng.api.storage.IStorageMonitorableAccessor;
|
||||
import appeng.api.storage.*;
|
||||
import appeng.api.storage.channels.IFluidStorageChannel;
|
||||
import appeng.api.storage.channels.IItemStorageChannel;
|
||||
import appeng.api.storage.data.IAEFluidStack;
|
||||
@@ -971,7 +960,7 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn
|
||||
direction.getOffsetZ() * 0.501);
|
||||
final Vec3d to = from.add(direction.getOffsetX(), direction.getOffsetY(), direction.getOffsetZ());
|
||||
final BlockHitResult hit = null;// hostWorld.rayTraceBlocks( from, to ); //FIXME:
|
||||
// https://github.com/MinecraftForge/MinecraftForge/pull/6708
|
||||
// https://github.com/MinecraftForge/MinecraftForge/pull/6708
|
||||
if (hit != null && !BAD_BLOCKS.contains(directedBlock)) {
|
||||
if (hit.getBlockPos().equals(directedTile.getPos())) {
|
||||
// FIXME FABRIC: Either add "getName" to the interface adaptor, or special-case
|
||||
|
||||
@@ -34,7 +34,6 @@ public interface IContainerCraftingPacket {
|
||||
|
||||
/**
|
||||
* @param string name of inventory
|
||||
*
|
||||
* @return the inventory of the part/tile by name.
|
||||
*/
|
||||
FixedItemInv getInventoryByName(String string);
|
||||
|
||||
@@ -41,14 +41,10 @@ public class Splotch {
|
||||
if (side == Direction.SOUTH || side == Direction.NORTH) {
|
||||
x = position.x;
|
||||
y = position.y;
|
||||
}
|
||||
|
||||
else if (side == Direction.UP || side == Direction.DOWN) {
|
||||
} else if (side == Direction.UP || side == Direction.DOWN) {
|
||||
x = position.x;
|
||||
y = position.z;
|
||||
}
|
||||
|
||||
else {
|
||||
} else {
|
||||
x = position.y;
|
||||
y = position.z;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user