tilera/Applied-Energistics-2-tilera-Edition
1
1
Fork 0
Code Issues 7 Pull requests Releases 1 Wiki Activity

Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1

Browse source
This commit is contained in:
AlgorithmX2 2014-05-15 09:35:56 -05:00
commit d10e7ee6df
6 changed files with 41 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
container/AEBaseContainer.java
View file

@ -862,7 +862,10 @@ public abstract class AEBaseContainer extends Container
if ( slotItem != null )
{
IAEItemStack ais = slotItem.copy();
long stackSize = Math.min( ais.getItemStack().getMaxStackSize(), ais.getStackSize() );
long maxSize = ais.getItemStack().getMaxStackSize();
ais.setStackSize( maxSize );
ais = cellInv.extractItems( ais, Actionable.SIMULATE, mySrc );
long stackSize = Math.min( maxSize, ais.getStackSize() );
ais.setStackSize( (stackSize + 1) >> 1 );
ais = Platform.poweredExtraction( powerSrc, cellInv, ais, mySrc );
if ( ais != null )

2
container/implementations/ContainerQuartzKnife.java
View file

@ -151,7 +151,7 @@ public class ContainerQuartzKnife extends AEBaseContainer implements IAEAppEngIn
@Override
public void setInventorySlotContents(int var1, ItemStack var2)
{
if ( var2 == null )
if ( var2 == null && Platform.isServer() )
makePlate();
}

2
items/parts/ItemMultiPart.java
View file

@ -17,6 +17,7 @@ import appeng.api.implementations.items.IItemGroup;
import appeng.api.parts.IPart;
import appeng.api.parts.IPartItem;
import appeng.core.AEConfig;
import appeng.core.AELog;
import appeng.core.features.AEFeature;
import appeng.core.features.AEFeatureHandler;
import appeng.core.features.ItemStackSrc;
@ -60,6 +61,7 @@ public class ItemMultiPart extends AEBaseItem implements IPartItem, IItemGroup
}
catch (Throwable e)
{
AELog.integration(e);
return null; // part not supported..
}

41
me/NetworkEventBus.java
View file

@ -80,36 +80,43 @@ public class NetworkEventBus
return;
readClasses.add( c );
for (Method m : c.getMethods())
try
{
MENetworkEventSubscribe s = m.getAnnotation( MENetworkEventSubscribe.class );
if ( s != null )
for (Method m : c.getMethods())
{
Class types[] = m.getParameterTypes();
if ( types.length == 1 )
MENetworkEventSubscribe s = m.getAnnotation( MENetworkEventSubscribe.class );
if ( s != null )
{
if ( MENetworkEvent.class.isAssignableFrom( types[0] ) )
Class types[] = m.getParameterTypes();
if ( types.length == 1 )
{
if ( MENetworkEvent.class.isAssignableFrom( types[0] ) )
{
Hashtable<Class, MENetworkEventInfo> classEvents = events.get( types[0] );
if ( classEvents == null )
events.put( types[0], classEvents = new Hashtable() );
Hashtable<Class, MENetworkEventInfo> classEvents = events.get( types[0] );
if ( classEvents == null )
events.put( types[0], classEvents = new Hashtable() );
MENetworkEventInfo thisEvent = classEvents.get( listAs );
if ( thisEvent == null )
thisEvent = new MENetworkEventInfo();
MENetworkEventInfo thisEvent = classEvents.get( listAs );
if ( thisEvent == null )
thisEvent = new MENetworkEventInfo();
thisEvent.Add( types[0], c, m );
thisEvent.Add( types[0], c, m );
classEvents.put( listAs, thisEvent );
classEvents.put( listAs, thisEvent );
}
else
throw new RuntimeException( "Invalid ME Network Event Subscriber, " + m.getName() + "s Parameter must extend MENetworkEvent." );
}
else
throw new RuntimeException( "Invalid ME Network Event Subscriber, " + m.getName() + "s Parameter must extend MENetworkEvent." );
throw new RuntimeException( "Invalid ME Network Event Subscriber, " + m.getName() + " must have exactly 1 parameter." );
}
else
throw new RuntimeException( "Invalid ME Network Event Subscriber, " + m.getName() + " must have exactly 1 parameter." );
}
}
catch(Throwable t )
{
throw new RuntimeException( "Error while adding "+c.getName()+" to event bus", t );
}
}

3
migration/OldItemPart.java
View file

@ -18,6 +18,7 @@ import appeng.api.implementations.items.IItemGroup;
import appeng.api.parts.IPart;
import appeng.api.parts.IPartItem;
import appeng.core.AEConfig;
import appeng.core.AELog;
import appeng.core.features.AEFeature;
import appeng.core.features.ItemStackSrc;
import appeng.core.localization.GuiText;
@ -74,7 +75,7 @@ public class OldItemPart extends AEBaseItem implements IPartItem, IItemGroup, II
}
catch (Throwable e)
{
e.printStackTrace();
AELog.integration(e);
return null; // part not supported..
}

9
util/item/AEItemStack.java
View file

@ -2,8 +2,9 @@ package appeng.util.item;
import io.netty.buffer.ByteBuf;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.DataInput;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
import java.util.List;
@ -18,8 +19,6 @@ import appeng.api.storage.data.IAEItemStack;
import appeng.api.storage.data.IAETagCompound;
import appeng.util.Platform;
import com.google.common.io.ByteStreams;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@ -329,8 +328,8 @@ public final class AEItemStack extends AEStack<IAEItemStack> implements IAEItemS
byte[] bd = new byte[len];
data.readBytes( bd );
DataInput di = ByteStreams.newDataInput( bd );
d.setTag( "tag", CompressedStreamTools.read( di ) );
ByteArrayInputStream di = new ByteArrayInputStream( bd );
d.setTag( "tag", CompressedStreamTools.read( new DataInputStream( di) ) );
}
// long priority = getPacketValue( PriorityType, data );