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

Deleted useless things

Browse Source
This commit is contained in:
Andrew
2014-10-03 23:08:28 -07:00
parent b8cc7fb788
commit 7f225a5ec1
91 changed files with 204 additions and 595 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/core/WorldSettings.java
+2 -17
View File
@@ -3,7 +3,6 @@ package appeng.core;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
import java.lang.ref.WeakReference;
import java.util.ArrayList;
import java.util.Collection;
@@ -230,14 +229,7 @@ public class WorldSettings extends Configuration
storageCellDims.add( newDim );
DimensionManager.registerDimension( newDim, AEConfig.instance.storageProviderID );
try
{
NetworkHandler.instance.sendToAll( new PacketNewStorageDimension( newDim ) );
}
catch (IOException e)
{
e.printStackTrace();
}
NetworkHandler.instance.sendToAll( new PacketNewStorageDimension( newDim ) );
String[] values = new String[storageCellDims.size()];
@@ -293,14 +285,7 @@ public class WorldSettings extends Configuration
{
for (int newDim : get( "DimensionManager", "StorageCells", new int[0] ).getIntList())
{
try
{
manager.scheduleOutboundPacket( (new PacketNewStorageDimension( newDim )).getProxy() );
}
catch (IOException e)
{
AELog.error( e );
}
manager.scheduleOutboundPacket( (new PacketNewStorageDimension( newDim )).getProxy() );
}
}
else
src/main/java/appeng/core/api/ApiPart.java
+2 -3
View File
@@ -1,6 +1,5 @@
package appeng.core.api;
import java.io.IOException;
import java.io.InputStream;
import java.util.HashMap;
import java.util.Iterator;
@@ -98,7 +97,7 @@ public class ApiPart implements IPartHelper
return clazz;
}
public ClassNode getReader(String name) throws IOException
public ClassNode getReader(String name)
{
try
{
@@ -212,7 +211,7 @@ public class ApiPart implements IPartHelper
}
public Class getClassByDesc(String Addendum, String fullPath, String root, String next) throws IOException
public Class getClassByDesc(String Addendum, String fullPath, String root, String next)
{
if ( roots.get( fullPath ) != null )
return roots.get( fullPath );
src/main/java/appeng/core/sync/packets/PacketClick.java
+2 -4
View File
@@ -3,8 +3,6 @@ package appeng.core.sync.packets;
import io.netty.buffer.ByteBuf;
import io.netty.buffer.Unpooled;
import java.io.IOException;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import appeng.api.AEApi;
@@ -27,7 +25,7 @@ public class PacketClick extends AppEngPacket
final float hitZ;
// automatic.
public PacketClick(ByteBuf stream) throws IOException {
public PacketClick(ByteBuf stream) {
x = stream.readInt();
y = stream.readInt();
z = stream.readInt();
@@ -60,7 +58,7 @@ public class PacketClick extends AppEngPacket
}
// api
public PacketClick(int x, int y, int z, int side, float hitX, float hitY, float hitZ) throws IOException {
public PacketClick(int x, int y, int z, int side, float hitX, float hitY, float hitZ) {
ByteBuf data = Unpooled.buffer();
src/main/java/appeng/core/sync/packets/PacketCompassRequest.java
+2 -4
View File
@@ -3,8 +3,6 @@ package appeng.core.sync.packets;
import io.netty.buffer.ByteBuf;
import io.netty.buffer.Unpooled;
import java.io.IOException;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.EntityPlayerMP;
import appeng.api.util.DimensionalCoord;
@@ -23,7 +21,7 @@ public class PacketCompassRequest extends AppEngPacket implements ICompassCallba
EntityPlayer talkBackTo;
// automatic.
public PacketCompassRequest(ByteBuf stream) throws IOException {
public PacketCompassRequest(ByteBuf stream) {
attunement = stream.readLong();
cx = stream.readInt();
cz = stream.readInt();
@@ -46,7 +44,7 @@ public class PacketCompassRequest extends AppEngPacket implements ICompassCallba
}
// api
public PacketCompassRequest(long attunement, int cx, int cz, int cdy) throws IOException {
public PacketCompassRequest(long attunement, int cx, int cz, int cdy) {
ByteBuf data = Unpooled.buffer();
src/main/java/appeng/core/sync/packets/PacketCompassResponse.java
+1 -3
View File
@@ -3,8 +3,6 @@ package appeng.core.sync.packets;
import io.netty.buffer.ByteBuf;
import io.netty.buffer.Unpooled;
import java.io.IOException;
import net.minecraft.entity.player.EntityPlayer;
import appeng.core.sync.AppEngPacket;
import appeng.core.sync.network.INetworkInfo;
@@ -20,7 +18,7 @@ public class PacketCompassResponse extends AppEngPacket
public CompassResult cr;
// automatic.
public PacketCompassResponse(ByteBuf stream) throws IOException {
public PacketCompassResponse(ByteBuf stream) {
attunement = stream.readLong();
cx = stream.readInt();
cz = stream.readInt();
src/main/java/appeng/core/sync/packets/PacketConfigButton.java
+2 -4
View File
@@ -3,8 +3,6 @@ package appeng.core.sync.packets;
import io.netty.buffer.ByteBuf;
import io.netty.buffer.Unpooled;
import java.io.IOException;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.EntityPlayerMP;
import appeng.api.config.Settings;
@@ -22,7 +20,7 @@ public class PacketConfigButton extends AppEngPacket
final public boolean rotationDirection;
// automatic.
public PacketConfigButton(ByteBuf stream) throws IOException {
public PacketConfigButton(ByteBuf stream) {
option = Settings.values()[stream.readInt()];
rotationDirection = stream.readBoolean();
}
@@ -41,7 +39,7 @@ public class PacketConfigButton extends AppEngPacket
}
// api
public PacketConfigButton(Settings option, boolean rotationDirection) throws IOException {
public PacketConfigButton(Settings option, boolean rotationDirection) {
this.option = option;
this.rotationDirection = rotationDirection;
src/main/java/appeng/core/sync/packets/PacketCraftRequest.java
+4 -4
View File
@@ -3,7 +3,6 @@ package appeng.core.sync.packets;
import io.netty.buffer.ByteBuf;
import io.netty.buffer.Unpooled;
import java.io.IOException;
import java.util.concurrent.Future;
import net.minecraft.entity.player.EntityPlayer;
@@ -30,7 +29,8 @@ public class PacketCraftRequest extends AppEngPacket
final public boolean heldShift;
// automatic.
public PacketCraftRequest(ByteBuf stream) throws IOException {
public PacketCraftRequest(ByteBuf stream)
{
heldShift = stream.readBoolean();
amount = stream.readLong();
}
@@ -88,8 +88,8 @@ public class PacketCraftRequest extends AppEngPacket
}
}
public PacketCraftRequest(int craftAmt, boolean shift) throws IOException {
public PacketCraftRequest(int craftAmt, boolean shift)
{
this.amount = craftAmt;
this.heldShift = shift;
src/main/java/appeng/core/sync/packets/PacketInventoryAction.java
+2 -2
View File
@@ -118,8 +118,8 @@ public class PacketInventoryAction extends AppEngPacket
}
// api
public PacketInventoryAction(InventoryAction action, int slot, long id) throws IOException {
public PacketInventoryAction(InventoryAction action, int slot, long id)
{
this.action = action;
this.slot = slot;
this.id = id;
src/main/java/appeng/core/sync/packets/PacketLightning.java
+3 -5
View File
@@ -3,8 +3,6 @@ package appeng.core.sync.packets;
import io.netty.buffer.ByteBuf;
import io.netty.buffer.Unpooled;
import java.io.IOException;
import net.minecraft.client.Minecraft;
import net.minecraft.entity.player.EntityPlayer;
import appeng.client.ClientHelper;
@@ -24,7 +22,7 @@ public class PacketLightning extends AppEngPacket
final double z;
// automatic.
public PacketLightning(ByteBuf stream) throws IOException {
public PacketLightning(ByteBuf stream) {
x = stream.readFloat();
y = stream.readFloat();
z = stream.readFloat();
@@ -48,8 +46,8 @@ public class PacketLightning extends AppEngPacket
}
// api
public PacketLightning(double x, double y, double z) throws IOException {
public PacketLightning(double x, double y, double z)
{
this.x = x;
this.y = y;
this.z = z;
src/main/java/appeng/core/sync/packets/PacketMatterCannon.java
+4 -4
View File
@@ -3,8 +3,6 @@ package appeng.core.sync.packets;
import io.netty.buffer.ByteBuf;
import io.netty.buffer.Unpooled;
import java.io.IOException;
import net.minecraft.client.Minecraft;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Items;
@@ -28,7 +26,8 @@ public class PacketMatterCannon extends AppEngPacket
final byte len;
// automatic.
public PacketMatterCannon(ByteBuf stream) throws IOException {
public PacketMatterCannon(ByteBuf stream)
{
x = stream.readFloat();
y = stream.readFloat();
z = stream.readFloat();
@@ -59,7 +58,8 @@ public class PacketMatterCannon extends AppEngPacket
}
// api
public PacketMatterCannon(double x, double y, double z, float dx, float dy, float dz, byte len) throws IOException {
public PacketMatterCannon(double x, double y, double z, float dx, float dy, float dz, byte len)
{
float dl = dx * dx + dy * dy + dz * dz;
float dlz = (float) Math.sqrt( dl );
src/main/java/appeng/core/sync/packets/PacketMockExplosion.java
+4 -4
View File
@@ -3,8 +3,6 @@ package appeng.core.sync.packets;
import io.netty.buffer.ByteBuf;
import io.netty.buffer.Unpooled;
import java.io.IOException;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.world.World;
import appeng.core.CommonHelper;
@@ -29,14 +27,16 @@ public class PacketMockExplosion extends AppEngPacket
}
// automatic.
public PacketMockExplosion(ByteBuf stream) throws IOException {
public PacketMockExplosion(ByteBuf stream)
{
x = stream.readDouble();
y = stream.readDouble();
z = stream.readDouble();
}
// api
public PacketMockExplosion(double x, double y, double z) throws IOException {
public PacketMockExplosion(double x, double y, double z)
{
this.x = x;
this.y = y;
this.z = z;
src/main/java/appeng/core/sync/packets/PacketMultiPart.java
+5 -7
View File
@@ -3,8 +3,6 @@ package appeng.core.sync.packets;
import io.netty.buffer.ByteBuf;
import io.netty.buffer.Unpooled;
import java.io.IOException;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraftforge.common.MinecraftForge;
@@ -18,8 +16,8 @@ public class PacketMultiPart extends AppEngPacket
{
// automatic.
public PacketMultiPart(ByteBuf stream) throws IOException {
public PacketMultiPart(ByteBuf stream)
{
}
@Override
@@ -29,13 +27,13 @@ public class PacketMultiPart extends AppEngPacket
if ( fmp != null )
{
EntityPlayerMP sender = (EntityPlayerMP) player;
MinecraftForge.EVENT_BUS.post( fmp.newFMPPacketEvent( sender ) ); // when received it just pots this event.
MinecraftForge.EVENT_BUS.post( fmp.newFMPPacketEvent( sender ) ); // when received it just posts this event.
}
}
// api
public PacketMultiPart() throws IOException {
public PacketMultiPart()
{
ByteBuf data = Unpooled.buffer();
data.writeInt( getPacketID() );
src/main/java/appeng/core/sync/packets/PacketNewStorageDimension.java
+4 -5
View File
@@ -3,8 +3,6 @@ package appeng.core.sync.packets;
import io.netty.buffer.ByteBuf;
import io.netty.buffer.Unpooled;
import java.io.IOException;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraftforge.common.DimensionManager;
import appeng.core.AEConfig;
@@ -19,7 +17,8 @@ public class PacketNewStorageDimension extends AppEngPacket
final int newDim;
// automatic.
public PacketNewStorageDimension(ByteBuf stream) throws IOException {
public PacketNewStorageDimension(ByteBuf stream)
{
newDim = stream.readInt();
}
@@ -38,8 +37,8 @@ public class PacketNewStorageDimension extends AppEngPacket
}
// api
public PacketNewStorageDimension(int newDim) throws IOException {
public PacketNewStorageDimension(int newDim)
{
this.newDim = newDim;
ByteBuf data = Unpooled.buffer();
src/main/java/appeng/core/sync/packets/PacketPaintedEntity.java
+2 -3
View File
@@ -3,8 +3,6 @@ package appeng.core.sync.packets;
import io.netty.buffer.ByteBuf;
import io.netty.buffer.Unpooled;
import java.io.IOException;
import net.minecraft.entity.player.EntityPlayer;
import appeng.api.util.AEColor;
import appeng.core.sync.AppEngPacket;
@@ -20,7 +18,8 @@ public class PacketPaintedEntity extends AppEngPacket
private int ticks;
// automatic.
public PacketPaintedEntity(ByteBuf stream) throws IOException {
public PacketPaintedEntity(ByteBuf stream)
{
entityId = stream.readInt();
myColor = AEColor.values()[stream.readByte()];
ticks = stream.readInt();
src/main/java/appeng/core/sync/packets/PacketPartPlacement.java
+4 -5
View File
@@ -3,8 +3,6 @@ package appeng.core.sync.packets;
import io.netty.buffer.ByteBuf;
import io.netty.buffer.Unpooled;
import java.io.IOException;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.EntityPlayerMP;
import appeng.core.CommonHelper;
@@ -19,7 +17,8 @@ public class PacketPartPlacement extends AppEngPacket
float eyeHeight;
// automatic.
public PacketPartPlacement(ByteBuf stream) throws IOException {
public PacketPartPlacement(ByteBuf stream)
{
x = stream.readInt();
y = stream.readInt();
z = stream.readInt();
@@ -38,8 +37,8 @@ public class PacketPartPlacement extends AppEngPacket
}
// api
public PacketPartPlacement(int x, int y, int z, int face, float eyeHeight ) throws IOException {
public PacketPartPlacement(int x, int y, int z, int face, float eyeHeight )
{
ByteBuf data = Unpooled.buffer();
data.writeInt( getPacketID() );
src/main/java/appeng/core/sync/packets/PacketPartialItem.java
+4 -4
View File
@@ -3,8 +3,6 @@ package appeng.core.sync.packets;
import io.netty.buffer.ByteBuf;
import io.netty.buffer.Unpooled;
import java.io.IOException;
import net.minecraft.entity.player.EntityPlayer;
import appeng.container.AEBaseContainer;
import appeng.core.sync.AppEngPacket;
@@ -17,7 +15,8 @@ public class PacketPartialItem extends AppEngPacket
final byte[] data;
// automatic.
public PacketPartialItem(ByteBuf stream) throws IOException {
public PacketPartialItem(ByteBuf stream)
{
pageNum = stream.readShort();
stream.readBytes( data = new byte[stream.readableBytes()] );
}
@@ -32,7 +31,8 @@ public class PacketPartialItem extends AppEngPacket
}
// api
public PacketPartialItem(int page, int maxPages, byte[] buf) throws IOException {
public PacketPartialItem(int page, int maxPages, byte[] buf)
{
ByteBuf data = Unpooled.buffer();
src/main/java/appeng/core/sync/packets/PacketProgressBar.java
+4 -5
View File
@@ -3,8 +3,6 @@ package appeng.core.sync.packets;
import io.netty.buffer.ByteBuf;
import io.netty.buffer.Unpooled;
import java.io.IOException;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.Container;
import appeng.container.AEBaseContainer;
@@ -18,7 +16,8 @@ public class PacketProgressBar extends AppEngPacket
final long value;
// automatic.
public PacketProgressBar(ByteBuf stream) throws IOException {
public PacketProgressBar(ByteBuf stream)
{
id = stream.readShort();
value = stream.readLong();
}
@@ -40,8 +39,8 @@ public class PacketProgressBar extends AppEngPacket
}
// api
public PacketProgressBar(int short_id, long value) throws IOException {
public PacketProgressBar(int short_id, long value)
{
this.id = (short) short_id;
this.value = value;
src/main/java/appeng/core/sync/packets/PacketSwapSlots.java
+4 -5
View File
@@ -3,8 +3,6 @@ package appeng.core.sync.packets;
import io.netty.buffer.ByteBuf;
import io.netty.buffer.Unpooled;
import java.io.IOException;
import net.minecraft.entity.player.EntityPlayer;
import appeng.container.AEBaseContainer;
import appeng.core.sync.AppEngPacket;
@@ -17,7 +15,8 @@ public class PacketSwapSlots extends AppEngPacket
final int slotB;
// automatic.
public PacketSwapSlots(ByteBuf stream) throws IOException {
public PacketSwapSlots(ByteBuf stream)
{
slotA = stream.readInt();
slotB = stream.readInt();
}
@@ -32,8 +31,8 @@ public class PacketSwapSlots extends AppEngPacket
}
// api
public PacketSwapSlots(int slotA, int slotB) throws IOException {
public PacketSwapSlots(int slotA, int slotB)
{
ByteBuf data = Unpooled.buffer();
data.writeInt( getPacketID() );
src/main/java/appeng/core/sync/packets/PacketSwitchGuis.java
+4 -5
View File
@@ -3,8 +3,6 @@ package appeng.core.sync.packets;
import io.netty.buffer.ByteBuf;
import io.netty.buffer.Unpooled;
import java.io.IOException;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.Container;
import net.minecraft.tileentity.TileEntity;
@@ -22,7 +20,8 @@ public class PacketSwitchGuis extends AppEngPacket
final GuiBridge newGui;
// automatic.
public PacketSwitchGuis(ByteBuf stream) throws IOException {
public PacketSwitchGuis(ByteBuf stream)
{
newGui = GuiBridge.values()[stream.readInt()];
}
@@ -49,8 +48,8 @@ public class PacketSwitchGuis extends AppEngPacket
}
// api
public PacketSwitchGuis(GuiBridge newGui) throws IOException {
public PacketSwitchGuis(GuiBridge newGui)
{
this.newGui = newGui;
if ( Platform.isClient() )
src/main/java/appeng/core/sync/packets/PacketTransitionEffect.java
+4 -5
View File
@@ -3,8 +3,6 @@ package appeng.core.sync.packets;
import io.netty.buffer.ByteBuf;
import io.netty.buffer.Unpooled;
import java.io.IOException;
import net.minecraft.block.Block;
import net.minecraft.client.Minecraft;
import net.minecraft.client.audio.PositionedSoundRecord;
@@ -32,7 +30,8 @@ public class PacketTransitionEffect extends AppEngPacket
final public boolean mode;
// automatic.
public PacketTransitionEffect(ByteBuf stream) throws IOException {
public PacketTransitionEffect(ByteBuf stream)
{
x = stream.readFloat();
y = stream.readFloat();
z = stream.readFloat();
@@ -77,8 +76,8 @@ public class PacketTransitionEffect extends AppEngPacket
}
// api
public PacketTransitionEffect(double x, double y, double z, ForgeDirection dir, boolean wasBlock) throws IOException {
public PacketTransitionEffect(double x, double y, double z, ForgeDirection dir, boolean wasBlock)
{
this.x = x;
this.y = y;
this.z = z;