Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fluid emitter and import export bus support nei drag and drop #73

Merged
merged 1 commit into from
Nov 23, 2022
Merged

fluid emitter and import export bus support nei drag and drop #73

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 40 additions & 5 deletions src/main/scala/extracells/gui/GuiBusFluidIO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

import appeng.api.AEApi;
import appeng.api.config.RedstoneMode;
import codechicken.nei.VisiblityData;
import codechicken.nei.api.INEIGuiHandler;
import codechicken.nei.api.TaggedInventoryArea;
import cpw.mods.fml.common.Optional;
import extracells.container.ContainerBusFluidIO;
import extracells.gui.widget.WidgetRedstoneModes;
import extracells.gui.widget.fluid.WidgetFluidSlot;
Expand All @@ -12,8 +16,10 @@
import extracells.part.PartGasExport;
import extracells.part.PartGasImport;
import extracells.util.FluidUtil;
import extracells.util.GuiUtil;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.GuiButton;
import net.minecraft.client.gui.inventory.GuiContainer;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.Slot;
import net.minecraft.item.ItemStack;
Expand All @@ -22,17 +28,18 @@
import net.minecraftforge.fluids.FluidStack;
import org.lwjgl.opengl.GL11;

import java.util.Collections;
import java.util.List;

@Optional.Interface(modid = "NotEnoughItems", iface = "codechicken.nei.api.INEIGuiHandler")
public class GuiBusFluidIO extends ECGuiContainer implements
WidgetFluidSlot.IConfigurable, IFluidSlotGui {
WidgetFluidSlot.IConfigurable, IFluidSlotGui, INEIGuiHandler {

private static final ResourceLocation guiTexture = new ResourceLocation("extracells", "textures/gui/busiofluid.png");
private PartFluidIO part;
private EntityPlayer player;
private final PartFluidIO part;
private final EntityPlayer player;
private byte filterSize;
private boolean redstoneControlled;
private boolean hasNetworkTool;
private final boolean hasNetworkTool;

public GuiBusFluidIO(PartFluidIO _terminal, EntityPlayer _player) {
super(new ContainerBusFluidIO(_terminal, _player));
Expand Down Expand Up @@ -206,4 +213,32 @@ public void updateRedstoneMode(RedstoneMode mode) {
if (this.redstoneControlled && this.buttonList.size() > 0)
((WidgetRedstoneModes) this.buttonList.get(0)).setRedstoneMode(mode);
}
@Override
public boolean handleDragNDrop(GuiContainer gui, int mouseX, int mouseY, ItemStack draggedStack, int button) {
for (WidgetFluidSlot fluidSlot : this.fluidSlotList) {
if (GuiUtil.isPointInRegion(this.guiLeft, this.guiTop, fluidSlot.getPosX(), fluidSlot.getPosY(), 18, 18, mouseX, mouseY)) {
fluidSlot.mouseNEIClicked(draggedStack);
return true;
}
}
return false;
}
@Override
public boolean hideItemPanelSlot(GuiContainer gui, int x, int y, int w, int h) {
return false;
}
@Override
public VisiblityData modifyVisiblity(GuiContainer gui, VisiblityData currentVisibility) {
return currentVisibility;
}

@Override
public Iterable<Integer> getItemSpawnSlots(GuiContainer gui, ItemStack item) {
return Collections.emptyList();
}

@Override
public List<TaggedInventoryArea> getInventoryAreas(GuiContainer gui) {
return null;
}
}
44 changes: 40 additions & 4 deletions src/main/scala/extracells/gui/GuiFluidEmitter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
package extracells.gui;

import appeng.api.config.RedstoneMode;
import codechicken.nei.VisiblityData;
import codechicken.nei.api.INEIGuiHandler;
import codechicken.nei.api.TaggedInventoryArea;
import cpw.mods.fml.common.Optional;
import extracells.container.ContainerFluidEmitter;
import extracells.gui.widget.DigitTextField;
import extracells.gui.widget.WidgetRedstoneModes;
Expand All @@ -14,22 +18,26 @@
import extracells.util.GuiUtil;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.GuiButton;
import net.minecraft.client.gui.inventory.GuiContainer;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.fluids.Fluid;
import org.lwjgl.input.Keyboard;
import org.lwjgl.opengl.GL11;

import java.util.Collections;
import java.util.List;

public class GuiFluidEmitter extends ECGuiContainer implements IFluidSlotGui {
@Optional.Interface(modid = "NotEnoughItems", iface = "codechicken.nei.api.INEIGuiHandler")
public class GuiFluidEmitter extends ECGuiContainer implements IFluidSlotGui,INEIGuiHandler{

public static final int xSize = 176;
public static final int ySize = 166;
private DigitTextField amountField;
private PartFluidLevelEmitter part;
private EntityPlayer player;
private ResourceLocation guiTexture = new ResourceLocation("extracells", "textures/gui/levelemitterfluid.png");
private final PartFluidLevelEmitter part;
private final EntityPlayer player;
private final ResourceLocation guiTexture = new ResourceLocation("extracells", "textures/gui/levelemitterfluid.png");

public GuiFluidEmitter(PartFluidLevelEmitter _part, EntityPlayer _player) {
super(new ContainerFluidEmitter(_part, _player));
Expand Down Expand Up @@ -174,4 +182,32 @@ public void updateFluids(List<Fluid> _fluids) {
}
this.fluidSlot.setFluid(_fluids.get(0));
}
@Override
public boolean handleDragNDrop(GuiContainer gui, int mouseX, int mouseY, ItemStack draggedStack, int button) {
if(GuiUtil.isPointInRegion(this.guiLeft, this.guiTop, this.fluidSlot.getPosX(), this.fluidSlot.getPosY(), 18, 18, mouseX, mouseY)){
this.fluidSlot.mouseNEIClicked(draggedStack);
return true;
}
return false;
}
@Override
public boolean hideItemPanelSlot(GuiContainer gui, int x, int y, int w, int h) {
return false;
}
@Override
public VisiblityData modifyVisiblity(GuiContainer gui, VisiblityData currentVisibility) {
return currentVisibility;
}

@Override
public Iterable<Integer> getItemSpawnSlots(GuiContainer gui, ItemStack item) {
return Collections.emptyList();
}

@Override
public List<TaggedInventoryArea> getInventoryAreas(GuiContainer gui) {
return null;
}


}
9 changes: 6 additions & 3 deletions src/main/scala/extracells/item/ItemWirelessTerminalUniversal.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
package extracells.item


import java.util

import appeng.api.AEApi
import appeng.api.features.IWirelessTermHandler
import appeng.api.util.IConfigManager
Expand All @@ -18,9 +16,11 @@ import net.minecraft.creativetab.CreativeTabs
import net.minecraft.entity.player.EntityPlayer
import net.minecraft.item.{Item, ItemStack}
import net.minecraft.nbt.NBTTagCompound
import net.minecraft.util.{IIcon, StatCollector}
import net.minecraft.util.{ChatComponentText, IIcon, StatCollector}
import net.minecraft.world.World

import java.util

object ItemWirelessTerminalUniversal extends ItemECBase with WirelessTermBase with IWirelessFluidTermHandler with IWirelessGasTermHandler with IWirelessTermHandler with EssensiaTerminal with CraftingTerminal{
val isTeEnabled = Integration.Mods.THAUMATICENERGISTICS.isEnabled
val isMekEnabled = Integration.Mods.MEKANISMGAS.isEnabled
Expand Down Expand Up @@ -137,6 +137,9 @@ object ItemWirelessTerminalUniversal extends ItemECBase with WirelessTermBase wi
else
tag.setByte("type", 0)
}
player.addChatMessage(new ChatComponentText(StatCollector.translateToLocal(
"extracells.tooltip.mode") + ": " + StatCollector.translateToLocal("extracells.tooltip." + TerminalType.values().apply(tag.getByte("type")).toString.toLowerCase
)))
itemStack
}

Expand Down