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

1.16 port

Browse Source
This commit is contained in:
yueh
2020-07-22 16:44:42 +02:00
parent 662dbca3e1
commit 56ecda5173
225 changed files with 1214 additions and 969 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/tile/AEBaseInvTileEntity.java
+3 -2
View File
@@ -22,6 +22,7 @@ import java.util.List;
import javax.annotation.Nonnull;
import net.minecraft.block.BlockState;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.CompoundNBT;
import net.minecraft.tileentity.TileEntityType;
@@ -45,8 +46,8 @@ public abstract class AEBaseInvTileEntity extends AEBaseTileEntity implements IA
}
@Override
public void read(final CompoundNBT data) {
super.read(data);
public void read(BlockState blockState, final CompoundNBT data) {
super.read(blockState, data);
final IItemHandler inv = this.getInternalInventory();
if (inv != EmptyHandler.INSTANCE) {
final CompoundNBT opt = data.getCompound("inv");
src/main/java/appeng/tile/AEBaseTileEntity.java
+4 -4
View File
@@ -105,8 +105,8 @@ public class AEBaseTileEntity extends TileEntity implements IOrientable, ICommon
}
@Override
public void read(final CompoundNBT data) {
super.read(data);
public void read(BlockState blockState, final CompoundNBT data) {
super.read(blockState, data);
if (data.contains("customName")) {
this.customName = data.getString("customName");
@@ -148,7 +148,7 @@ public class AEBaseTileEntity extends TileEntity implements IOrientable, ICommon
public void onDataPacket(final NetworkManager net, final SUpdateTileEntityPacket pkt) {
// / pkt.actionType
if (pkt.getTileEntityType() == 64) {
this.handleUpdateTag(pkt.getNbtCompound());
this.handleUpdateTag(null, pkt.getNbtCompound());
}
}
@@ -220,7 +220,7 @@ public class AEBaseTileEntity extends TileEntity implements IOrientable, ICommon
* chunk.
*/
@Override
public void handleUpdateTag(CompoundNBT tag) {
public void handleUpdateTag(BlockState state, CompoundNBT tag) {
final PacketBuffer stream = new PacketBuffer(Unpooled.copiedBuffer(tag.getByteArray("X")));
if (this.readUpdateData(stream)) {
src/main/java/appeng/tile/crafting/CraftingMonitorTileEntity.java
+3 -2
View File
@@ -23,6 +23,7 @@ import java.util.Optional;
import javax.annotation.Nonnull;
import net.minecraft.block.BlockState;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.CompoundNBT;
@@ -86,8 +87,8 @@ public class CraftingMonitorTileEntity extends CraftingTileEntity implements ICo
}
@Override
public void read(final CompoundNBT data) {
super.read(data);
public void read(BlockState blockState, final CompoundNBT data) {
super.read(blockState, data);
if (data.contains("paintedColor")) {
this.paintedColor = AEColor.values()[data.getByte("paintedColor")];
}
src/main/java/appeng/tile/crafting/CraftingTileEntity.java
+2 -2
View File
@@ -186,8 +186,8 @@ public class CraftingTileEntity extends AENetworkTileEntity
}
@Override
public void read(final CompoundNBT data) {
super.read(data);
public void read(BlockState blockState, final CompoundNBT data) {
super.read(blockState, data);
this.setCoreBlock(data.getBoolean("core"));
if (this.isCoreBlock()) {
if (this.cluster != null) {
src/main/java/appeng/tile/crafting/MolecularAssemblerTileEntity.java
+4 -3
View File
@@ -23,6 +23,7 @@ import java.util.List;
import javax.annotation.Nullable;
import net.minecraft.block.BlockState;
import net.minecraft.inventory.CraftingInventory;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.CompoundNBT;
@@ -219,8 +220,8 @@ public class MolecularAssemblerTileEntity extends AENetworkInvTileEntity
}
@Override
public void read(final CompoundNBT data) {
super.read(data);
public void read(BlockState blockState, final CompoundNBT data) {
super.read(blockState, data);
if (data.contains("myPlan")) {
final ItemStack myPat = ItemStack.read(data.getCompound("myPlan"));
@@ -425,7 +426,7 @@ public class MolecularAssemblerTileEntity extends AENetworkInvTileEntity
final IAEItemStack item = AEItemStack.fromItemStack(output);
if (item != null) {
final TargetPoint where = new TargetPoint(this.pos.getX(), this.pos.getY(), this.pos.getZ(), 32,
this.world.getDimension().getType());
this.world.func_230315_m_());
NetworkHandler.instance()
.sendToAllAround(new AssemblerAnimationPacket(this.pos, (byte) speed, item), where);
}
src/main/java/appeng/tile/grid/AENetworkInvTileEntity.java
+3 -2
View File
@@ -18,6 +18,7 @@
package appeng.tile.grid;
import net.minecraft.block.BlockState;
import net.minecraft.nbt.CompoundNBT;
import net.minecraft.tileentity.TileEntityType;
@@ -37,8 +38,8 @@ public abstract class AENetworkInvTileEntity extends AEBaseInvTileEntity impleme
}
@Override
public void read(final CompoundNBT data) {
super.read(data);
public void read(BlockState blockState, final CompoundNBT data) {
super.read(blockState, data);
this.getProxy().readFromNBT(data);
}
src/main/java/appeng/tile/grid/AENetworkPowerTileEntity.java
+3 -2
View File
@@ -18,6 +18,7 @@
package appeng.tile.grid;
import net.minecraft.block.BlockState;
import net.minecraft.nbt.CompoundNBT;
import net.minecraft.tileentity.TileEntityType;
@@ -39,8 +40,8 @@ public abstract class AENetworkPowerTileEntity extends AEBasePoweredTileEntity i
}
@Override
public void read(final CompoundNBT data) {
super.read(data);
public void read(BlockState blockState, final CompoundNBT data) {
super.read(blockState, data);
this.getProxy().readFromNBT(data);
}
src/main/java/appeng/tile/grid/AENetworkTileEntity.java
+3 -2
View File
@@ -18,6 +18,7 @@
package appeng.tile.grid;
import net.minecraft.block.BlockState;
import net.minecraft.nbt.CompoundNBT;
import net.minecraft.tileentity.TileEntityType;
@@ -39,8 +40,8 @@ public class AENetworkTileEntity extends AEBaseTileEntity implements IActionHost
}
@Override
public void read(final CompoundNBT data) {
super.read(data);
public void read(BlockState blockState, final CompoundNBT data) {
super.read(blockState, data);
this.getProxy().readFromNBT(data);
}
src/main/java/appeng/tile/misc/CellWorkbenchTileEntity.java
+3 -2
View File
@@ -20,6 +20,7 @@ package appeng.tile.misc;
import java.util.List;
import net.minecraft.block.BlockState;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.CompoundNBT;
import net.minecraft.tileentity.TileEntityType;
@@ -103,8 +104,8 @@ public class CellWorkbenchTileEntity extends AEBaseTileEntity
}
@Override
public void read(final CompoundNBT data) {
super.read(data);
public void read(BlockState blockState, final CompoundNBT data) {
super.read(blockState, data);
this.cell.readFromNBT(data, "cell");
this.config.readFromNBT(data, "config");
this.manager.readFromNBT(data);
src/main/java/appeng/tile/misc/CondenserTileEntity.java
+3 -2
View File
@@ -21,6 +21,7 @@ package appeng.tile.misc;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import net.minecraft.block.BlockState;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.CompoundNBT;
import net.minecraft.tileentity.TileEntityType;
@@ -94,8 +95,8 @@ public class CondenserTileEntity extends AEBaseInvTileEntity implements IConfigM
}
@Override
public void read(final CompoundNBT data) {
super.read(data);
public void read(BlockState blockState, final CompoundNBT data) {
super.read(blockState, data);
this.cm.readFromNBT(data);
this.setStoredPower(data.getDouble("storedPower"));
}
src/main/java/appeng/tile/misc/InscriberTileEntity.java
+3 -2
View File
@@ -25,6 +25,7 @@ import java.util.List;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import net.minecraft.block.BlockState;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.CompoundNBT;
import net.minecraft.network.PacketBuffer;
@@ -135,8 +136,8 @@ public class InscriberTileEntity extends AENetworkPowerTileEntity
}
@Override
public void read(final CompoundNBT data) {
super.read(data);
public void read(BlockState blockState, final CompoundNBT data) {
super.read(blockState, data);
this.upgrades.readFromNBT(data, "upgrades");
this.settings.readFromNBT(data);
}
src/main/java/appeng/tile/misc/InterfaceTileEntity.java
+3 -2
View File
@@ -26,6 +26,7 @@ import javax.annotation.Nullable;
import com.google.common.collect.ImmutableSet;
import net.minecraft.block.BlockState;
import net.minecraft.inventory.CraftingInventory;
import net.minecraft.inventory.container.ContainerType;
import net.minecraft.item.ItemStack;
@@ -158,8 +159,8 @@ public class InterfaceTileEntity extends AENetworkInvTileEntity
}
@Override
public void read(final CompoundNBT data) {
super.read(data);
public void read(BlockState blockState, final CompoundNBT data) {
super.read(blockState, data);
this.omniDirectional = data.getBoolean("omniDirectional");
this.duality.readFromNBT(data);
src/main/java/appeng/tile/misc/PaintSplotchesTileEntity.java
+4 -4
View File
@@ -36,7 +36,7 @@ import net.minecraft.network.PacketBuffer;
import net.minecraft.tileentity.TileEntityType;
import net.minecraft.util.Direction;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.Vec3d;
import net.minecraft.util.math.vector.Vector3d;
import net.minecraft.world.LightType;
import net.minecraftforge.client.model.data.IModelData;
import net.minecraftforge.client.model.data.ModelDataMap;
@@ -91,8 +91,8 @@ public class PaintSplotchesTileEntity extends AEBaseTileEntity {
}
@Override
public void read(final CompoundNBT data) {
super.read(data);
public void read(BlockState blockState, final CompoundNBT data) {
super.read(blockState, data);
if (data.contains("dots")) {
this.readBuffer(new PacketBuffer(Unpooled.copiedBuffer(data.getByteArray("dots"))));
}
@@ -211,7 +211,7 @@ public class PaintSplotchesTileEntity extends AEBaseTileEntity {
return this.isLit;
}
public void addBlot(final ItemStack type, final Direction side, final Vec3d hitVec) {
public void addBlot(final ItemStack type, final Direction side, final Vector3d hitVec) {
final BlockPos p = this.pos.offset(side);
final BlockState blk = this.world.getBlockState(p);
src/main/java/appeng/tile/misc/SecurityStationTileEntity.java
+3 -2
View File
@@ -23,6 +23,7 @@ import java.util.EnumSet;
import java.util.List;
import java.util.Map;
import net.minecraft.block.BlockState;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
@@ -172,8 +173,8 @@ public class SecurityStationTileEntity extends AENetworkTileEntity implements IT
}
@Override
public void read(final CompoundNBT data) {
super.read(data);
public void read(BlockState blockState, final CompoundNBT data) {
super.read(blockState, data);
this.cm.readFromNBT(data);
if (data.contains("paintedColor")) {
this.paintedColor = AEColor.values()[data.getByte("paintedColor")];
src/main/java/appeng/tile/misc/VibrationChamberTileEntity.java
+3 -2
View File
@@ -22,6 +22,7 @@ import java.io.IOException;
import javax.annotation.Nonnull;
import net.minecraft.block.BlockState;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.CompoundNBT;
@@ -101,8 +102,8 @@ public class VibrationChamberTileEntity extends AENetworkInvTileEntity implement
}
@Override
public void read(final CompoundNBT data) {
super.read(data);
public void read(BlockState blockState, final CompoundNBT data) {
super.read(blockState, data);
this.setBurnTime(data.getDouble("burnTime"));
this.setMaxBurnTime(data.getDouble("maxBurnTime"));
this.setBurnSpeed(data.getInt("burnSpeed"));
src/main/java/appeng/tile/networking/CableBusTileEntity.java
+5 -4
View File
@@ -25,6 +25,7 @@ import java.util.Set;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import net.minecraft.block.BlockState;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.CompoundNBT;
@@ -33,7 +34,7 @@ import net.minecraft.tileentity.TileEntityType;
import net.minecraft.util.Direction;
import net.minecraft.util.Hand;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.Vec3d;
import net.minecraft.util.math.vector.Vector3d;
import net.minecraft.world.World;
import net.minecraftforge.client.model.data.EmptyModelData;
import net.minecraftforge.client.model.data.IModelData;
@@ -68,8 +69,8 @@ public class CableBusTileEntity extends AEBaseTileEntity implements AEMultiTile
}
@Override
public void read(final CompoundNBT data) {
super.read(data);
public void read(BlockState blockState, final CompoundNBT data) {
super.read(blockState, data);
this.getCableBus().readFromNBT(data);
}
@@ -243,7 +244,7 @@ public class CableBusTileEntity extends AEBaseTileEntity implements AEMultiTile
}
@Override
public SelectedPart selectPart(final Vec3d pos) {
public SelectedPart selectPart(final Vector3d pos) {
return this.getCableBus().selectPart(pos);
}
src/main/java/appeng/tile/networking/EnergyCellTileEntity.java
+3 -2
View File
@@ -18,6 +18,7 @@
package appeng.tile.networking;
import net.minecraft.block.BlockState;
import net.minecraft.nbt.CompoundNBT;
import net.minecraft.tileentity.TileEntityType;
@@ -99,8 +100,8 @@ public class EnergyCellTileEntity extends AENetworkTileEntity implements IAEPowe
}
@Override
public void read(final CompoundNBT data) {
super.read(data);
public void read(BlockState blockState, final CompoundNBT data) {
super.read(blockState, data);
this.internalCurrentPower = data.getDouble("internalCurrentPower");
}
src/main/java/appeng/tile/powersink/AEBasePoweredTileEntity.java
+3 -2
View File
@@ -25,6 +25,7 @@ import javax.annotation.Nonnull;
import com.google.common.collect.ImmutableSet;
import net.minecraft.block.BlockState;
import net.minecraft.nbt.CompoundNBT;
import net.minecraft.tileentity.TileEntityType;
import net.minecraft.util.Direction;
@@ -85,8 +86,8 @@ public abstract class AEBasePoweredTileEntity extends AEBaseInvTileEntity
}
@Override
public void read(final CompoundNBT data) {
super.read(data);
public void read(BlockState blockState, final CompoundNBT data) {
super.read(blockState, data);
this.setInternalCurrentPower(data.getDouble("internalCurrentPower"));
}
src/main/java/appeng/tile/spatial/SpatialIOPortTileEntity.java
+3 -2
View File
@@ -20,6 +20,7 @@ package appeng.tile.spatial;
import javax.annotation.Nonnull;
import net.minecraft.block.BlockState;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.CompoundNBT;
import net.minecraft.tileentity.TileEntityType;
@@ -70,8 +71,8 @@ public class SpatialIOPortTileEntity extends AENetworkInvTileEntity implements I
}
@Override
public void read(final CompoundNBT data) {
super.read(data);
public void read(BlockState blockState, final CompoundNBT data) {
super.read(blockState, data);
if (data.contains("lastRedstoneState")) {
this.lastRedstoneState = YesNo.values()[data.getInt("lastRedstoneState")];
}
src/main/java/appeng/tile/storage/ChestTileEntity.java
+28 -6
View File
@@ -25,6 +25,7 @@ import java.util.List;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import net.minecraft.block.BlockState;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.inventory.container.ContainerType;
import net.minecraft.item.Item;
@@ -45,22 +46,43 @@ import net.minecraftforge.fluids.capability.IFluidHandler;
import net.minecraftforge.items.IItemHandler;
import net.minecraftforge.registries.ForgeRegistries;
import appeng.api.config.*;
import appeng.api.config.AccessRestriction;
import appeng.api.config.Actionable;
import appeng.api.config.PowerMultiplier;
import appeng.api.config.SecurityPermissions;
import appeng.api.config.Settings;
import appeng.api.config.SortDir;
import appeng.api.config.SortOrder;
import appeng.api.config.ViewItems;
import appeng.api.implementations.tiles.IColorableTile;
import appeng.api.implementations.tiles.IMEChest;
import appeng.api.networking.GridFlags;
import appeng.api.networking.IGrid;
import appeng.api.networking.IGridNode;
import appeng.api.networking.energy.IEnergyGrid;
import appeng.api.networking.events.*;
import appeng.api.networking.events.MENetworkCellArrayUpdate;
import appeng.api.networking.events.MENetworkChannelsChanged;
import appeng.api.networking.events.MENetworkEventSubscribe;
import appeng.api.networking.events.MENetworkPowerStatusChange;
import appeng.api.networking.events.MENetworkPowerStorage;
import appeng.api.networking.events.MENetworkPowerStorage.PowerEventType;
import appeng.api.networking.security.IActionHost;
import appeng.api.networking.security.IActionSource;
import appeng.api.networking.security.ISecurityGrid;
import appeng.api.networking.storage.IBaseMonitor;
import appeng.api.networking.storage.IStorageGrid;
import appeng.api.storage.*;
import appeng.api.storage.cells.*;
import appeng.api.storage.IMEInventoryHandler;
import appeng.api.storage.IMEMonitor;
import appeng.api.storage.IMEMonitorHandlerReceiver;
import appeng.api.storage.IStorageChannel;
import appeng.api.storage.IStorageMonitorable;
import appeng.api.storage.IStorageMonitorableAccessor;
import appeng.api.storage.ITerminalHost;
import appeng.api.storage.cells.CellState;
import appeng.api.storage.cells.ICellGuiHandler;
import appeng.api.storage.cells.ICellHandler;
import appeng.api.storage.cells.ICellInventory;
import appeng.api.storage.cells.ICellInventoryHandler;
import appeng.api.storage.channels.IFluidStorageChannel;
import appeng.api.storage.channels.IItemStorageChannel;
import appeng.api.storage.data.IAEFluidStack;
@@ -378,8 +400,8 @@ public class ChestTileEntity extends AENetworkPowerTileEntity
}
@Override
public void read(final CompoundNBT data) {
super.read(data);
public void read(BlockState blockState, final CompoundNBT data) {
super.read(blockState, data);
this.config.readFromNBT(data);
this.priority = data.getInt("priority");
if (data.contains("paintedColor")) {
src/main/java/appeng/tile/storage/DriveTileEntity.java
+3 -2
View File
@@ -30,6 +30,7 @@ import java.util.Map;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import net.minecraft.block.BlockState;
import net.minecraft.inventory.container.ContainerType;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
@@ -262,8 +263,8 @@ public class DriveTileEntity extends AENetworkInvTileEntity implements IChestOrD
}
@Override
public void read(final CompoundNBT data) {
super.read(data);
public void read(BlockState blockState, final CompoundNBT data) {
super.read(blockState, data);
this.isCached = false;
this.priority = data.getInt("priority");
}
src/main/java/appeng/tile/storage/IOPortTileEntity.java
+3 -2
View File
@@ -23,6 +23,7 @@ import java.util.List;
import java.util.Map;
import net.minecraft.block.Block;
import net.minecraft.block.BlockState;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.CompoundNBT;
import net.minecraft.tileentity.TileEntityType;
@@ -120,8 +121,8 @@ public class IOPortTileEntity extends AENetworkInvTileEntity
}
@Override
public void read(final CompoundNBT data) {
super.read(data);
public void read(BlockState blockState, final CompoundNBT data) {
super.read(blockState, data);
this.manager.readFromNBT(data);
this.upgrades.readFromNBT(data, "upgrades");
if (data.contains("lastRedstoneState")) {