API compiles

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
@@ -18,9 +18,9 @@
package appeng.tile.networking;
import com.mojang.blaze3d.matrix.MatrixStack;
import net.minecraft.client.util.math.MatrixStack;
import net.minecraft.client.renderer.IRenderTypeBuffer;
import net.minecraft.client.render.VertexConsumerProvider;
import net.minecraft.client.renderer.tileentity.TileEntityRenderer;
import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher;
import net.minecraft.util.math.Direction;
@@ -34,7 +34,7 @@ public class CableBusTESR extends TileEntityRenderer<CableBusTileEntity> {
}
@Override
public void render(CableBusTileEntity te, float partialTicks, MatrixStack ms, IRenderTypeBuffer buffers,
public void render(CableBusTileEntity te, float partialTicks, MatrixStack ms, VertexConsumerProvider buffers,
int combinedLightIn, int combinedOverlayIn) {
if (!te.getCableBus().isRequiresDynamicRender()) {
return;
@@ -25,11 +25,11 @@ import java.util.Set;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import net.minecraft.block.entity.BlockEntityType;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.network.PacketBuffer;
import net.minecraft.tileentity.TileEntityType;
import net.minecraft.network.PacketByteBuf;
import net.minecraft.util.math.Direction;
import net.minecraft.util.Hand;
import net.minecraft.util.math.BlockPos;
@@ -63,7 +63,7 @@ public class CableBusTileEntity extends AEBaseTileEntity implements AEMultiTile
private int oldLV = -1; // on re-calculate light when it changes
public CableBusTileEntity(TileEntityType<?> tileEntityTypeIn) {
public CableBusTileEntity(BlockEntityType<?> tileEntityTypeIn) {
super(tileEntityTypeIn);
}
@@ -81,7 +81,7 @@ public class CableBusTileEntity extends AEBaseTileEntity implements AEMultiTile
}
@Override
protected boolean readFromStream(final PacketBuffer data) throws IOException {
protected boolean readFromStream(final PacketByteBuf data) throws IOException {
final boolean c = super.readFromStream(data);
boolean ret = this.getCableBus().readFromStream(data);
@@ -97,7 +97,7 @@ public class CableBusTileEntity extends AEBaseTileEntity implements AEMultiTile
}
@Override
protected void writeToStream(final PacketBuffer data) throws IOException {
protected void writeToStream(final PacketByteBuf data) throws IOException {
super.writeToStream(data);
this.getCableBus().writeToStream(data);
}
@@ -21,11 +21,11 @@ package appeng.tile.networking;
import java.util.EnumSet;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntityType;
import net.minecraft.block.entity.BlockEntityType;
import net.minecraft.util.math.Direction;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.ChunkPos;
import net.minecraftforge.items.IItemHandler;
import alexiil.mc.lib.attributes.item.ItemTransferable;
import net.minecraftforge.items.wrapper.EmptyHandler;
import appeng.api.config.Actionable;
@@ -48,7 +48,7 @@ import appeng.util.inv.InvOperation;
public class ControllerTileEntity extends AENetworkPowerTileEntity {
private boolean isValid = false;
public ControllerTileEntity(TileEntityType<?> tileEntityTypeIn) {
public ControllerTileEntity(BlockEntityType<?> tileEntityTypeIn) {
super(tileEntityTypeIn);
this.setInternalMaxPower(8000);
this.setInternalPublicPowerStorage(true);
@@ -168,13 +168,13 @@ public class ControllerTileEntity extends AENetworkPowerTileEntity {
}
@Override
public IItemHandler getInternalInventory() {
public ItemTransferable getInternalInventory() {
return EmptyHandler.INSTANCE;
}
@Override
public void onChangeInventory(final IItemHandler inv, final int slot, final InvOperation mc,
final ItemStack removed, final ItemStack added) {
public void onChangeInventory(final ItemTransferable inv, final int slot, final InvOperation mc,
final ItemStack removed, final ItemStack added) {
}
/**
@@ -18,7 +18,7 @@
package appeng.tile.networking;
import net.minecraft.tileentity.TileEntityType;
import net.minecraft.block.entity.BlockEntityType;
import appeng.api.config.AccessRestriction;
import appeng.api.config.Actionable;
@@ -30,7 +30,7 @@ import appeng.tile.grid.AENetworkTileEntity;
public class CreativeEnergyCellTileEntity extends AENetworkTileEntity implements IAEPowerStorage {
public CreativeEnergyCellTileEntity(TileEntityType<?> tileEntityTypeIn) {
public CreativeEnergyCellTileEntity(BlockEntityType<?> tileEntityTypeIn) {
super(tileEntityTypeIn);
this.getProxy().setIdlePowerUsage(0);
}
@@ -18,11 +18,11 @@
package appeng.tile.networking;
import net.minecraft.tileentity.TileEntityType;
import net.minecraft.block.entity.BlockEntityType;
public class DenseEnergyCellTileEntity extends EnergyCellTileEntity {
public DenseEnergyCellTileEntity(TileEntityType<?> tileEntityTypeIn) {
public DenseEnergyCellTileEntity(BlockEntityType<?> tileEntityTypeIn) {
super(tileEntityTypeIn);
this.setInternalMaxPower(200000 * 8);
}
@@ -18,9 +18,9 @@
package appeng.tile.networking;
import net.minecraft.block.entity.BlockEntityType;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntityType;
import net.minecraftforge.items.IItemHandler;
import alexiil.mc.lib.attributes.item.ItemTransferable;
import net.minecraftforge.items.wrapper.EmptyHandler;
import appeng.api.config.Actionable;
@@ -33,7 +33,7 @@ import appeng.util.inv.InvOperation;
public class EnergyAcceptorTileEntity extends AENetworkPowerTileEntity {
public EnergyAcceptorTileEntity(TileEntityType<?> tileEntityTypeIn) {
public EnergyAcceptorTileEntity(BlockEntityType<?> tileEntityTypeIn) {
super(tileEntityTypeIn);
this.getProxy().setIdlePowerUsage(0.0);
this.setInternalMaxPower(0);
@@ -68,13 +68,13 @@ public class EnergyAcceptorTileEntity extends AENetworkPowerTileEntity {
}
@Override
public IItemHandler getInternalInventory() {
public ItemTransferable getInternalInventory() {
return EmptyHandler.INSTANCE;
}
@Override
public void onChangeInventory(final IItemHandler inv, final int slot, final InvOperation mc,
final ItemStack removed, final ItemStack added) {
public void onChangeInventory(final ItemTransferable inv, final int slot, final InvOperation mc,
final ItemStack removed, final ItemStack added) {
}
}
@@ -18,8 +18,8 @@
package appeng.tile.networking;
import net.minecraft.block.entity.BlockEntityType;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.tileentity.TileEntityType;
import appeng.api.config.AccessRestriction;
import appeng.api.config.Actionable;
@@ -41,7 +41,7 @@ public class EnergyCellTileEntity extends AENetworkTileEntity implements IAEPowe
private byte currentMeta = -1;
public EnergyCellTileEntity(TileEntityType<?> tileEntityTypeIn) {
public EnergyCellTileEntity(BlockEntityType<?> tileEntityTypeIn) {
super(tileEntityTypeIn);
this.getProxy().setIdlePowerUsage(0);
}
@@ -21,11 +21,11 @@ package appeng.tile.networking;
import java.io.IOException;
import java.util.EnumSet;
import alexiil.mc.lib.attributes.item.ItemTransferable;
import net.minecraft.item.ItemStack;
import net.minecraft.network.PacketBuffer;
import net.minecraft.tileentity.TileEntityType;
import net.minecraft.network.PacketByteBuf;
import net.minecraft.block.entity.BlockEntityType;
import net.minecraft.util.math.Direction;
import net.minecraftforge.items.IItemHandler;
import appeng.api.AEApi;
import appeng.api.implementations.IPowerChannelState;
@@ -54,7 +54,7 @@ public class WirelessTileEntity extends AENetworkInvTileEntity implements IWirel
private int clientFlags = 0;
public WirelessTileEntity(TileEntityType<?> tileEntityTypeIn) {
public WirelessTileEntity(BlockEntityType<?> tileEntityTypeIn) {
super(tileEntityTypeIn);
this.inv.setFilter(new AEItemDefinitionFilter(AEApi.instance().definitions().materials().wirelessBooster()));
this.getProxy().setFlags(GridFlags.REQUIRE_CHANNEL);
@@ -78,7 +78,7 @@ public class WirelessTileEntity extends AENetworkInvTileEntity implements IWirel
}
@Override
protected boolean readFromStream(final PacketBuffer data) throws IOException {
protected boolean readFromStream(final PacketByteBuf data) throws IOException {
final boolean c = super.readFromStream(data);
final int old = this.getClientFlags();
this.setClientFlags(data.readByte());
@@ -87,7 +87,7 @@ public class WirelessTileEntity extends AENetworkInvTileEntity implements IWirel
}
@Override
protected void writeToStream(final PacketBuffer data) throws IOException {
protected void writeToStream(final PacketByteBuf data) throws IOException {
super.writeToStream(data);
this.setClientFlags(0);
@@ -117,13 +117,13 @@ public class WirelessTileEntity extends AENetworkInvTileEntity implements IWirel
}
@Override
public IItemHandler getInternalInventory() {
public ItemTransferable getInternalInventory() {
return this.inv;
}
@Override
public void onChangeInventory(final IItemHandler inv, final int slot, final InvOperation mc,
final ItemStack removed, final ItemStack added) {
public void onChangeInventory(final ItemTransferable inv, final int slot, final InvOperation mc,
final ItemStack removed, final ItemStack added) {
// :P
}