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

More compile things

Browse Source
This commit is contained in:
covers1624
2020-06-01 22:17:34 +09:30
parent 086b9ab1e3
commit dffea9a167
42 changed files with 188 additions and 211 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/tile/AEBaseTile.java
+3 -4
View File
@@ -37,15 +37,14 @@ import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.CompoundNBT;
import net.minecraft.network.NetworkManager;
import net.minecraft.network.PacketBuffer;
import net.minecraft.network.play.server.SUpdateTileEntityPacket;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.tileentity.TileEntityType;
import net.minecraft.util.Direction;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import net.minecraftforge.items.IItemHandler;
import appeng.api.implementations.tiles.ISegmentedInventory;
import appeng.api.util.ICommonTile;
import appeng.api.util.IConfigManager;
import appeng.api.util.IConfigurableObject;
@@ -180,7 +179,7 @@ public class AEBaseTile extends TileEntity implements IOrientable, ICommonTile,
{
final CompoundNBT data = new CompoundNBT();
final ByteBuf stream = Unpooled.buffer();
final PacketBuffer stream = new PacketBuffer( Unpooled.buffer() );
try
{
@@ -273,7 +272,7 @@ public class AEBaseTile extends TileEntity implements IOrientable, ICommonTile,
return false;
}
protected void writeToStream( final ByteBuf data ) throws IOException
protected void writeToStream( final PacketBuffer data ) throws IOException
{
if( this.canBeRotated() )
{
src/main/java/appeng/tile/crafting/TileCraftingMonitorTile.java
+2 -2
View File
@@ -27,11 +27,11 @@ import io.netty.buffer.ByteBuf;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.CompoundNBT;
import net.minecraft.network.PacketBuffer;
import net.minecraft.util.Direction;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
import appeng.api.AEApi;
import appeng.api.implementations.tiles.IColorableTile;
import appeng.api.storage.data.IAEItemStack;
import appeng.api.util.AEColor;
@@ -73,7 +73,7 @@ public class TileCraftingMonitorTile extends TileCraftingTile implements IColora
}
@Override
protected void writeToStream( final ByteBuf data ) throws IOException
protected void writeToStream( final PacketBuffer data ) throws IOException
{
super.writeToStream( data );
data.writeByte( this.paintedColor.ordinal() );
src/main/java/appeng/tile/crafting/TileMolecularAssembler.java
+2 -2
View File
@@ -27,6 +27,7 @@ import io.netty.buffer.ByteBuf;
import net.minecraft.inventory.InventoryCrafting;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.CompoundNBT;
import net.minecraft.network.PacketBuffer;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.Direction;
import net.minecraft.util.math.BlockPos;
@@ -36,7 +37,6 @@ import net.minecraftforge.fml.common.FMLCommonHandler;
import net.minecraftforge.fml.common.network.NetworkRegistry.TargetPoint;
import net.minecraftforge.items.IItemHandler;
import appeng.api.AEApi;
import appeng.api.config.Actionable;
import appeng.api.config.PowerMultiplier;
import appeng.api.config.RedstoneMode;
@@ -206,7 +206,7 @@ public class TileMolecularAssembler extends AENetworkInvTile implements IUpgrade
}
@Override
protected void writeToStream( final ByteBuf data ) throws IOException
protected void writeToStream( final PacketBuffer data ) throws IOException
{
super.writeToStream( data );
data.writeBoolean( this.isPowered );
src/main/java/appeng/tile/grindstone/TileCrank.java
+2 -1
View File
@@ -27,6 +27,7 @@ import io.netty.buffer.ByteBuf;
import net.minecraft.block.BlockState;
import net.minecraft.entity.Entity;
import net.minecraft.network.PacketBuffer;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.Direction;
import net.minecraft.util.ITickable;
@@ -98,7 +99,7 @@ public class TileCrank extends AEBaseTile implements ICustomCollision, ITickable
}
@Override
protected void writeToStream( final ByteBuf data ) throws IOException
protected void writeToStream( final PacketBuffer data ) throws IOException
{
super.writeToStream( data );
data.writeInt( this.rotation );
src/main/java/appeng/tile/misc/TileCharger.java
+2 -2
View File
@@ -28,10 +28,10 @@ import io.netty.buffer.ByteBuf;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.item.ItemStack;
import net.minecraft.network.PacketBuffer;
import net.minecraft.util.Direction;
import net.minecraftforge.items.IItemHandler;
import appeng.api.AEApi;
import appeng.api.config.Actionable;
import appeng.api.config.PowerMultiplier;
import appeng.api.config.PowerUnits;
@@ -97,7 +97,7 @@ public class TileCharger extends AENetworkPowerTile implements ICrankable, IGrid
}
@Override
protected void writeToStream( final ByteBuf data ) throws IOException
protected void writeToStream( final PacketBuffer data ) throws IOException
{
super.writeToStream( data );
final AEItemStack is = AEItemStack.fromItemStack( this.inv.getStackInSlot( 0 ) );
src/main/java/appeng/tile/misc/TileInscriber.java
+2 -2
View File
@@ -32,13 +32,13 @@ import io.netty.buffer.ByteBuf;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.CompoundNBT;
import net.minecraft.network.PacketBuffer;
import net.minecraft.util.Direction;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import net.minecraftforge.items.IItemHandler;
import net.minecraftforge.items.IItemHandlerModifiable;
import appeng.api.AEApi;
import appeng.api.config.Actionable;
import appeng.api.config.PowerMultiplier;
import appeng.api.config.Upgrades;
@@ -180,7 +180,7 @@ public class TileInscriber extends AENetworkPowerTile implements IGridTickable,
}
@Override
protected void writeToStream( final ByteBuf data ) throws IOException
protected void writeToStream( final PacketBuffer data ) throws IOException
{
super.writeToStream( data );
int slot = this.isSmash() ? 64 : 0;
src/main/java/appeng/tile/misc/TileInterface.java
+2 -2
View File
@@ -32,6 +32,7 @@ import io.netty.buffer.ByteBuf;
import net.minecraft.inventory.InventoryCrafting;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.CompoundNBT;
import net.minecraft.network.PacketBuffer;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.Direction;
import net.minecraft.util.math.BlockPos;
@@ -39,7 +40,6 @@ import net.minecraft.world.World;
import net.minecraftforge.common.capabilities.Capability;
import net.minecraftforge.items.IItemHandler;
import appeng.api.AEApi;
import appeng.api.config.Actionable;
import appeng.api.config.Upgrades;
import appeng.api.networking.IGridNode;
@@ -194,7 +194,7 @@ public class TileInterface extends AENetworkInvTile implements IGridTickable, II
}
@Override
protected void writeToStream( final ByteBuf data ) throws IOException
protected void writeToStream( final PacketBuffer data ) throws IOException
{
super.writeToStream( data );
data.writeBoolean( this.omniDirectional );
src/main/java/appeng/tile/misc/TilePaint.java
+2 -1
View File
@@ -32,6 +32,7 @@ import io.netty.buffer.Unpooled;
import net.minecraft.block.BlockState;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.CompoundNBT;
import net.minecraft.network.PacketBuffer;
import net.minecraft.util.Direction;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.Vec3d;
@@ -139,7 +140,7 @@ public class TilePaint extends AEBaseTile
}
@Override
protected void writeToStream( final ByteBuf data ) throws IOException
protected void writeToStream( final PacketBuffer data ) throws IOException
{
super.writeToStream( data );
this.writeBuffer( data );
src/main/java/appeng/tile/misc/TileQuartzGrowthAccelerator.java
+2 -1
View File
@@ -24,6 +24,7 @@ import java.util.EnumSet;
import io.netty.buffer.ByteBuf;
import net.minecraft.network.PacketBuffer;
import net.minecraft.util.Direction;
import appeng.api.implementations.IPowerChannelState;
@@ -71,7 +72,7 @@ public class TileQuartzGrowthAccelerator extends AENetworkTile implements IPower
}
@Override
public void writeToStream( final ByteBuf data ) throws IOException
public void writeToStream( final PacketBuffer data ) throws IOException
{
super.writeToStream( data );
try
src/main/java/appeng/tile/misc/TileSecurityStation.java
+2 -2
View File
@@ -31,13 +31,13 @@ import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTBase;
import net.minecraft.nbt.CompoundNBT;
import net.minecraft.network.PacketBuffer;
import net.minecraft.util.Direction;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.items.IItemHandler;
import appeng.api.AEApi;
import appeng.api.config.SecurityPermissions;
import appeng.api.config.Settings;
import appeng.api.config.SortDir;
@@ -150,7 +150,7 @@ public class TileSecurityStation extends AENetworkTile implements ITerminalHost,
}
@Override
protected void writeToStream( final ByteBuf data ) throws IOException
protected void writeToStream( final PacketBuffer data ) throws IOException
{
super.writeToStream( data );
data.writeBoolean( this.getProxy().isActive() );
src/main/java/appeng/tile/misc/TileVibrationChamber.java
+2 -1
View File
@@ -28,6 +28,7 @@ import io.netty.buffer.ByteBuf;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.CompoundNBT;
import net.minecraft.network.PacketBuffer;
import net.minecraft.tileentity.TileEntityFurnace;
import net.minecraft.util.Direction;
import net.minecraftforge.items.IItemHandler;
@@ -91,7 +92,7 @@ public class TileVibrationChamber extends AENetworkInvTile implements IGridTicka
}
@Override
protected void writeToStream( final ByteBuf data ) throws IOException
protected void writeToStream( final PacketBuffer data ) throws IOException
{
super.writeToStream( data );
data.writeBoolean( this.getBurnTime() > 0 );
src/main/java/appeng/tile/networking/TileCableBus.java
+2 -1
View File
@@ -31,6 +31,7 @@ import net.minecraft.entity.Entity;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.CompoundNBT;
import net.minecraft.network.PacketBuffer;
import net.minecraft.util.Direction;
import net.minecraft.util.Hand;
import net.minecraft.util.math.AxisAlignedBB;
@@ -98,7 +99,7 @@ public class TileCableBus extends AEBaseTile implements AEMultiTile, ICustomColl
}
@Override
protected void writeToStream( final ByteBuf data ) throws IOException
protected void writeToStream( final PacketBuffer data ) throws IOException
{
super.writeToStream( data );
this.getCableBus().writeToStream( data );
src/main/java/appeng/tile/networking/TileWireless.java
+2 -2
View File
@@ -25,10 +25,10 @@ import java.util.EnumSet;
import io.netty.buffer.ByteBuf;
import net.minecraft.item.ItemStack;
import net.minecraft.network.PacketBuffer;
import net.minecraft.util.Direction;
import net.minecraftforge.items.IItemHandler;
import appeng.api.AEApi;
import appeng.api.implementations.IPowerChannelState;
import appeng.api.implementations.tiles.IWirelessAccessPoint;
import appeng.api.networking.GridFlags;
@@ -95,7 +95,7 @@ public class TileWireless extends AENetworkInvTile implements IWirelessAccessPoi
}
@Override
protected void writeToStream( final ByteBuf data ) throws IOException
protected void writeToStream( final PacketBuffer data ) throws IOException
{
super.writeToStream( data );
this.setClientFlags( 0 );
src/main/java/appeng/tile/qnb/TileQuantumBridge.java
+2 -2
View File
@@ -28,13 +28,13 @@ import io.netty.buffer.ByteBuf;
import net.minecraft.block.Block;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.CompoundNBT;
import net.minecraft.network.PacketBuffer;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.Direction;
import net.minecraft.util.ITickable;
import net.minecraftforge.items.IItemHandler;
import net.minecraftforge.items.wrapper.EmptyHandler;
import appeng.api.AEApi;
import appeng.api.definitions.IBlockDefinition;
import appeng.api.networking.GridFlags;
import appeng.api.networking.events.MENetworkEventSubscribe;
@@ -87,7 +87,7 @@ public class TileQuantumBridge extends AENetworkInvTile implements IAEMultiBlock
}
@Override
protected void writeToStream( final ByteBuf data ) throws IOException
protected void writeToStream( final PacketBuffer data ) throws IOException
{
super.writeToStream( data );
int out = this.constructed;
src/main/java/appeng/tile/spatial/TileSpatialPylon.java
+2 -1
View File
@@ -24,6 +24,7 @@ import java.util.EnumSet;
import io.netty.buffer.ByteBuf;
import net.minecraft.network.PacketBuffer;
import net.minecraft.util.Direction;
import appeng.api.networking.GridFlags;
@@ -226,7 +227,7 @@ public class TileSpatialPylon extends AENetworkTile implements IAEMultiBlock
}
@Override
protected void writeToStream( final ByteBuf data ) throws IOException
protected void writeToStream( final PacketBuffer data ) throws IOException
{
super.writeToStream( data );
data.writeByte( this.displayBits );
src/main/java/appeng/tile/storage/TileChest.java
+2 -2
View File
@@ -31,6 +31,7 @@ import io.netty.buffer.ByteBuf;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.CompoundNBT;
import net.minecraft.network.PacketBuffer;
import net.minecraft.util.Direction;
import net.minecraft.util.ITickable;
import net.minecraftforge.common.capabilities.Capability;
@@ -42,7 +43,6 @@ import net.minecraftforge.fluids.capability.IFluidHandler;
import net.minecraftforge.fluids.capability.IFluidTankProperties;
import net.minecraftforge.items.IItemHandler;
import appeng.api.AEApi;
import appeng.api.config.AccessRestriction;
import appeng.api.config.Actionable;
import appeng.api.config.PowerMultiplier;
@@ -383,7 +383,7 @@ public class TileChest extends AENetworkPowerTile implements IMEChest, ITerminal
}
@Override
protected void writeToStream( final ByteBuf data ) throws IOException
protected void writeToStream( final PacketBuffer data ) throws IOException
{
super.writeToStream( data );
src/main/java/appeng/tile/storage/TileDrive.java
+2 -2
View File
@@ -31,9 +31,9 @@ import io.netty.buffer.ByteBuf;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.CompoundNBT;
import net.minecraft.network.PacketBuffer;
import net.minecraftforge.items.IItemHandler;
import appeng.api.AEApi;
import appeng.api.implementations.tiles.IChestOrDrive;
import appeng.api.networking.GridFlags;
import appeng.api.networking.events.MENetworkCellArrayUpdate;
@@ -104,7 +104,7 @@ public class TileDrive extends AENetworkInvTile implements IChestOrDrive, IPrior
}
@Override
protected void writeToStream( final ByteBuf data ) throws IOException
protected void writeToStream( final PacketBuffer data ) throws IOException
{
super.writeToStream( data );
int newState = 0;
src/main/java/appeng/tile/storage/TileSkyChest.java
+2 -1
View File
@@ -26,6 +26,7 @@ import io.netty.buffer.ByteBuf;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.init.SoundEvents;
import net.minecraft.item.ItemStack;
import net.minecraft.network.PacketBuffer;
import net.minecraft.util.ITickable;
import net.minecraft.util.SoundCategory;
import net.minecraftforge.items.IItemHandler;
@@ -47,7 +48,7 @@ public class TileSkyChest extends AEBaseInvTile implements ITickable
private float prevLidAngle;
@Override
protected void writeToStream( final ByteBuf data ) throws IOException
protected void writeToStream( final PacketBuffer data ) throws IOException
{
super.writeToStream( data );
data.writeBoolean( this.getPlayerOpen() > 0 );