Skip to content

Commit 504d558

Browse files
author
Circulate233
committed
修复样板终端在合成模式下从JEI拖动流体桶写入也会直接写入流体的问题
1 parent 4960747 commit 504d558

3 files changed

Lines changed: 9 additions & 3 deletions

File tree

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ show_testing_output = false
1515

1616
# Mod Information
1717
# HIGHLY RECOMMEND complying with SemVer for mod_version: https://semver.org/
18-
mod_version = 2.7.9-unofficial
18+
mod_version = 2.7.10-unofficial
1919
root_package = com.glodblock.github
2020
mod_id = ae2fc
2121
mod_name = AE2FluidCraft-Rework-Unofficial

src/main/java/com/glodblock/github/client/client/gui/GuiFluidPatternTerminal.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
import com.glodblock.github.client.button.GuiFCImgButton;
1414
import com.glodblock.github.client.container.ContainerFluidPatternTerminal;
1515
import com.glodblock.github.integration.jei.FluidPacketTarget;
16+
import com.glodblock.github.integration.jei.ItemTarget;
1617
import com.glodblock.github.inventory.GuiType;
1718
import com.glodblock.github.inventory.InventoryHandler;
1819
import com.glodblock.github.network.CPacketFluidPatternTermBtns;
@@ -144,7 +145,9 @@ public List<Target<?>> getPhantomTargets(final Object ingredient) {
144145
final List<Target<?>> targets = new ObjectArrayList<>();
145146
for (final Slot slot : this.inventorySlots.inventorySlots) {
146147
if (slot instanceof SlotFake) {
147-
final Target<?> target = new FluidPacketTarget(getGuiLeft(), getGuiTop(), slot);
148+
final Target<?> target = this.container.isCraftingMode()
149+
? new ItemTarget(getGuiLeft(), getGuiTop(), slot)
150+
: new FluidPacketTarget(getGuiLeft(), getGuiTop(), slot);
148151
targets.add(target);
149152
mapTargetSlot.putIfAbsent(target, slot);
150153
}

src/main/java/com/glodblock/github/client/client/gui/GuiWirelessFluidPatternTerminal.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
import com.glodblock.github.client.button.GuiFCImgButton;
1414
import com.glodblock.github.client.container.ContainerWirelessFluidPatternTerminal;
1515
import com.glodblock.github.integration.jei.FluidPacketTarget;
16+
import com.glodblock.github.integration.jei.ItemTarget;
1617
import com.glodblock.github.inventory.GuiType;
1718
import com.glodblock.github.inventory.InventoryHandler;
1819
import com.glodblock.github.network.CPacketFluidPatternTermBtns;
@@ -149,7 +150,9 @@ public List<IGhostIngredientHandler.Target<?>> getPhantomTargets(final Object in
149150
final List<IGhostIngredientHandler.Target<?>> targets = new ObjectArrayList<>();
150151
for (final Slot slot : this.inventorySlots.inventorySlots) {
151152
if (slot instanceof SlotFake) {
152-
final IGhostIngredientHandler.Target<?> target = new FluidPacketTarget(getGuiLeft(), getGuiTop(), slot);
153+
final IGhostIngredientHandler.Target<?> target = this.container.isCraftingMode()
154+
? new ItemTarget(getGuiLeft(), getGuiTop(), slot)
155+
: new FluidPacketTarget(getGuiLeft(), getGuiTop(), slot);
153156
targets.add(target);
154157
mapTargetSlot.putIfAbsent(target, slot);
155158
}

0 commit comments

Comments
 (0)