Adding mod item filter

This commit is contained in:
CrazyPants committed 2014-08-15 02:07:07 +08:00
1 parent 0ece5698f3
commit 6336027f12
14 files changed
+456

No files matched your search

@@ -37,6 +37,7 @@ import crazypants.enderio.conduit.item.ItemExtractSpeedUpgrade;
import crazypants.enderio.conduit.item.ItemItemConduit;
import crazypants.enderio.conduit.item.filter.ItemBasicItemFilter;
import crazypants.enderio.conduit.item.filter.ItemExistingItemFilter;
import crazypants.enderio.conduit.item.filter.ItemModItemFilter;
import crazypants.enderio.conduit.liquid.ItemLiquidConduit;
import crazypants.enderio.conduit.power.ItemPowerConduit;
import crazypants.enderio.conduit.redstone.ItemRedstoneConduit;
@@ -169,6 +170,7 @@ public class EnderIO {
public static ItemItemConduit itemItemConduit;
public static ItemBasicItemFilter itemBasicFilterUpgrade;
public static ItemExistingItemFilter itemExistingItemFilter;
public static ItemModItemFilter itemModItemFilter;
public static ItemExtractSpeedUpgrade itemExtractSpeedUpgrade;
// Machines
@@ -306,6 +308,7 @@ public class EnderIO {
itemBasicFilterUpgrade = ItemBasicItemFilter.create();
itemExistingItemFilter = ItemExistingItemFilter.create();
itemModItemFilter = ItemModItemFilter .create();
itemExtractSpeedUpgrade = ItemExtractSpeedUpgrade.create();
Fluid f = new Fluid(Fluids.NUTRIENT_DISTILLATION_NAME).setDensity(1500).setViscosity(3000);
@@ -14,6 +14,7 @@ public enum ModObject {
itemMeConduit,
itemBasicFilterUpgrade,
itemExistingItemFilter,
itemModItemFilter,
itemExtractSpeedUpgrade,
// Power
@@ -39,6 +39,7 @@ import crazypants.enderio.conduit.gui.GuiExternalConnectionSelector;
import crazypants.enderio.conduit.gui.PacketFluidFilter;
import crazypants.enderio.conduit.gui.PacketOpenConduitUI;
import crazypants.enderio.conduit.gui.item.PacketExistingItemFilterSnapshot;
import crazypants.enderio.conduit.gui.item.PacketModItemFilter;
import crazypants.enderio.conduit.liquid.PacketFluidLevel;
import crazypants.enderio.conduit.packet.PacketConnectionMode;
import crazypants.enderio.conduit.packet.PacketExtractMode;
@@ -64,6 +65,7 @@ public class BlockConduitBundle extends BlockEio implements IGuiHandler {
PacketHandler.INSTANCE.registerMessage(PacketConnectionMode.class, PacketConnectionMode.class, PacketHandler.nextID(), Side.SERVER);
PacketHandler.INSTANCE.registerMessage(PacketItemConduitFilter.class, PacketItemConduitFilter.class, PacketHandler.nextID(), Side.SERVER);
PacketHandler.INSTANCE.registerMessage(PacketExistingItemFilterSnapshot.class, PacketExistingItemFilterSnapshot.class, PacketHandler.nextID(), Side.SERVER);
PacketHandler.INSTANCE.registerMessage(PacketModItemFilter.class, PacketModItemFilter.class, PacketHandler.nextID(), Side.SERVER);
PacketHandler.INSTANCE.registerMessage(PacketFluidFilter.class, PacketFluidFilter.class, PacketHandler.nextID(), Side.SERVER);
PacketHandler.INSTANCE.registerMessage(PacketRedstoneConduitSignalColor.class, PacketRedstoneConduitSignalColor.class, PacketHandler.nextID(), Side.SERVER);
PacketHandler.INSTANCE.registerMessage(PacketOpenConduitUI.class, PacketOpenConduitUI.class, PacketHandler.nextID(), Side.SERVER);
@@ -84,6 +84,11 @@ public class BasicItemFilterGui implements IItemFilterGui {
useOreDictB.setPaintSelectedBorder(false);
}
@Override
public void mouseClicked(int x, int y, int par3) {
}
@Override
public void updateButtons() {
ItemFilter activeFilter = (ItemFilter)filter;
@@ -105,7 +105,12 @@ public class ExistingItemFilterGui implements IItemFilterGui {
}
@Override
public void mouseClicked(int x, int y, int par3) {
}
@Override
public void updateButtons() {
ExistingItemFilter activeFilter = filter;
@@ -12,4 +12,6 @@ public interface IItemFilterGui {
void renderCustomOptions(int top, float par1, int par2, int par3);
void mouseClicked(int x, int y, int par3);
}
@@ -17,6 +17,7 @@ import crazypants.enderio.conduit.item.IItemConduit;
import crazypants.enderio.conduit.item.filter.ExistingItemFilter;
import crazypants.enderio.conduit.item.filter.IItemFilter;
import crazypants.enderio.conduit.item.filter.ItemFilter;
import crazypants.enderio.conduit.item.filter.ModItemFilter;
import crazypants.enderio.conduit.packet.PacketExtractMode;
import crazypants.enderio.conduit.packet.PacketItemConduitFilter;
import crazypants.enderio.gui.ColorButton;
@@ -265,6 +266,8 @@ public class ItemSettings extends BaseSettingsPanel {
return new BasicItemFilterGui(gui, itemConduit, isInput);
} else if(filter instanceof ExistingItemFilter) {
return new ExistingItemFilterGui(gui, itemConduit, isInput);
} else if(filter instanceof ModItemFilter) {
return new ModItemFilterGui(gui, itemConduit, isInput);
}
return null;
}
@@ -357,6 +360,16 @@ public class ItemSettings extends BaseSettingsPanel {
filterGui.actionPerformed(guiButton);
}
}
@Override
public void mouseClicked(int x, int y, int par3) {
super.mouseClicked(x, y, par3);
if(filterGui != null) {
filterGui.mouseClicked(x, y, par3);
}
}
private boolean isInputVisible() {
ConnectionMode mode = con.getConectionMode(gui.getDir());
@@ -0,0 +1,134 @@
package crazypants.enderio.conduit.gui.item;
import java.awt.Color;
import java.awt.Rectangle;
import org.lwjgl.opengl.GL11;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.FontRenderer;
import net.minecraft.client.gui.GuiButton;
import net.minecraft.item.ItemStack;
import crazypants.enderio.conduit.gui.GuiExternalConnection;
import crazypants.enderio.conduit.item.IItemConduit;
import crazypants.enderio.conduit.item.filter.ModItemFilter;
import crazypants.enderio.gui.IconButtonEIO;
import crazypants.enderio.gui.IconEIO;
import crazypants.enderio.network.PacketHandler;
import crazypants.render.ColorUtil;
import crazypants.render.RenderUtil;
public class ModItemFilterGui implements IItemFilterGui {
private IItemConduit itemConduit;
private GuiExternalConnection gui;
boolean isInput;
private ModItemFilter filter;
private Rectangle[] inputBounds = new Rectangle[] {
new Rectangle(50,48,16,16),
new Rectangle(50,69,16,16),
new Rectangle(50,90,16,16)
};
private IconButtonEIO[] deleteButs = new IconButtonEIO[inputBounds.length];
public ModItemFilterGui(GuiExternalConnection gui, IItemConduit itemConduit, boolean isInput) {
this.gui = gui;
this.itemConduit = itemConduit;
this.isInput = isInput;
if(isInput) {
filter = (ModItemFilter) itemConduit.getInputFilter(gui.getDir());
} else {
filter = (ModItemFilter) itemConduit.getOutputFilter(gui.getDir());
}
for(int i=0; i < deleteButs.length; i++) {
Rectangle r = inputBounds[i];
IconButtonEIO but = new IconButtonEIO(gui, GuiExternalConnection.nextButtonId(), r.x + 19, r.y, IconEIO.MINUS);
deleteButs[i] = but;
}
}
@Override
public void deactivate() {
for(IconButtonEIO but : deleteButs) {
but.detach();
}
}
@Override
public void updateButtons() {
for(IconButtonEIO but : deleteButs) {
but.onGuiInit();
}
}
@Override
public void actionPerformed(GuiButton guiButton) {
for(int i=0; i < deleteButs.length; i++) {
IconButtonEIO but = deleteButs[i];
if(but.id == guiButton.id) {
setMod(i, null);
return;
}
}
}
@Override
public void renderCustomOptions(int top, float par1, int par2, int par3) {
GL11.glColor3f(1, 1, 1);
RenderUtil.bindTexture("enderio:textures/gui/externalConduitConnection.png");
for(Rectangle r : inputBounds) {
//slot
gui.drawTexturedModalRect(gui.getGuiLeft() + r.x - 1, gui.getGuiTop() + r.y - 1, 24, 238, 18, 18);
//text box
gui.drawTexturedModalRect(gui.getGuiLeft() + r.x + 38, gui.getGuiTop() + r.y - 1, 24, 238, 4, 18);
gui.drawTexturedModalRect(gui.getGuiLeft() + r.x + 42, gui.getGuiTop() + r.y - 1, 120, 238, 86, 18);
gui.drawTexturedModalRect(gui.getGuiLeft() + r.x + 128, gui.getGuiTop() + r.y - 1, 38, 238, 4, 18);
}
FontRenderer fr = Minecraft.getMinecraft().fontRenderer;
for(int i=0;i<inputBounds.length;i++) {
String mod = filter.getModAt(i);
if(mod != null) {
Rectangle r = inputBounds[i];
fr.drawStringWithShadow(mod, gui.getGuiLeft() + r.x + 41, gui.getGuiTop() + r.y + 4 , ColorUtil.getRGB(Color.white));
}
}
RenderUtil.bindTexture("enderio:textures/gui/externalConduitConnection.png");
gui.drawTexturedModalRect(gui.getGuiLeft() + inputBounds[0].x + 131, gui.getGuiTop() + inputBounds[0].y, 181, 20, 30, 60);
for(Rectangle r : inputBounds) {
gui.drawTexturedModalRect(gui.getGuiLeft() + r.x + 131, gui.getGuiTop() + r.y - 1, 41, 238, 1, 18);
}
}
@Override
public void mouseClicked(int x, int y, int par3) {
ItemStack st = Minecraft.getMinecraft().thePlayer.inventory.getItemStack();
if(st == null) {
return;
}
for(int i=0;i<inputBounds.length;i++) {
Rectangle bound = inputBounds[i];
if(bound.contains(x,y)) {
setMod(i, st);
}
}
}
private void setMod(int i, ItemStack st) {
String mod = filter.setMod(i, st);
PacketHandler.INSTANCE.sendToServer(new PacketModItemFilter(itemConduit, gui.getDir(),isInput,i, mod));
}
}
@@ -0,0 +1,88 @@
package crazypants.enderio.conduit.gui.item;
import io.netty.buffer.ByteBuf;
import java.util.List;
import net.minecraft.item.ItemStack;
import net.minecraftforge.common.util.ForgeDirection;
import cpw.mods.fml.common.network.ByteBufUtils;
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 crazypants.enderio.conduit.item.IItemConduit;
import crazypants.enderio.conduit.item.ItemConduitNetwork;
import crazypants.enderio.conduit.item.NetworkedInventory;
import crazypants.enderio.conduit.item.filter.ExistingItemFilter;
import crazypants.enderio.conduit.item.filter.ModItemFilter;
import crazypants.enderio.conduit.packet.AbstractConduitPacket;
import crazypants.enderio.conduit.packet.ConTypeEnum;
public class PacketModItemFilter extends AbstractConduitPacket<IItemConduit> implements IMessageHandler<PacketModItemFilter, IMessage> {
private ForgeDirection dir;
private boolean isInput;
private int index;
private String name;
public PacketModItemFilter() {
}
public PacketModItemFilter(IItemConduit con, ForgeDirection dir, boolean isInput, int index, String name) {
super(con.getBundle().getEntity(), ConTypeEnum.ITEM);
this.dir = dir;
this.isInput= isInput;
this.index = index;
this.name = name;
}
@Override
public void fromBytes(ByteBuf buf) {
super.fromBytes(buf);
dir = ForgeDirection.values()[buf.readShort()];
isInput = buf.readBoolean();
index = buf.readInt();
boolean isNull = buf.readBoolean();
if(isNull) {
name = null;
} else {
name = ByteBufUtils.readUTF8String(buf);
}
}
@Override
public void toBytes(ByteBuf buf) {
super.toBytes(buf);
buf.writeShort(dir.ordinal());
buf.writeBoolean(isInput);
buf.writeInt(index);
buf.writeBoolean(name == null);
if(name != null) {
ByteBufUtils.writeUTF8String(buf, name);
}
}
@Override
public IMessage onMessage(PacketModItemFilter message, MessageContext ctx) {
IItemConduit conduit = message.getTileCasted(ctx);
if(conduit == null) {
return null;
}
ModItemFilter filter;
if(message.isInput) {
filter = (ModItemFilter)conduit.getInputFilter(message.dir);
} else {
filter = (ModItemFilter)conduit.getOutputFilter(message.dir);
}
filter.setMod(message.index, message.name);
if(message.isInput) {
conduit.setInputFilter(message.dir, filter);
} else {
conduit.setOutputFilter(message.dir, filter);
}
return null;
}
}
@@ -0,0 +1,69 @@
package crazypants.enderio.conduit.item.filter;
import java.util.List;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumChatFormatting;
import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import crazypants.enderio.EnderIOTab;
import crazypants.enderio.ModObject;
import crazypants.enderio.conduit.item.FilterRegister;
import crazypants.enderio.gui.IResourceTooltipProvider;
import crazypants.enderio.gui.TooltipAddera;
import crazypants.util.Lang;
public class ItemModItemFilter extends Item implements IItemFilterUpgrade, IResourceTooltipProvider {
public static ItemModItemFilter create() {
ItemModItemFilter result = new ItemModItemFilter();
result.init();
return result;
}
protected ItemModItemFilter() {
setCreativeTab(EnderIOTab.tabEnderIO);
setUnlocalizedName(ModObject.itemModItemFilter.unlocalisedName);
setMaxDamage(0);
setMaxStackSize(64);
}
protected void init() {
GameRegistry.registerItem(this, ModObject.itemModItemFilter.unlocalisedName);
}
@Override
public IItemFilter createFilterFromStack(ItemStack stack) {
IItemFilter filter = new ModItemFilter();
if(stack.stackTagCompound != null && stack.stackTagCompound.hasKey("filter")) {
filter.readFromNBT(stack.stackTagCompound.getCompoundTag("filter"));
}
return filter;
}
@Override
public void registerIcons(IIconRegister IIconRegister) {
itemIcon = IIconRegister.registerIcon("enderio:modItemFilter");
}
@Override
public String getUnlocalizedNameForTooltip(ItemStack stack) {
return getUnlocalizedName();
}
@Override
@SideOnly(Side.CLIENT)
public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) {
if(FilterRegister.isFilterSet(par1ItemStack)) {
if(TooltipAddera.instance.showAdvancedTooltips()) {
par3List.add(EnumChatFormatting.ITALIC + Lang.localize("itemConduitFilterUpgrade.configured"));
par3List.add(EnumChatFormatting.ITALIC + Lang.localize("itemConduitFilterUpgrade.clearConfigMethod"));
}
}
}
}
@@ -0,0 +1,129 @@
package crazypants.enderio.conduit.item.filter;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.common.registry.GameRegistry.UniqueIdentifier;
import net.minecraft.inventory.Slot;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTBase;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTTagList;
import net.minecraft.nbt.NBTTagString;
import crazypants.enderio.conduit.item.NetworkedInventory;
public class ModItemFilter implements IItemFilter {
private final String[] mods = new String[3];
public String setMod(int index, ItemStack itemStack) {
if(index < 0 || index >= mods.length) {
return null;
}
if(itemStack == null || itemStack.getItem() == null) {
setMod(index, (String) null);
return null;
}
UniqueIdentifier ui = GameRegistry.findUniqueIdentifierFor(itemStack.getItem());
if(ui == null) {
setMod(index, (String) null);
return null;
}
String targetMod = ui.modId;
if(targetMod == null) {
setMod(index, (String) null);
return null;
}
setMod(index, targetMod);
return targetMod;
}
public void setMod(int index, String mod) {
if(index < 0 || index >= mods.length) {
return;
}
mods[index] = mod;
}
public String getModAt(int index) {
if(index < 0 || index >= mods.length) {
return null;
}
return mods[index];
}
@Override
public boolean doesItemPassFilter(NetworkedInventory inv, ItemStack item) {
if(item == null || item.getItem() == null) {
return false;
}
UniqueIdentifier ui = GameRegistry.findUniqueIdentifierFor(item.getItem());
if(ui == null) {
return false;
}
String targetMod = ui.modId;
if(targetMod == null) {
return false;
}
for (String mod : mods) {
if(targetMod.equals(mod)) {
return true;
}
}
return false;
}
@Override
public boolean doesFilterCaptureStack(NetworkedInventory inv, ItemStack item) {
return false;
}
@Override
public boolean isSticky() {
return false;
}
@Override
public boolean isValid() {
return true;
}
@Override
public List<Slot> getSlots() {
return Collections.emptyList();
}
@Override
public int getSlotCount() {
return 0;
}
@Override
public void readFromNBT(NBTTagCompound nbtRoot) {
for (int i = 0; i < mods.length; i++) {
String mod = nbtRoot.getString("mod" + i);
if(mod == null || mod.isEmpty() || "-".equals(mod)) {
mods[i] = null;
} else {
mods[i] = mod;
}
}
}
@Override
public void writeToNBT(NBTTagCompound nbtRoot) {
for (int i = 0; i < mods.length; i++) {
String mod = mods[i];
if(mod == null || mod.trim().isEmpty()) {
nbtRoot.setString("mod" + i, "-");
} else {
nbtRoot.setString("mod" + i, mod);
}
}
}
}