Skip to content

Commit

Permalink
EC 2.2.51
Browse files Browse the repository at this point in the history
- Update ae
- Fixed fluid interface crafting
  • Loading branch information
DrummerMC committed Feb 2, 2015
1 parent 0db2326 commit 14d69ac
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 15 deletions.
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ repositories {
}

dependencies {
compile ("appeng:appliedenergistics2:rv2-beta-7:dev"){
compile ("appeng:appliedenergistics2:rv2-beta-8:dev"){
exclude group: "mcp.mobius.waila", module: "Waila"
exclude group: "codechicken", module: "ForgeMultipart"
exclude group: "codechicken", module: "CodeChickenCore"
Expand Down
2 changes: 1 addition & 1 deletion build.properties
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ version.minecraft=1.7.10
version.forge=10.13.2.1286
version.mod.major=2
version.mod.minor=2
version.mod.revis=50
version.mod.revis=51
13 changes: 5 additions & 8 deletions src/main/java/extracells/part/PartFluidInterface.java
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
import extracells.container.ContainerFluidInterface;
import extracells.container.IContainerListener;
import extracells.crafting.CraftingPattern;
import extracells.crafting.CraftingPattern2;
import extracells.gui.GuiFluidInterface;
import extracells.network.packet.other.IFluidSlotPartOrBlock;
import extracells.registries.ItemEnum;
Expand Down Expand Up @@ -321,6 +322,7 @@ public TickRateModulation tickingRequest(IGridNode node, int TicksSinceLastCall)
IStorageGrid storage = grid.getCache(IStorageGrid.class);
if(storage == null)
return TickRateModulation.URGENT;
pushItems();
if(toExport != null){
storage.getItemInventory().injectItems(toExport, Actionable.MODULATE, new MachineSource(this));
toExport = null;
Expand Down Expand Up @@ -507,7 +509,6 @@ public boolean pushPattern(ICraftingPatternDetails patternDetails,
}
export.add(s);
}

}
return true;
}
Expand All @@ -529,13 +530,9 @@ public void provideCrafting(ICraftingProviderHelper craftingTracker) {

if (currentPattern != null && currentPattern.getPatternForItem(currentPatternStack, getGridNode().getWorld()) != null)
{
ICraftingPatternDetails pattern = new CraftingPattern(currentPattern.getPatternForItem(currentPatternStack, getGridNode().getWorld()));
ICraftingPatternDetails pattern = new CraftingPattern2(currentPattern.getPatternForItem(currentPatternStack, getGridNode().getWorld()));
patternHandlers.add(pattern);
if(pattern.getCondensedInputs().length == 0){
craftingTracker.setEmitable(pattern.getCondensedOutputs()[0]);
}else{
craftingTracker.addCraftingOption(this, pattern);
}
craftingTracker.addCraftingOption(this, pattern);
}
}
}
Expand Down Expand Up @@ -675,7 +672,7 @@ private void pushItems(){
export.add(s);
}
addToExport.clear();
if(getGridNode().getWorld() != null || export.isEmpty())
if(getGridNode().getWorld() == null || export.isEmpty())
return;
ForgeDirection dir = getSide();
TileEntity tile = getGridNode().getWorld().getTileEntity(getGridNode().getGridBlock().getLocation().x + dir.offsetX, getGridNode().getGridBlock().getLocation().y + dir.offsetY, getGridNode().getGridBlock().getLocation().z + dir.offsetZ);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -534,11 +534,7 @@ public void provideCrafting(ICraftingProviderHelper craftingTracker) {
{
ICraftingPatternDetails pattern = new CraftingPattern2(currentPattern.getPatternForItem(currentPatternStack, getWorldObj()));
patternHandlers.add(pattern);
if(pattern.getCondensedInputs().length == 0){
craftingTracker.setEmitable(pattern.getCondensedOutputs()[0]);
}else{
craftingTracker.addCraftingOption(this, pattern);
}
craftingTracker.addCraftingOption(this, pattern);
}
}
}
Expand Down

0 comments on commit 14d69ac

Please sign in to comment.