diff --git a/api b/api index 28e318ff..0ea16a10 160000 --- a/api +++ b/api @@ -1 +1 @@ -Subproject commit 28e318ff1a990aef0131f3156134d4c8b1502364 +Subproject commit 0ea16a10fc3038230f09e42de0c08a24da2d8096 diff --git a/core/localization/GuiText.java b/core/localization/GuiText.java index 01778a82..c45899b3 100644 --- a/core/localization/GuiText.java +++ b/core/localization/GuiText.java @@ -22,7 +22,7 @@ public enum GuiText SecurityCardEditor, NoPermissions, WirelessTerminal, Wireless, - CraftingTerminal, FormationPlane, + CraftingTerminal, FormationPlane, Inscriber, QuartzCuttingKnife, METunnel, ItemTunnel, RedstoneTunnel, MJTunnel, EUTunnel, FluidTunnel; diff --git a/items/materials/MaterialType.java b/items/materials/MaterialType.java index 72886eee..86eb452c 100644 --- a/items/materials/MaterialType.java +++ b/items/materials/MaterialType.java @@ -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, diff --git a/parts/reporting/PartCraftingTerminal.java b/parts/reporting/PartCraftingTerminal.java index 758dc0de..7d6d01b0 100644 --- a/parts/reporting/PartCraftingTerminal.java +++ b/parts/reporting/PartCraftingTerminal.java @@ -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 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 diff --git a/recipes/RecipeHandler.java b/recipes/RecipeHandler.java index fd999d99..07ed869e 100644 --- a/recipes/RecipeHandler.java +++ b/recipes/RecipeHandler.java @@ -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 ) diff --git a/tile/networking/TileCableBus.java b/tile/networking/TileCableBus.java index ec5507cd..2848be6b 100644 --- a/tile/networking/TileCableBus.java +++ b/tile/networking/TileCableBus.java @@ -254,7 +254,7 @@ public class TileCableBus extends AEBaseTile implements AEMultiTile, ICustomColl @Override public void markForSave() { - markDirty(); + super.markDirty(); } @Override