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

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
+1 -1
Submodule api updated: 28e318ff1a...0ea16a10fc
+1 -1
View File
@@ -22,7 +22,7 @@ public enum GuiText
SecurityCardEditor, NoPermissions, WirelessTerminal, Wireless, SecurityCardEditor, NoPermissions, WirelessTerminal, Wireless,
CraftingTerminal, FormationPlane, CraftingTerminal, FormationPlane, Inscriber, QuartzCuttingKnife,
METunnel, ItemTunnel, RedstoneTunnel, MJTunnel, EUTunnel, FluidTunnel; METunnel, ItemTunnel, RedstoneTunnel, MJTunnel, EUTunnel, FluidTunnel;
+8 -2
View File
@@ -28,9 +28,15 @@ public enum MaterialType
PureifiedCertusQuartzCrystal, PureifiedNetherQuartzCrystal, PureifiedFluixCrystal, PureifiedCertusQuartzCrystal, PureifiedNetherQuartzCrystal, PureifiedFluixCrystal,
LogicProcessorAsm(AEFeature.QuartzKnife), LogicProcessor, CalcProcessorPress, EngProcessorPress, LogicProcessorPress,
CalcProcessor, EngProcessor, CalcProcessorPrint, EngProcessorPrint, LogicProcessorPrint,
SiliconPress, SiliconPrint,
NamePress,
LogicProcessor, CalcProcessor, EngProcessor,
// Basic Cards // Basic Cards
BasicCard, CardRedstone, CardCapacity, BasicCard, CardRedstone, CardCapacity,
+16 -1
View File
@@ -4,6 +4,7 @@ import java.util.List;
import net.minecraft.inventory.IInventory; import net.minecraft.inventory.IInventory;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import appeng.client.texture.CableBusTextures; import appeng.client.texture.CableBusTextures;
import appeng.core.sync.GuiBridge; import appeng.core.sync.GuiBridge;
import appeng.tile.inventory.AppEngInternalInventory; import appeng.tile.inventory.AppEngInternalInventory;
@@ -15,6 +16,20 @@ public class PartCraftingTerminal extends PartTerminal implements IAEAppEngInven
AppEngInternalInventory craftingGrid = new AppEngInternalInventory( this, 9 ); 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 @Override
public void getDrops(List<ItemStack> drops, boolean wrenched) public void getDrops(List<ItemStack> drops, boolean wrenched)
{ {
@@ -39,7 +54,7 @@ public class PartCraftingTerminal extends PartTerminal implements IAEAppEngInven
@Override @Override
public void onChangeInventory(IInventory inv, int slot, InvOperation mc, ItemStack removedStack, ItemStack newStack) public void onChangeInventory(IInventory inv, int slot, InvOperation mc, ItemStack removedStack, ItemStack newStack)
{ {
// :) host.markForSave();
} }
@Override @Override
+3 -2
View File
@@ -114,7 +114,8 @@ public class RecipeHandler implements IRecipeHandler
catch (Exception err) catch (Exception err)
{ {
AELog.warning( "Error Loading Recipe File:" + path ); AELog.warning( "Error Loading Recipe File:" + path );
AELog.error( err ); if ( data.exceptions )
AELog.error( err );
return; return;
} }
@@ -320,7 +321,7 @@ public class RecipeHandler implements IRecipeHandler
} }
catch (RecipeError e) 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 ) if ( data.exceptions )
AELog.error( e ); AELog.error( e );
if ( data.crash ) if ( data.crash )
+1 -1
View File
@@ -254,7 +254,7 @@ public class TileCableBus extends AEBaseTile implements AEMultiTile, ICustomColl
@Override @Override
public void markForSave() public void markForSave()
{ {
markDirty(); super.markDirty();
} }
@Override @Override