diff --git a/src/main/java/mekanism/client/gui/GuiFormulaicAssemblicator.java b/src/main/java/mekanism/client/gui/GuiFormulaicAssemblicator.java index ad0d9af90..8d88ce143 100644 --- a/src/main/java/mekanism/client/gui/GuiFormulaicAssemblicator.java +++ b/src/main/java/mekanism/client/gui/GuiFormulaicAssemblicator.java @@ -210,11 +210,8 @@ public class GuiFormulaicAssemblicator extends GuiMekanism } RenderHelper.enableGUIStandardItemLighting(); - MekanismRenderer.blendOn(); - GL11.glColor4f(1.0F, 1.0F, 1.0F, 0.4F); itemRender.renderItemAndEffectIntoGUI(stack, guiWidth + slot.xDisplayPosition, guiHeight + slot.yDisplayPosition); - MekanismRenderer.blendOff(); - RenderHelper.disableStandardItemLighting(); + MekanismRenderer.resetColor(); GlStateManager.popMatrix(); } } diff --git a/src/main/java/mekanism/common/block/BlockEnergyCube.java b/src/main/java/mekanism/common/block/BlockEnergyCube.java index 92f351caf..38e0952fe 100644 --- a/src/main/java/mekanism/common/block/BlockEnergyCube.java +++ b/src/main/java/mekanism/common/block/BlockEnergyCube.java @@ -7,6 +7,7 @@ import mekanism.api.energy.IEnergizedItem; import mekanism.common.Mekanism; import mekanism.common.MekanismBlocks; import mekanism.common.Tier.EnergyCubeTier; +import mekanism.common.base.ISideConfiguration; import mekanism.common.base.ISustainedInventory; import mekanism.common.base.ITierItem; import mekanism.common.block.states.BlockStateEnergyCube; @@ -16,6 +17,7 @@ import mekanism.common.security.ISecurityItem; import mekanism.common.security.ISecurityTile; import mekanism.common.tile.TileEntityBasicBlock; import mekanism.common.tile.TileEntityEnergyCube; +import mekanism.common.util.ItemDataUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.SecurityUtils; import net.minecraft.block.Block; @@ -302,6 +304,14 @@ public class BlockEnergyCube extends BlockContainer securityItem.setSecurity(itemStack, ((ISecurityTile)tileEntity).getSecurity().getMode()); } } + + if(tileEntity instanceof ISideConfiguration) + { + ISideConfiguration config = (ISideConfiguration)tileEntity; + + config.getConfig().write(ItemDataUtils.getDataMap(itemStack)); + config.getEjector().write(ItemDataUtils.getDataMap(itemStack)); + } ITierItem tierItem = (ITierItem)itemStack.getItem(); tierItem.setBaseTier(itemStack, tileEntity.tier.getBaseTier()); diff --git a/src/main/java/mekanism/common/block/BlockGasTank.java b/src/main/java/mekanism/common/block/BlockGasTank.java index 490764cb0..a452c7c80 100644 --- a/src/main/java/mekanism/common/block/BlockGasTank.java +++ b/src/main/java/mekanism/common/block/BlockGasTank.java @@ -5,6 +5,7 @@ import java.util.Random; import mekanism.api.gas.IGasItem; import mekanism.common.Mekanism; import mekanism.common.MekanismBlocks; +import mekanism.common.base.ISideConfiguration; import mekanism.common.base.ISustainedInventory; import mekanism.common.base.ITierItem; import mekanism.common.block.states.BlockStateFacing; @@ -13,6 +14,7 @@ import mekanism.common.security.ISecurityItem; import mekanism.common.security.ISecurityTile; import mekanism.common.tile.TileEntityBasicBlock; import mekanism.common.tile.TileEntityGasTank; +import mekanism.common.util.ItemDataUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.SecurityUtils; import net.minecraft.block.Block; @@ -292,6 +294,14 @@ public class BlockGasTank extends BlockContainer } } + if(tileEntity instanceof ISideConfiguration) + { + ISideConfiguration config = (ISideConfiguration)tileEntity; + + config.getConfig().write(ItemDataUtils.getDataMap(itemStack)); + config.getEjector().write(ItemDataUtils.getDataMap(itemStack)); + } + ITierItem tierItem = (ITierItem)itemStack.getItem(); tierItem.setBaseTier(itemStack, tileEntity.tier.getBaseTier()); diff --git a/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java b/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java index 8106568ed..7787ebd6d 100644 --- a/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java +++ b/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java @@ -17,6 +17,7 @@ import mekanism.client.MekanismKeyHandler; import mekanism.common.Mekanism; import mekanism.common.Tier.BaseTier; import mekanism.common.Tier.EnergyCubeTier; +import mekanism.common.base.ISideConfiguration; import mekanism.common.base.ISustainedInventory; import mekanism.common.base.ITierItem; import mekanism.common.capabilities.ItemCapabilityWrapper; @@ -139,6 +140,17 @@ public class ItemBlockEnergyCube extends ItemBlock implements IEnergizedItem, IS security.getSecurity().setOwner(player.getName()); } } + + if(tileEntity instanceof ISideConfiguration) + { + ISideConfiguration config = (ISideConfiguration)tileEntity; + + if(ItemDataUtils.hasData(stack, "sideDataStored")) + { + config.getConfig().read(ItemDataUtils.getDataMap(stack)); + config.getEjector().read(ItemDataUtils.getDataMap(stack)); + } + } ((ISustainedInventory)tileEntity).setInventory(getInventory(stack)); diff --git a/src/main/java/mekanism/common/item/ItemBlockGasTank.java b/src/main/java/mekanism/common/item/ItemBlockGasTank.java index 0f3adefbd..82980e444 100644 --- a/src/main/java/mekanism/common/item/ItemBlockGasTank.java +++ b/src/main/java/mekanism/common/item/ItemBlockGasTank.java @@ -16,6 +16,7 @@ import mekanism.client.MekanismKeyHandler; import mekanism.common.Mekanism; import mekanism.common.Tier.BaseTier; import mekanism.common.Tier.GasTankTier; +import mekanism.common.base.ISideConfiguration; import mekanism.common.base.ISustainedInventory; import mekanism.common.base.ITierItem; import mekanism.common.network.PacketTileEntity.TileEntityMessage; @@ -99,6 +100,17 @@ public class ItemBlockGasTank extends ItemBlock implements IGasItem, ISustainedI security.getSecurity().setOwner(player.getName()); } } + + if(tileEntity instanceof ISideConfiguration) + { + ISideConfiguration config = (ISideConfiguration)tileEntity; + + if(ItemDataUtils.hasData(stack, "sideDataStored")) + { + config.getConfig().read(ItemDataUtils.getDataMap(stack)); + config.getEjector().read(ItemDataUtils.getDataMap(stack)); + } + } ((ISustainedInventory)tileEntity).setInventory(getInventory(stack)); diff --git a/src/main/java/mekanism/common/tile/TileEntityFormulaicAssemblicator.java b/src/main/java/mekanism/common/tile/TileEntityFormulaicAssemblicator.java index c47479508..9aedb7eea 100644 --- a/src/main/java/mekanism/common/tile/TileEntityFormulaicAssemblicator.java +++ b/src/main/java/mekanism/common/tile/TileEntityFormulaicAssemblicator.java @@ -65,6 +65,7 @@ public class TileEntityFormulaicAssemblicator extends TileEntityElectricBlock im public ItemStack lastFormulaStack; public boolean needsFormulaUpdate = false; + public ItemStack lastOutputStack; public TileEntityFormulaicAssemblicator() { @@ -225,10 +226,12 @@ public class TileEntityFormulaicAssemblicator extends TileEntityElectricBlock im dummyInv.setInventorySlotContents(i, inventory[27+i]); } - isRecipe = MekanismUtils.findMatchingRecipe(dummyInv, worldObj) != null; + lastOutputStack = MekanismUtils.findMatchingRecipe(dummyInv, worldObj); + isRecipe = lastOutputStack != null; } else { isRecipe = formula.matches(worldObj, inventory, 27); + lastOutputStack = isRecipe ? formula.recipe.getRecipeOutput() : null; } } } @@ -240,7 +243,7 @@ public class TileEntityFormulaicAssemblicator extends TileEntityElectricBlock im dummyInv.setInventorySlotContents(i, inventory[27+i]); } - ItemStack output = MekanismUtils.findMatchingRecipe(dummyInv, worldObj); + ItemStack output = lastOutputStack; if(output != null && tryMoveToOutput(output, false)) {