refactor 4

This commit is contained in:
GlodBlock committed 2023-01-21 23:19:25 +08:00
1 parent b9b8ac3b43
commit d9449622b9
22 files changed
+350 -579

No files matched your search

@@ -1,6 +1,6 @@
package com.glodblock.github.network;
import com.glodblock.github.client.gui.TankDumpable;
import com.glodblock.github.client.gui.ITankDump;
import cpw.mods.fml.common.network.simpleimpl.IMessage;
import cpw.mods.fml.common.network.simpleimpl.IMessageHandler;
import cpw.mods.fml.common.network.simpleimpl.MessageContext;
@@ -36,8 +36,8 @@ public class CPacketDumpTank implements IMessage {
@Override
public IMessage onMessage(CPacketDumpTank message, MessageContext ctx) {
EntityPlayerMP player = ctx.getServerHandler().playerEntity;
if (player.openContainer instanceof TankDumpable) {
((TankDumpable) player.openContainer).dumpTank(message.index);
if (player.openContainer instanceof ITankDump) {
((ITankDump) player.openContainer).dumpTank(message.index);
}
return null;
}
@@ -6,7 +6,9 @@ import appeng.container.ContainerOpenContext;
import appeng.container.implementations.ContainerCraftAmount;
import appeng.helpers.InventoryAction;
import appeng.util.item.AEItemStack;
import com.glodblock.github.FluidCraft;
import com.glodblock.github.client.gui.container.ContainerPatternValueAmount;
import com.glodblock.github.common.item.ItemFluidPacket;
import com.glodblock.github.inventory.InventoryHandler;
import com.glodblock.github.inventory.gui.GuiType;
import com.glodblock.github.util.BlockPos;
@@ -20,6 +22,7 @@ import java.util.Objects;
import javax.annotation.Nullable;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.fluids.FluidStack;
public class CPacketInventoryAction implements IMessage {
@@ -96,22 +99,19 @@ public class CPacketInventoryAction implements IMessage {
Objects.requireNonNull(
Util.from(baseContainer.getOpenContext().getSide())),
GuiType.FLUID_CRAFTING_AMOUNT);
if (sender.openContainer instanceof ContainerCraftAmount) {
final ContainerCraftAmount cca = (ContainerCraftAmount) sender.openContainer;
if (baseContainer.getTargetStack() != null) {
cca.getCraftingItem()
.putStack(baseContainer.getTargetStack().getItemStack());
cca.setItemToCraft(baseContainer.getTargetStack());
}
cca.detectAndSendChanges();
}
}
} else if (message.action == InventoryAction.SET_PATTERN_VALUE) {
final ContainerOpenContext context = baseContainer.getOpenContext();
if (context != null) {
if (context != null && message.stack != null) {
final TileEntity te = context.getTile();
InventoryHandler.openGui(
sender,
@@ -120,6 +120,12 @@ public class CPacketInventoryAction implements IMessage {
Objects.requireNonNull(
Util.from(baseContainer.getOpenContext().getSide())),
GuiType.PATTERN_VALUE_SET);
int amt = (int) message.stack.getStackSize();
if (message.stack.getItem() instanceof ItemFluidPacket) {
FluidStack fluid = ItemFluidPacket.getFluidStack(message.stack);
amt = fluid == null ? 1 : fluid.amount;
}
FluidCraft.proxy.netHandler.sendTo(new SPacketSetItemAmount(amt), sender);
if (sender.openContainer instanceof ContainerPatternValueAmount) {
final ContainerPatternValueAmount cpv = (ContainerPatternValueAmount) sender.openContainer;
if (baseContainer.getTargetStack() != null) {
@@ -2,9 +2,9 @@ package com.glodblock.github.network;
import appeng.api.networking.IGridHost;
import appeng.container.ContainerOpenContext;
import com.glodblock.github.client.gui.container.ContainerFluidPatternTerminal;
import com.glodblock.github.client.gui.container.ContainerFluidPatternTerminalEx;
import appeng.container.slot.SlotFake;
import com.glodblock.github.client.gui.container.ContainerPatternValueAmount;
import com.glodblock.github.client.gui.container.base.FCContainerEncodeTerminal;
import com.glodblock.github.common.item.ItemFluidPacket;
import com.glodblock.github.inventory.InventoryHandler;
import com.glodblock.github.inventory.gui.GuiType;
@@ -27,7 +27,9 @@ public class CPacketPatternValueSet implements IMessage {
private int amount;
private int valueIndex;
public CPacketPatternValueSet() {}
public CPacketPatternValueSet() {
// NO-OP
}
public CPacketPatternValueSet(int originalGui, int amount, int valueIndex) {
this.originGui = GuiType.getByOrdinal(originalGui);
@@ -54,7 +56,7 @@ public class CPacketPatternValueSet implements IMessage {
@Override
public IMessage onMessage(CPacketPatternValueSet message, MessageContext ctx) {
EntityPlayer player = ctx.getServerHandler().playerEntity;
if (player.openContainer instanceof ContainerPatternValueAmount && message.valueIndex != -1) {
if (player.openContainer instanceof ContainerPatternValueAmount) {
ContainerPatternValueAmount cpv = (ContainerPatternValueAmount) player.openContainer;
final Object target = cpv.getTarget();
if (target instanceof IGridHost) {
@@ -67,10 +69,9 @@ public class CPacketPatternValueSet implements IMessage {
new BlockPos(te),
Objects.requireNonNull(Util.from(context.getSide())),
message.originGui);
if (player.openContainer instanceof ContainerFluidPatternTerminal
|| player.openContainer instanceof ContainerFluidPatternTerminalEx) {
if (player.openContainer instanceof FCContainerEncodeTerminal) {
Slot slot = player.openContainer.getSlot(message.valueIndex);
if (slot != null && slot.getHasStack()) {
if (slot instanceof SlotFake) {
ItemStack stack = slot.getStack().copy();
if (Util.isFluidPacket(stack)) {
FluidStack fluidStack = ItemFluidPacket.getFluidStack(stack);
@@ -0,0 +1,45 @@
package com.glodblock.github.network;
import com.glodblock.github.client.gui.GuiPatternValueAmount;
import cpw.mods.fml.common.network.simpleimpl.IMessage;
import cpw.mods.fml.common.network.simpleimpl.IMessageHandler;
import cpw.mods.fml.common.network.simpleimpl.MessageContext;
import io.netty.buffer.ByteBuf;
import javax.annotation.Nullable;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.GuiScreen;
public class SPacketSetItemAmount implements IMessage {
private int amount;
public SPacketSetItemAmount() {
// NO-OP
}
public SPacketSetItemAmount(int amount) {
this.amount = amount;
}
@Override
public void fromBytes(ByteBuf buf) {
amount = buf.readInt();
}
@Override
public void toBytes(ByteBuf buf) {
buf.writeInt(amount);
}
public static class Handler implements IMessageHandler<SPacketSetItemAmount, IMessage> {
@Nullable
@Override
public IMessage onMessage(SPacketSetItemAmount message, MessageContext ctx) {
final GuiScreen gs = Minecraft.getMinecraft().currentScreen;
if (gs instanceof GuiPatternValueAmount) {
((GuiPatternValueAmount) gs).setAmount(message.amount);
}
return null;
}
}
}