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

Added Items, Fixed Some Recipe handler errors, and fixed Parts not saving.

Browse source
This commit is contained in:
AlgorithmX2 2014-02-25 22:34:05 -06:00
parent 9575c8872c
commit 9161ad0c13
6 changed files with 30 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
api

@ -1 +1 @@
Subproject commit 28e318ff1a990aef0131f3156134d4c8b1502364
Subproject commit 0ea16a10fc3038230f09e42de0c08a24da2d8096

2
core/localization/GuiText.java
View file

@ -22,7 +22,7 @@ public enum GuiText
SecurityCardEditor, NoPermissions, WirelessTerminal, Wireless,
CraftingTerminal, FormationPlane,
CraftingTerminal, FormationPlane, Inscriber, QuartzCuttingKnife,
METunnel, ItemTunnel, RedstoneTunnel, MJTunnel, EUTunnel, FluidTunnel;

10
items/materials/MaterialType.java
View file

@ -28,9 +28,15 @@ public enum MaterialType
PureifiedCertusQuartzCrystal, PureifiedNetherQuartzCrystal, PureifiedFluixCrystal,
LogicProcessorAsm(AEFeature.QuartzKnife), LogicProcessor,
CalcProcessorPress, EngProcessorPress, LogicProcessorPress,
CalcProcessor, EngProcessor,
CalcProcessorPrint, EngProcessorPrint, LogicProcessorPrint,
SiliconPress, SiliconPrint,
NamePress,
LogicProcessor, CalcProcessor, EngProcessor,
// Basic Cards
BasicCard, CardRedstone, CardCapacity,

17
parts/reporting/PartCraftingTerminal.java
View file

@ -4,6 +4,7 @@ import java.util.List;
import net.minecraft.inventory.IInventory;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import appeng.client.texture.CableBusTextures;
import appeng.core.sync.GuiBridge;
import appeng.tile.inventory.AppEngInternalInventory;
@ -15,6 +16,20 @@ public class PartCraftingTerminal extends PartTerminal implements IAEAppEngInven
AppEngInternalInventory craftingGrid = new AppEngInternalInventory( this, 9 );
@Override
public void writeToNBT(NBTTagCompound data)
{
super.writeToNBT( data );
craftingGrid.writeToNBT( data, "craftingGrid" );
}
@Override
public void readFromNBT(NBTTagCompound data)
{
super.readFromNBT( data );
craftingGrid.readFromNBT( data, "craftingGrid" );
}
@Override
public void getDrops(List<ItemStack> drops, boolean wrenched)
{
@ -39,7 +54,7 @@ public class PartCraftingTerminal extends PartTerminal implements IAEAppEngInven
@Override
public void onChangeInventory(IInventory inv, int slot, InvOperation mc, ItemStack removedStack, ItemStack newStack)
{
// :)
host.markForSave();
}
@Override

5
recipes/RecipeHandler.java
View file

@ -114,7 +114,8 @@ public class RecipeHandler implements IRecipeHandler
catch (Exception err)
{
AELog.warning( "Error Loading Recipe File:" + path );
AELog.error( err );
if ( data.exceptions )
AELog.error( err );
return;
}
@ -320,7 +321,7 @@ public class RecipeHandler implements IRecipeHandler
}
catch (RecipeError e)
{
AELog.warning( "Recipe Error near line:" + line + " in " + file + " with: " + tokens.toString() );
AELog.warning( "Recipe Error '" + e.getMessage() + "' near line:" + line + " in " + file + " with: " + tokens.toString() );
if ( data.exceptions )
AELog.error( e );
if ( data.crash )

2
tile/networking/TileCableBus.java
View file

@ -254,7 +254,7 @@ public class TileCableBus extends AEBaseTile implements AEMultiTile, ICustomColl
@Override
public void markForSave()
{
markDirty();
super.markDirty();
}
@Override