This commit is contained in:
lc-1337 committed 2025-10-16 20:31:06 +03:00
1 parent 7c567e0c38
commit 6680f3e91a
16 files changed
+66 -192

No files matched your search

@@ -20,7 +20,7 @@ import cpw.mods.fml.relauncher.SideOnly;
public class InventoryHandler implements IGuiHandler {
public static void switchGui(Object guiType) {
FluidCraft.proxy.netHandler.sendToServer(new CPacketSwitchGuis(guiType));
FluidCraft.proxy.netHandler.sendToServer(new CPacketSwitchGuis());
}
public static void openGui(EntityPlayer player, World world, BlockPos pos, ForgeDirection face, Object guiType) {
@@ -7,14 +7,10 @@ import javax.annotation.Nullable;
import net.minecraft.entity.player.EntityPlayer;
import com.glodblock.github.client.gui.GuiDualInterface;
import com.glodblock.github.client.gui.GuiFCPriority;
import com.glodblock.github.client.gui.GuiFluidAutoFiller;
import com.glodblock.github.client.gui.GuiFluidIO;
import com.glodblock.github.client.gui.GuiFluidInterface;
import com.glodblock.github.client.gui.GuiFluidLevelEmitter;
import com.glodblock.github.client.gui.GuiFluidPacketDecoder;
import com.glodblock.github.client.gui.GuiFluidPatternEncoder;
import com.glodblock.github.client.gui.GuiFluidStorageBus;
import com.glodblock.github.client.gui.GuiIngredientBuffer;
import com.glodblock.github.client.gui.GuiLargeIngredientBuffer;
import com.glodblock.github.client.gui.GuiLevelMaintainer;
@@ -25,12 +21,9 @@ import com.glodblock.github.client.gui.GuiOCPatternEditor;
import com.glodblock.github.client.gui.GuiSuperStockReplenisher;
import com.glodblock.github.client.gui.container.ContainerDualInterface;
import com.glodblock.github.client.gui.container.ContainerFluidAutoFiller;
import com.glodblock.github.client.gui.container.ContainerFluidIO;
import com.glodblock.github.client.gui.container.ContainerFluidInterface;
import com.glodblock.github.client.gui.container.ContainerFluidLevelEmitter;
import com.glodblock.github.client.gui.container.ContainerFluidPacketDecoder;
import com.glodblock.github.client.gui.container.ContainerFluidPatternEncoder;
import com.glodblock.github.client.gui.container.ContainerFluidStorageBus;
import com.glodblock.github.client.gui.container.ContainerIngredientBuffer;
import com.glodblock.github.client.gui.container.ContainerLargeIngredientBuffer;
import com.glodblock.github.client.gui.container.ContainerLevelMaintainer;
@@ -39,9 +32,6 @@ import com.glodblock.github.client.gui.container.ContainerLevelWireless;
import com.glodblock.github.client.gui.container.ContainerMagnetFilter;
import com.glodblock.github.client.gui.container.ContainerOCPatternEditor;
import com.glodblock.github.client.gui.container.ContainerSuperStockReplenisher;
import com.glodblock.github.common.parts.PartFluidLevelEmitter;
import com.glodblock.github.common.parts.PartFluidStorageBus;
import com.glodblock.github.common.parts.base.FCSharedFluidBus;
import com.glodblock.github.common.tile.TileFluidAutoFiller;
import com.glodblock.github.common.tile.TileFluidPacketDecoder;
import com.glodblock.github.common.tile.TileFluidPatternEncoder;
@@ -55,9 +45,7 @@ import com.glodblock.github.inventory.item.IWirelessTerminal;
import com.google.common.collect.ImmutableList;
import appeng.api.storage.ITerminalHost;
import appeng.container.implementations.ContainerPriority;
import appeng.helpers.IInterfaceHost;
import appeng.helpers.IPriorityHost;
public enum GuiType {
@@ -74,19 +62,6 @@ public enum GuiType {
}
}),
FLUID_LEVEL_EMITTER(new PartGuiFactory<>(PartFluidLevelEmitter.class) {
@Override
protected Object createServerGui(EntityPlayer player, PartFluidLevelEmitter inv) {
return new ContainerFluidLevelEmitter(player.inventory, inv);
}
@Override
protected Object createClientGui(EntityPlayer player, PartFluidLevelEmitter inv) {
return new GuiFluidLevelEmitter(player.inventory, inv);
}
}),
LEVEL_MAINTAINER(new TileGuiFactory<>(TileLevelMaintainer.class) {
@Override
@@ -139,45 +114,6 @@ public enum GuiType {
}
}),
PRIORITY(new TileOrPartGuiFactory<>(IPriorityHost.class) {
@Override
protected Object createServerGui(EntityPlayer player, IPriorityHost inv) {
return new ContainerPriority(player.inventory, inv);
}
@Override
protected Object createClientGui(EntityPlayer player, IPriorityHost inv) {
return new GuiFCPriority(player.inventory, inv);
}
}),
FLUID_BUS_IO(new PartGuiFactory<>(FCSharedFluidBus.class) {
@Override
protected Object createServerGui(EntityPlayer player, FCSharedFluidBus inv) {
return new ContainerFluidIO(player.inventory, inv);
}
@Override
protected Object createClientGui(EntityPlayer player, FCSharedFluidBus inv) {
return new GuiFluidIO(player.inventory, inv);
}
}),
FLUID_STORAGE_BUS(new PartGuiFactory<>(PartFluidStorageBus.class) {
@Override
protected Object createServerGui(EntityPlayer player, PartFluidStorageBus inv) {
return new ContainerFluidStorageBus(player.inventory, inv);
}
@Override
protected Object createClientGui(EntityPlayer player, PartFluidStorageBus inv) {
return new GuiFluidStorageBus(player.inventory, inv);
}
}),
INGREDIENT_BUFFER(new TileGuiFactory<>(TileIngredientBuffer.class) {
@Override