From 14d69ac5c383dc14da582b7c454f795eed65c360 Mon Sep 17 00:00:00 2001 From: DrummerMC Date: Mon, 2 Feb 2015 19:11:06 +0100 Subject: [PATCH] EC 2.2.51 - Update ae - Fixed fluid interface crafting --- build.gradle | 2 +- build.properties | 2 +- .../java/extracells/part/PartFluidInterface.java | 13 +++++-------- .../tileentity/TileEntityFluidInterface.java | 6 +----- 4 files changed, 8 insertions(+), 15 deletions(-) diff --git a/build.gradle b/build.gradle index 1cd50048..33104512 100644 --- a/build.gradle +++ b/build.gradle @@ -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" diff --git a/build.properties b/build.properties index efff6b56..54c5d4ad 100644 --- a/build.properties +++ b/build.properties @@ -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 diff --git a/src/main/java/extracells/part/PartFluidInterface.java b/src/main/java/extracells/part/PartFluidInterface.java index 4fc76bc0..a1628368 100644 --- a/src/main/java/extracells/part/PartFluidInterface.java +++ b/src/main/java/extracells/part/PartFluidInterface.java @@ -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; @@ -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; @@ -507,7 +509,6 @@ public boolean pushPattern(ICraftingPatternDetails patternDetails, } export.add(s); } - } return true; } @@ -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); } } } @@ -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); diff --git a/src/main/java/extracells/tileentity/TileEntityFluidInterface.java b/src/main/java/extracells/tileentity/TileEntityFluidInterface.java index f20fc66e..d0ba09d3 100644 --- a/src/main/java/extracells/tileentity/TileEntityFluidInterface.java +++ b/src/main/java/extracells/tileentity/TileEntityFluidInterface.java @@ -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); } } }