Skip to content

Commit

Permalink
Implement Interface Locking for Dual Interfaces (#182)
Browse files Browse the repository at this point in the history 
* Implement Interface Locking for Dual Interfaces

* Update AE2
  • Loading branch information
@TechnicianLP
TechnicianLP authored Dec 20, 2023
1 parent 90e4eb0 commit db8aee2
Show file tree
Hide file tree
Showing 8 changed files with 57 additions and 75 deletions.
4 changes: 2 additions & 2 deletions dependencies.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
*/
dependencies {
api('com.github.GTNewHorizons:NotEnoughItems:2.4.13-GTNH:dev')
api('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-303-GTNH:dev')
api('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-304-GTNH:dev')
api('curse.maven:cofh-core-69162:2388751')
api('com.github.GTNewHorizons:waila:1.6.5:dev')

Expand All @@ -45,7 +45,7 @@ dependencies {
compileOnly('com.github.GTNewHorizons:ExtraCells2:2.5.34:dev') { transitive = false }
compileOnly('com.github.GTNewHorizons:ForestryMC:4.7.0:dev')
compileOnly('com.github.GTNewHorizons:EnderIO:2.5.8:dev')
compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.45.02:dev') {
compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.44.108:dev') {
exclude group: 'com.github.GTNewHorizons', module: 'AE2FluidCraft-Rework'
}
compileOnly('thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev')
Expand Down
18 changes: 18 additions & 0 deletions src/main/java/com/glodblock/github/client/gui/GuiDualInterface.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

import appeng.api.config.AdvancedBlockingMode;
import appeng.api.config.InsertionMode;
import appeng.api.config.LockCraftingMode;
import appeng.api.config.Settings;
import appeng.api.config.SidelessMode;
import appeng.api.config.Upgrades;
Expand All @@ -40,6 +41,7 @@ public class GuiDualInterface extends GuiUpgradeable {
private GuiImgButton insertionMode;
private GuiImgButton sidelessMode;
private GuiImgButton advancedBlockingMode;
private GuiImgButton lockCraftingMode;
private final IInterfaceHost host;

public GuiDualInterface(InventoryPlayer inventoryPlayer, IInterfaceHost te) {
Expand Down Expand Up @@ -103,6 +105,14 @@ protected void addButtons() {
SidelessMode.SIDELESS);
this.buttonList.add(this.sidelessMode);
}

this.lockCraftingMode = new GuiImgButton(
this.guiLeft - 18,
this.guiTop + 98,
Settings.LOCK_CRAFTING_MODE,
LockCraftingMode.NONE);
this.lockCraftingMode.visible = this.bc.getInstalledUpgrades(Upgrades.LOCK_CRAFTING) > 0;
this.buttonList.add(lockCraftingMode);
}

@Override
Expand All @@ -123,6 +133,9 @@ public void drawFG(final int offsetX, final int offsetY, final int mouseX, final
if (this.advancedBlockingMode != null) {
this.advancedBlockingMode.set(((ContainerDualInterface) this.cvb).getAdvancedBlockingMode());
}
if (this.lockCraftingMode != null) {
this.lockCraftingMode.set(((ContainerInterface) this.cvb).getLockCraftingMode());
}
this.fontRendererObj.drawString(
getGuiDisplayName(StatCollector.translateToLocal(NameConst.GUI_FLUID_INTERFACE)),
8,
Expand Down Expand Up @@ -161,6 +174,8 @@ protected void actionPerformed(final GuiButton btn) {
} else if (btn == this.advancedBlockingMode) {
NetworkHandler.instance
.sendToServer(new PacketConfigButton(this.advancedBlockingMode.getSetting(), backwards));
} else if (btn == this.lockCraftingMode) {
NetworkHandler.instance.sendToServer(new PacketConfigButton(this.lockCraftingMode.getSetting(), backwards));
}
}

Expand All @@ -178,5 +193,8 @@ protected void handleButtonVisibility() {
if (this.advancedBlockingMode != null) {
this.advancedBlockingMode.setVisibility(this.bc.getInstalledUpgrades(Upgrades.ADVANCED_BLOCKING) > 0);
}
if (this.lockCraftingMode != null) {
this.lockCraftingMode.setVisibility(this.bc.getInstalledUpgrades(Upgrades.LOCK_CRAFTING) > 0);
}
}
}
9 changes: 9 additions & 0 deletions src/main/java/com/glodblock/github/common/block/BlockFluidInterface.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import java.util.EnumSet;

import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.world.World;
Expand Down Expand Up @@ -61,6 +62,14 @@ public boolean onActivated(final World world, final int x, final int y, final in
return false;
}

@Override
public void onNeighborBlockChange(World worldIn, int x, int y, int z, Block neighbor) {
TileFluidInterface tile = this.getTileEntity(worldIn, x, y, z);
if (tile != null) {
tile.getInterfaceDuality().updateRedstoneState();
}
}

@Override
protected boolean hasCustomRotation() {
return true;
Expand Down
41 changes: 3 additions & 38 deletions src/main/java/com/glodblock/github/common/parts/PartFluidInterface.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,35 +24,26 @@
import com.glodblock.github.util.DualityFluidInterface;
import com.glodblock.github.util.Util;

import appeng.api.config.Actionable;
import appeng.api.config.Upgrades;
import appeng.api.networking.IGridNode;
import appeng.api.networking.energy.IEnergyGrid;
import appeng.api.networking.events.MENetworkChannelsChanged;
import appeng.api.networking.events.MENetworkEventSubscribe;
import appeng.api.networking.events.MENetworkPowerStatusChange;
import appeng.api.networking.security.BaseActionSource;
import appeng.api.networking.security.MachineSource;
import appeng.api.networking.storage.IStorageGrid;
import appeng.api.networking.ticking.TickRateModulation;
import appeng.api.networking.ticking.TickingRequest;
import appeng.api.parts.IPartRenderHelper;
import appeng.api.storage.IMEMonitor;
import appeng.api.storage.data.IAEFluidStack;
import appeng.client.texture.CableBusTextures;
import appeng.me.GridAccessException;
import appeng.parts.misc.PartInterface;
import appeng.tile.inventory.AppEngInternalAEInventory;
import appeng.util.Platform;
import appeng.util.item.AEFluidStack;
import cpw.mods.fml.common.network.ByteBufUtils;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import io.netty.buffer.ByteBuf;

public class PartFluidInterface extends PartInterface implements IDualHost {

private final BaseActionSource ownActionSource = new MachineSource(this);
private final AppEngInternalAEInventory config = new AppEngInternalAEInventory(this, 6);
private final DualityFluidInterface fluidDuality = new DualityFluidInterface(this.getProxy(), this);

Expand Down Expand Up @@ -201,35 +192,9 @@ public int getInstalledUpgrades(final Upgrades u) {
return getInterfaceDuality().getInstalledUpgrades(u);
}

private IMEMonitor<IAEFluidStack> getFluidGrid() {
try {
return getProxy().getGrid().<IStorageGrid>getCache(IStorageGrid.class).getFluidInventory();
} catch (GridAccessException e) {
return null;
}
}

private IEnergyGrid getEnergyGrid() {
try {
return getProxy().getGrid().getCache(IEnergyGrid.class);
} catch (GridAccessException e) {
return null;
}
}

@Override
public int fill(ForgeDirection from, FluidStack resource, boolean doFill) {
IMEMonitor<IAEFluidStack> fluidGrid = getFluidGrid();
IEnergyGrid energyGrid = getEnergyGrid();
if (energyGrid == null || fluidGrid == null || resource == null) return 0;
int ori = resource.amount;
IAEFluidStack remove;
if (doFill) {
remove = fluidGrid.injectItems(AEFluidStack.create(resource), Actionable.MODULATE, ownActionSource);
} else {
remove = fluidGrid.injectItems(AEFluidStack.create(resource), Actionable.SIMULATE, ownActionSource);
}
return remove == null ? ori : (int) (ori - remove.getStackSize());
return fluidDuality.fill(from, resource, doFill);
}

@Override
Expand All @@ -244,12 +209,12 @@ public FluidStack drain(ForgeDirection from, int maxDrain, boolean doDrain) {

@Override
public boolean canFill(ForgeDirection from, Fluid fluid) {
return true;
return fluidDuality.canFill(from, fluid);
}

@Override
public boolean canDrain(ForgeDirection from, Fluid fluid) {
return true;
return fluidDuality.canDrain(from, fluid);
}

@Override
Expand Down
42 changes: 8 additions & 34 deletions src/main/java/com/glodblock/github/common/parts/PartFluidP2PInterface.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,14 +38,11 @@
import appeng.api.networking.crafting.ICraftingLink;
import appeng.api.networking.crafting.ICraftingPatternDetails;
import appeng.api.networking.crafting.ICraftingProviderHelper;
import appeng.api.networking.energy.IEnergyGrid;
import appeng.api.networking.events.MENetworkChannelsChanged;
import appeng.api.networking.events.MENetworkCraftingPatternChange;
import appeng.api.networking.events.MENetworkEventSubscribe;
import appeng.api.networking.events.MENetworkPowerStatusChange;
import appeng.api.networking.security.BaseActionSource;
import appeng.api.networking.security.MachineSource;
import appeng.api.networking.storage.IStorageGrid;
import appeng.api.networking.ticking.IGridTickable;
import appeng.api.networking.ticking.TickRateModulation;
import appeng.api.networking.ticking.TickingRequest;
Expand All @@ -68,7 +65,6 @@
import appeng.tile.inventory.InvOperation;
import appeng.util.Platform;
import appeng.util.inv.IInventoryDestination;
import appeng.util.item.AEFluidStack;

public class PartFluidP2PInterface extends PartP2PTunnelStatic<PartFluidP2PInterface>
implements IGridTickable, IStorageMonitorable, IInventoryDestination, IDualHost, ISidedInventory,
Expand Down Expand Up @@ -108,7 +104,6 @@ public int getInstalledUpgrades(Upgrades u) {
};
private final DualityFluidInterface dualityFluid = new DualityFluidInterface(this.getProxy(), this);
private final AppEngInternalAEInventory config = new AppEngInternalAEInventory(this, 6);
private final BaseActionSource ownActionSource = new MachineSource(this);

public PartFluidP2PInterface(ItemStack is) {
super(is);
Expand All @@ -132,6 +127,11 @@ public void gridChanged() {
dualityFluid.gridChanged();
}

@Override
public void onNeighborChanged() {
this.duality.updateRedstoneState();
}

@Override
public boolean onPartActivate(final EntityPlayer player, final Vec3 pos) {
AppEngInternalInventory patterns = (AppEngInternalInventory) duality.getPatterns();
Expand Down Expand Up @@ -350,35 +350,9 @@ public boolean canExtractItem(int p_102008_1_, ItemStack p_102008_2_, int p_1020
return true;
}

private IMEMonitor<IAEFluidStack> getFluidGrid() {
try {
return getProxy().getGrid().<IStorageGrid>getCache(IStorageGrid.class).getFluidInventory();
} catch (GridAccessException e) {
return null;
}
}

private IEnergyGrid getEnergyGrid() {
try {
return getProxy().getGrid().getCache(IEnergyGrid.class);
} catch (GridAccessException e) {
return null;
}
}

@Override
public int fill(ForgeDirection from, FluidStack resource, boolean doFill) {
IMEMonitor<IAEFluidStack> fluidGrid = getFluidGrid();
IEnergyGrid energyGrid = getEnergyGrid();
if (energyGrid == null || fluidGrid == null || resource == null) return 0;
int ori = resource.amount;
IAEFluidStack remove;
if (doFill) {
remove = fluidGrid.injectItems(AEFluidStack.create(resource), Actionable.MODULATE, ownActionSource);
} else {
remove = fluidGrid.injectItems(AEFluidStack.create(resource), Actionable.SIMULATE, ownActionSource);
}
return remove == null ? ori : (int) (ori - remove.getStackSize());
return dualityFluid.fill(from, resource, doFill);
}

@Override
Expand All @@ -393,12 +367,12 @@ public FluidStack drain(ForgeDirection from, int maxDrain, boolean doDrain) {

@Override
public boolean canFill(ForgeDirection from, Fluid fluid) {
return true;
return dualityFluid.canFill(from, fluid);
}

@Override
public boolean canDrain(ForgeDirection from, Fluid fluid) {
return true;
return dualityFluid.canDrain(from, fluid);
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/glodblock/github/common/tile/TileFluidInterface.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ public boolean canFill(ForgeDirection from, Fluid fluid) {

@Override
public boolean canDrain(ForgeDirection from, Fluid fluid) {
return true;
return fluidDuality.canDrain(from, fluid);
}

@Override
Expand Down
4 changes: 4 additions & 0 deletions src/main/java/com/glodblock/github/proxy/CommonProxy.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,12 @@ public void postInit(FMLPostInitializationEvent event) {
}
Upgrades.CRAFTING.registerItem(new ItemStack(ItemAndBlockHolder.FLUID_INTERFACE), 1);
Upgrades.CRAFTING.registerItem(new ItemStack(ItemAndBlockHolder.INTERFACE), 1);
Upgrades.CRAFTING.registerItem(new ItemStack(ItemAndBlockHolder.FLUID_INTERFACE_P2P), 1);
Upgrades.ADVANCED_BLOCKING.registerItem(new ItemStack(ItemAndBlockHolder.FLUID_INTERFACE), 1);
Upgrades.ADVANCED_BLOCKING.registerItem(new ItemStack(ItemAndBlockHolder.INTERFACE), 1);
Upgrades.LOCK_CRAFTING.registerItem(new ItemStack(ItemAndBlockHolder.FLUID_INTERFACE), 1);
Upgrades.LOCK_CRAFTING.registerItem(new ItemStack(ItemAndBlockHolder.INTERFACE), 1);
Upgrades.LOCK_CRAFTING.registerItem(new ItemStack(ItemAndBlockHolder.FLUID_INTERFACE_P2P), 1);
Upgrades.CAPACITY.registerItem(new ItemStack(ItemAndBlockHolder.FLUID_STORAGE_BUS), 5);
Upgrades.INVERTER.registerItem(new ItemStack(ItemAndBlockHolder.FLUID_STORAGE_BUS), 1);
if (Config.fluidIOBus) {
Expand Down
12 changes: 12 additions & 0 deletions src/main/java/com/glodblock/github/util/DualityFluidInterface.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
import net.minecraftforge.fluids.FluidTankInfo;
import net.minecraftforge.fluids.IFluidHandler;

import com.glodblock.github.common.item.ItemFluidDrop;
import com.glodblock.github.common.item.ItemFluidPacket;
import com.glodblock.github.inventory.AEFluidInventory;
import com.glodblock.github.inventory.IAEFluidInventory;
Expand Down Expand Up @@ -408,6 +409,13 @@ public int fill(ForgeDirection from, FluidStack resource, boolean doFill) {
IAEFluidStack remove;
if (doFill) {
remove = fluidGrid.injectItems(AEFluidStack.create(resource), Actionable.MODULATE, this.mySource);
if (remove == null) {
onStackReturnedToNetwork(resource);
} else {
FluidStack copy = resource.copy();
copy.amount -= (int) remove.getStackSize();
onStackReturnedToNetwork(copy);
}
} else {
remove = fluidGrid.injectItems(AEFluidStack.create(resource), Actionable.SIMULATE, this.mySource);
}
Expand Down Expand Up @@ -439,6 +447,10 @@ public FluidTankInfo[] getTankInfo(ForgeDirection from) {
return this.tanks.getTankInfo(from);
}

private void onStackReturnedToNetwork(FluidStack fluidStack) {
this.iHost.getInterfaceDuality().onStackReturnedToNetwork(ItemFluidDrop.newAeStack(fluidStack));
}

private static class InterfaceInventory extends MEMonitorIFluidHandler {

InterfaceInventory(DualityFluidInterface tileInterface) {
Expand Down

2 comments on commit db8aee2

@LSK-LW
Copy link

@LSK-LW LSK-LW commented on db8aee2 Dec 21, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This mod breaks the search functionality of NotEnoughItems

@Caedis
Copy link
Member

@Caedis Caedis commented on db8aee2 Dec 21, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not the right place. Please provide all the require information and submit an issue here

Please sign in to comment.