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

API compiles

Browse Source
This commit is contained in:
Sebastian Hartte
2020-06-27 18:09:44 +02:00
parent ba71a82288
commit 80fbb58d4f
572 changed files with 2995 additions and 3037 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/me/GridNode.java
+5 -5
View File
@@ -27,10 +27,10 @@ import java.util.EnumSet;
import java.util.List;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.block.entity.BlockEntity;
import net.minecraft.util.math.Direction;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.IWorld;
import net.minecraft.world.WorldAccess;
import net.minecraft.world.World;
import appeng.api.exceptions.FailedConnectionException;
@@ -246,7 +246,7 @@ public class GridNode implements IGridNode, IPathItem {
}
@Override
public IWorld getWorld() {
public WorldAccess getWorld() {
return this.gridProxy.getLocation().getWorld();
}
@@ -423,10 +423,10 @@ public class GridNode implements IGridNode, IPathItem {
}
}
private IGridHost findGridHost(final IWorld world, final int x, final int y, final int z) {
private IGridHost findGridHost(final WorldAccess world, final int x, final int y, final int z) {
final BlockPos pos = new BlockPos(x, y, z);
if (world.isBlockLoaded(pos)) {
final TileEntity te = world.getTileEntity(pos);
final BlockEntity te = world.getTileEntity(pos);
if (te instanceof IGridHost) {
return (IGridHost) te;
}
src/main/java/appeng/me/cluster/MBCalculator.java
+3 -3
View File
@@ -18,7 +18,7 @@
package appeng.me.cluster;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.block.entity.BlockEntity;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
@@ -158,7 +158,7 @@ public abstract class MBCalculator {
*
* @return true if tile entity is valid for structure
*/
public abstract boolean isValidTile(TileEntity te);
public abstract boolean isValidTile(BlockEntity te);
private boolean verifyUnownedRegionInner(final World w, int minX, int minY, int minZ, int maxX, int maxY, int maxZ,
final AEPartLocation side) {
@@ -194,7 +194,7 @@ public abstract class MBCalculator {
for (int x = minX; x <= maxX; x++) {
for (int y = minY; y <= maxY; y++) {
for (int z = minZ; z <= maxZ; z++) {
final TileEntity te = w.getTileEntity(new BlockPos(x, y, z));
final BlockEntity te = w.getTileEntity(new BlockPos(x, y, z));
if (this.isValidTile(te)) {
return true;
}
src/main/java/appeng/me/cluster/implementations/CraftingCPUCalculator.java
+2 -2
View File
@@ -20,7 +20,7 @@ package appeng.me.cluster.implementations;
import java.util.Iterator;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.block.entity.BlockEntity;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
@@ -125,7 +125,7 @@ public class CraftingCPUCalculator extends MBCalculator {
}
@Override
public boolean isValidTile(final TileEntity te) {
public boolean isValidTile(final BlockEntity te) {
return te instanceof CraftingTileEntity;
}
}
src/main/java/appeng/me/cluster/implementations/CraftingCPUCluster.java
+4 -4
View File
@@ -32,9 +32,9 @@ import net.minecraft.inventory.CraftingInventory;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.nbt.ListNBT;
import net.minecraft.util.text.ITextComponent;
import net.minecraft.text.Text;
import net.minecraft.world.World;
import net.minecraft.world.server.ServerWorld;
import net.minecraft.server.world.ServerWorld;
import net.minecraftforge.fml.hooks.BasicEventHooks;
import appeng.api.AEApi;
@@ -92,7 +92,7 @@ public final class CraftingCPUCluster implements IAECluster, ICraftingCPU {
private final List<CraftingMonitorTileEntity> status = new ArrayList<>();
private final HashMap<IMEMonitorHandlerReceiver<IAEItemStack>, Object> listeners = new HashMap<>();
private ICraftingLink myLastLink;
private ITextComponent myName = null;
private Text myName = null;
private boolean isDestroyed = false;
/**
* crafting job info
@@ -834,7 +834,7 @@ public final class CraftingCPUCluster implements IAECluster, ICraftingCPU {
}
@Override
public ITextComponent getName() {
public Text getName() {
return this.myName;
}
src/main/java/appeng/me/cluster/implementations/QuantumCalculator.java
+2 -2
View File
@@ -18,7 +18,7 @@
package appeng.me.cluster.implementations;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.block.entity.BlockEntity;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.BlockView;
import net.minecraft.world.World;
@@ -131,7 +131,7 @@ public class QuantumCalculator extends MBCalculator {
}
@Override
public boolean isValidTile(final TileEntity te) {
public boolean isValidTile(final BlockEntity te) {
return te instanceof QuantumBridgeTileEntity;
}
src/main/java/appeng/me/cluster/implementations/QuantumCluster.java
+2 -2
View File
@@ -20,7 +20,7 @@ package appeng.me.cluster.implementations;
import java.util.Iterator;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.block.entity.BlockEntity;
import net.minecraft.util.math.ChunkPos;
import net.minecraft.world.World;
import net.minecraft.world.dimension.DimensionType;
@@ -165,7 +165,7 @@ public class QuantumCluster implements ILocatable, IAECluster {
final DimensionType id = theWorld.dimension.getType();
final World cur = theWorld.getServer().getWorld(id);
final TileEntity te = theWorld.getTileEntity(qc.center.getPos());
final BlockEntity te = theWorld.getTileEntity(qc.center.getPos());
return te != qc.center || theWorld != cur;
}
}
src/main/java/appeng/me/cluster/implementations/SpatialPylonCalculator.java
+2 -2
View File
@@ -18,7 +18,7 @@
package appeng.me.cluster.implementations;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.block.entity.BlockEntity;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
@@ -90,7 +90,7 @@ public class SpatialPylonCalculator extends MBCalculator {
}
@Override
public boolean isValidTile(final TileEntity te) {
public boolean isValidTile(final BlockEntity te) {
return te instanceof SpatialPylonTileEntity;
}
}
src/main/java/appeng/me/storage/AbstractCellInventory.java
+3 -3
View File
@@ -18,9 +18,9 @@
package appeng.me.storage;
import alexiil.mc.lib.attributes.item.ItemTransferable;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.CompoundTag;
import net.minecraftforge.items.IItemHandler;
import appeng.api.config.FuzzyMode;
import appeng.api.implementations.items.IStorageCell;
@@ -212,12 +212,12 @@ public abstract class AbstractCellInventory<T extends IAEStack<T>> implements IC
}
@Override
public IItemHandler getConfigInventory() {
public ItemTransferable getConfigInventory() {
return this.cellType.getConfigInventory(this.i);
}
@Override
public IItemHandler getUpgradesInventory() {
public ItemTransferable getUpgradesInventory() {
return this.cellType.getUpgradesInventory(this.i);
}
src/main/java/appeng/me/storage/BasicCellInventoryHandler.java
+3 -3
View File
@@ -18,9 +18,9 @@
package appeng.me.storage;
import alexiil.mc.lib.attributes.item.ItemTransferable;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.CompoundTag;
import net.minecraftforge.items.IItemHandler;
import appeng.api.config.FuzzyMode;
import appeng.api.config.IncludeExclude;
@@ -49,8 +49,8 @@ public class BasicCellInventoryHandler<T extends IAEStack<T>> extends MEInventor
if (ci != null) {
final IItemList<T> priorityList = channel.createList();
final IItemHandler upgrades = ci.getUpgradesInventory();
final IItemHandler config = ci.getConfigInventory();
final ItemTransferable upgrades = ci.getUpgradesInventory();
final ItemTransferable config = ci.getConfigInventory();
final FuzzyMode fzMode = ci.getFuzzyMode();
boolean hasInverter = false;
src/main/java/appeng/me/storage/MEMonitorIFluidHandler.java
+9 -9
View File
@@ -26,8 +26,8 @@ import java.util.Map.Entry;
import java.util.NavigableMap;
import java.util.concurrent.ConcurrentSkipListMap;
import alexiil.mc.lib.attributes.fluid.volume.FluidVolume;
import net.minecraftforge.fluids.FluidAttributes;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.capability.IFluidHandler;
import appeng.api.AEApi;
@@ -90,7 +90,7 @@ public class MEMonitorIFluidHandler implements IMEMonitor<IAEFluidStack>, ITicki
@Override
public IAEFluidStack extractItems(final IAEFluidStack request, final Actionable type, final IActionSource src) {
final FluidStack removed = this.handler.drain(request.getFluidStack(), type.getFluidAction());
final FluidVolume removed = this.handler.drain(request.getFluidStack(), type.getFluidAction());
if (removed.isEmpty() || removed.getAmount() == 0) {
return null;
@@ -123,18 +123,18 @@ public class MEMonitorIFluidHandler implements IMEMonitor<IAEFluidStack>, ITicki
final CachedFluidStack old = this.memory.get(tank);
high = Math.max(high, tank);
FluidStack newIS = this.handler.getFluidInTank(tank);
FluidVolume newIS = this.handler.getFluidInTank(tank);
if (!newIS.isEmpty() && this.getMode() == StorageFilter.EXTRACTABLE_ONLY) {
// We have to actually check if we could extract _anything_
if (this.handler.drain(1, IFluidHandler.FluidAction.SIMULATE).isEmpty()) {
// Just to safeguard against tanks that prevent non-bucket-size extractions
if (this.handler.drain(FluidAttributes.BUCKET_VOLUME, IFluidHandler.FluidAction.SIMULATE)
.isEmpty()) {
newIS = FluidStack.EMPTY;
newIS = FluidVolume.EMPTY;
}
}
}
final FluidStack oldIS = old == null ? FluidStack.EMPTY : old.fluidStack;
final FluidVolume oldIS = old == null ? FluidVolume.EMPTY : old.fluidStack;
if (isDifferent(newIS, oldIS)) {
final CachedFluidStack cis = new CachedFluidStack(newIS);
@@ -199,7 +199,7 @@ public class MEMonitorIFluidHandler implements IMEMonitor<IAEFluidStack>, ITicki
return changed ? TickRateModulation.URGENT : TickRateModulation.SLOWER;
}
private static boolean isDifferent(FluidStack a, FluidStack b) {
private static boolean isDifferent(FluidVolume a, FluidVolume b) {
if (a == b) {
return false;
}
@@ -288,12 +288,12 @@ public class MEMonitorIFluidHandler implements IMEMonitor<IAEFluidStack>, ITicki
private static class CachedFluidStack {
private final FluidStack fluidStack;
private final FluidVolume fluidStack;
private final IAEFluidStack aeStack;
CachedFluidStack(final FluidStack is) {
CachedFluidStack(final FluidVolume is) {
if (is.isEmpty()) {
this.fluidStack = FluidStack.EMPTY;
this.fluidStack = FluidVolume.EMPTY;
this.aeStack = null;
} else {
this.fluidStack = is.copy();