Removed Block Definitions for MAC Parts.

Removed Options For MAC and Crafting.
Added Options for Crafting with Quartz Growth and Fluix Reaction.
EU Tunnels Re-Added ( Limit 1 per block. )
Adjusted naming/categorization of various features.
Added "sparkle" effect to seeds that are "growing"
This commit is contained in:
AlgorithmX2
2014-02-23 16:50:53 -06:00
parent 5e0bf9c5b9
commit 1a75097e84
26 changed files with 179 additions and 141 deletions
+9
View File
@@ -7,6 +7,7 @@ import java.util.EnumSet;
import java.util.LinkedList;
import java.util.List;
import java.util.Random;
import java.util.Set;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
@@ -31,6 +32,7 @@ import appeng.api.parts.IPart;
import appeng.api.parts.IPartCollsionHelper;
import appeng.api.parts.IPartHost;
import appeng.api.parts.IPartItem;
import appeng.api.parts.LayerFlags;
import appeng.api.parts.PartItemStack;
import appeng.api.parts.SelectedPart;
import appeng.api.util.AECableType;
@@ -51,6 +53,7 @@ public class CableBusContainer implements AEMultiTile, ICableBusContainer
private IPartCable center;
private IPart sides[] = new IPart[6];
private FacadeContainer fc = new FacadeContainer();
private EnumSet<LayerFlags> myLayerFlags = EnumSet.noneOf( LayerFlags.class );
public boolean hasRedstone = false;
public IPartHost tcb;
@@ -959,4 +962,10 @@ public class CableBusContainer implements AEMultiTile, ICableBusContainer
}
}
@Override
public Set<LayerFlags> getLayerFlags()
{
return myLayerFlags;
}
}
+4 -1
View File
@@ -9,6 +9,7 @@ import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.IIcon;
import net.minecraftforge.common.util.ForgeDirection;
import appeng.api.config.TunnelType;
import appeng.core.AELog;
import appeng.me.GridAccessException;
import appeng.me.cache.helpers.TunnelCollection;
import appeng.util.Platform;
@@ -107,7 +108,7 @@ public class PartP2PIC2Power extends PartP2PTunnel<PartP2PIC2Power> implements i
@Override
public double injectEnergyUnits(ForgeDirection directionFrom, double amount)
{
AELog.info( "INJECT: " + amount );
TunnelCollection<PartP2PIC2Power> outs;
try
{
@@ -147,6 +148,7 @@ public class PartP2PIC2Power extends PartP2PTunnel<PartP2PIC2Power> implements i
@Override
public double getOfferedEnergy()
{
AELog.info( "getOfferedEnergy: " + OutputPacket );
if ( output )
return OutputPacket;
return 0;
@@ -155,6 +157,7 @@ public class PartP2PIC2Power extends PartP2PTunnel<PartP2PIC2Power> implements i
@Override
public void drawEnergy(double amount)
{
AELog.info( "drawEnergy: " + amount );
OutputPacket -= amount;
}
+2 -2
View File
@@ -46,7 +46,7 @@ public class PartP2PTunnel<T extends PartP2PTunnel> extends PartBasicState
{
return false;
}
@Override
public void writeToNBT(NBTTagCompound data)
{
@@ -225,7 +225,7 @@ public class PartP2PTunnel<T extends PartP2PTunnel> extends PartBasicState
public ItemStack getItemStack(PartItemStack type)
{
if ( type == PartItemStack.World || type == PartItemStack.Network || type == PartItemStack.Wrench )
if ( type == PartItemStack.World || type == PartItemStack.Network || type == PartItemStack.Wrench || type == PartItemStack.Pick )
return super.getItemStack( type );
return AEApi.instance().parts().partP2PTunnelME.stack( 1 );