Skip to content

Commit

Permalink
Revert "test 2"
Browse files Browse the repository at this point in the history 
This reverts commit 24ee20a.
  • Loading branch information
@aagrishankov
aagrishankov committed Oct 28, 2020
1 parent 24ee20a commit de2c5e4
Show file tree
Hide file tree
Showing 2 changed files with 263 additions and 257 deletions.
283 changes: 137 additions & 146 deletions src/main/scala/extracells/container/ContainerFluidInterface.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,151 +19,142 @@
import net.minecraftforge.fluids.FluidStack;

public class ContainerFluidInterface extends Container implements
IContainerListener {
public IFluidInterface fluidInterface;
@SideOnly(Side.CLIENT)
public GuiFluidInterface gui;
EntityPlayer player;

public ContainerFluidInterface(EntityPlayer player,
IFluidInterface fluidInterface) {
this.player = player;
this.fluidInterface = fluidInterface;
for (int j = 0; j < 9; j++) {
addSlotToContainer(new SlotRespective(
fluidInterface.getPatternInventory(), j, 8 + j * 18, 115));
}
bindPlayerInventory(player.inventory);
if (fluidInterface instanceof TileEntityFluidInterface) {
((TileEntityFluidInterface) fluidInterface).registerListener(this);
} else if (fluidInterface instanceof PartFluidInterface) {
((PartFluidInterface) fluidInterface).registerListener(this);
}
if (fluidInterface instanceof TileEntityFluidInterface) {
((TileEntityFluidInterface) fluidInterface).doNextUpdate = true;
} else if (fluidInterface instanceof PartFluidInterface) {
((PartFluidInterface) fluidInterface).doNextUpdate = true;
}
}

protected void bindPlayerInventory(IInventory inventoryPlayer) {
for (int i = 0; i < 3; i++) {
for (int j = 0; j < 9; j++) {
addSlotToContainer(new Slot(inventoryPlayer, j + i * 9 + 9,
8 + j * 18, i * 18 + 149));
}
}

for (int i = 0; i < 9; i++) {
addSlotToContainer(new Slot(inventoryPlayer, i, 8 + i * 18, 207));// 173
}
}

@Override
public boolean canInteractWith(EntityPlayer entityplayer) {
return true;
}

private int getFluidID(ForgeDirection side) {
Fluid fluid = this.fluidInterface.getFilter(side);
if (fluid == null)
return -1;
return fluid.getID();
}

private String getFluidName(ForgeDirection side) {
Fluid fluid = this.fluidInterface.getFilter(side);
if (fluid == null) {
return "";
}
return fluid.getName();
}

@Override
public void onContainerClosed(EntityPlayer player) {
super.onContainerClosed(player);
if (this.fluidInterface instanceof TileEntityFluidInterface) {
((TileEntityFluidInterface) this.fluidInterface)
.removeListener(this);
} else if (this.fluidInterface instanceof PartFluidInterface) {
((PartFluidInterface) this.fluidInterface).removeListener(this);
}
}

@Override
protected void retrySlotClick(int p_75133_1_, int p_75133_2_,
boolean p_75133_3_, EntityPlayer p_75133_4_) {

}

@Override
public ItemStack transferStackInSlot(EntityPlayer player, int slotnumber) {
ItemStack itemstack = null;
Slot slot = (Slot) this.inventorySlots.get(slotnumber);

if (slot != null && slot.getHasStack()) {
ItemStack itemstack1 = slot.getStack();
itemstack = itemstack1.copy();

if (itemstack.getItem() instanceof ICraftingPatternItem) {
if (slotnumber < 9) {
if (!mergeItemStack(itemstack1,
this.inventorySlots.size() - 9,
this.inventorySlots.size(), false)) {
if (!mergeItemStack(itemstack1, 9,
this.inventorySlots.size() - 9, false))
return null;
}
} else if (!mergeItemStack(itemstack1, 0, 9, false)) {
return null;
}
if (itemstack1.stackSize == 0) {
slot.putStack(null);
} else {
slot.onSlotChanged();
}
return itemstack;
}

if (slotnumber < this.inventorySlots.size() - 9) {
if (!mergeItemStack(itemstack1, this.inventorySlots.size() - 9,
this.inventorySlots.size(), true)) {
return null;
}
} else if (!mergeItemStack(itemstack1, 9,
this.inventorySlots.size() - 9, false)) {
return null;
}

if (itemstack1.stackSize == 0) {
slot.putStack(null);
} else {
slot.onSlotChanged();
}
}

return itemstack;
}

@Override
public void updateContainer() {
new PacketFluidInterface(new FluidStack[]{
this.fluidInterface.getFluidTank(ForgeDirection.getOrientation(0)).getFluid(),
this.fluidInterface.getFluidTank(ForgeDirection.getOrientation(1)).getFluid(),
this.fluidInterface.getFluidTank(ForgeDirection.getOrientation(2)).getFluid(),
this.fluidInterface.getFluidTank(ForgeDirection.getOrientation(3)).getFluid(),
this.fluidInterface.getFluidTank(ForgeDirection.getOrientation(4)).getFluid(),
this.fluidInterface.getFluidTank(ForgeDirection.getOrientation(5)).getFluid()
},
new String[]{
getFluidName(ForgeDirection.getOrientation(0)),
getFluidName(ForgeDirection.getOrientation(1)),
getFluidName(ForgeDirection.getOrientation(2)),
getFluidName(ForgeDirection.getOrientation(3)),
getFluidName(ForgeDirection.getOrientation(4)),
getFluidName(ForgeDirection.getOrientation(5))
},
this.player).sendPacketToPlayer(this.player);
}
IContainerListener {
public IFluidInterface fluidInterface;
@SideOnly(Side.CLIENT)
public GuiFluidInterface gui;
EntityPlayer player;

public ContainerFluidInterface(EntityPlayer player,
IFluidInterface fluidInterface) {
this.player = player;
this.fluidInterface = fluidInterface;
for (int j = 0; j < 9; j++) {
addSlotToContainer(new SlotRespective(
fluidInterface.getPatternInventory(), j, 8 + j * 18, 115));
}
bindPlayerInventory(player.inventory);
if (fluidInterface instanceof TileEntityFluidInterface) {
((TileEntityFluidInterface) fluidInterface).registerListener(this);
} else if (fluidInterface instanceof PartFluidInterface) {
((PartFluidInterface) fluidInterface).registerListener(this);
}
if (fluidInterface instanceof TileEntityFluidInterface) {
((TileEntityFluidInterface) fluidInterface).doNextUpdate = true;
} else if (fluidInterface instanceof PartFluidInterface) {
((PartFluidInterface) fluidInterface).doNextUpdate = true;
}
}

protected void bindPlayerInventory(IInventory inventoryPlayer) {
for (int i = 0; i < 3; i++) {
for (int j = 0; j < 9; j++) {
addSlotToContainer(new Slot(inventoryPlayer, j + i * 9 + 9,
8 + j * 18, i * 18 + 149));
}
}

for (int i = 0; i < 9; i++) {
addSlotToContainer(new Slot(inventoryPlayer, i, 8 + i * 18, 207));// 173
}
}

@Override
public boolean canInteractWith(EntityPlayer entityplayer) {
return true;
}

private int getFluidID(ForgeDirection side) {
Fluid fluid = this.fluidInterface.getFilter(side);
if (fluid == null)
return -1;
return fluid.getID();
}

private String getFluidName(ForgeDirection side) {
Fluid fluid = this.fluidInterface.getFilter(side);
if (fluid == null) {
return "";
}
return fluid.getName();
}

@Override
public void onContainerClosed(EntityPlayer player) {
super.onContainerClosed(player);
if (this.fluidInterface instanceof TileEntityFluidInterface) {
((TileEntityFluidInterface) this.fluidInterface)
.removeListener(this);
} else if (this.fluidInterface instanceof PartFluidInterface) {
((PartFluidInterface) this.fluidInterface).removeListener(this);
}
}

@Override
protected void retrySlotClick(int p_75133_1_, int p_75133_2_,
boolean p_75133_3_, EntityPlayer p_75133_4_) {

}

@Override
public ItemStack transferStackInSlot(EntityPlayer player, int slotnumber) {
ItemStack itemstack = null;
Slot slot = (Slot) this.inventorySlots.get(slotnumber);

if (slot != null && slot.getHasStack()) {
ItemStack itemstack1 = slot.getStack();
itemstack = itemstack1.copy();

if (itemstack.getItem() instanceof ICraftingPatternItem) {
if (slotnumber < 9) {
if (!mergeItemStack(itemstack1,
this.inventorySlots.size() - 9,
this.inventorySlots.size(), false)) {
if (!mergeItemStack(itemstack1, 9,
this.inventorySlots.size() - 9, false))
return null;
}
} else if (!mergeItemStack(itemstack1, 0, 9, false)) {
return null;
}
if (itemstack1.stackSize == 0) {
slot.putStack(null);
} else {
slot.onSlotChanged();
}
return itemstack;
}

if (slotnumber < this.inventorySlots.size() - 9) {
if (!mergeItemStack(itemstack1, this.inventorySlots.size() - 9,
this.inventorySlots.size(), true)) {
return null;
}
} else if (!mergeItemStack(itemstack1, 9,
this.inventorySlots.size() - 9, false)) {
return null;
}

if (itemstack1.stackSize == 0) {
slot.putStack(null);
} else {
slot.onSlotChanged();
}
}

return itemstack;
}

@Override
public void updateContainer() {
FluidStack[] fluidStacks = new FluidStack[6];
String[] fluidNames = new String[6];
for (int i = 0; i < 6; i++) {
ForgeDirection location = ForgeDirection.getOrientation(i);
fluidStacks[i] = fluidInterface.getFluidTank(location).getFluid();
fluidNames[i] = getFluidName(location);
}
new PacketFluidInterface(fluidStacks, fluidNames, this.player).sendPacketToPlayer(this.player);
}

}
Loading

0 comments on commit de2c5e4

Please sign in to comment.