diff --git a/resources/assets/enderio/lang/en_US.lang b/resources/assets/enderio/lang/en_US.lang index afba5672..88cd8dff 100644 --- a/resources/assets/enderio/lang/en_US.lang +++ b/resources/assets/enderio/lang/en_US.lang @@ -74,6 +74,9 @@ item.itemModItemFilter.tooltip.basic.line1=Upgrade for item conduits item.itemModItemFilter.tooltip.detailed.line1=Selects only items for a specified item.itemModItemFilter.tooltip.detailed.line2=mod/s +item.itemPowerItemFilter.name=Chargeable Item Filter +item.itemPowerItemFilter.tooltip.basic.line1=Upgrade for item conduits + item.itemExtractSpeedUpgrade.name=Item Conduit Speed Upgrade item.itemExtractSpeedUpgrade.tooltip.basic.line1=Upgrade for item conduits item.itemExtractSpeedUpgrade.tooltip.detailed.line1=Increases speed by 4 diff --git a/resources/assets/enderio/textures/items/filterUpgradePower.png b/resources/assets/enderio/textures/items/filterUpgradePower.png new file mode 100644 index 00000000..ac49007b Binary files /dev/null and b/resources/assets/enderio/textures/items/filterUpgradePower.png differ diff --git a/src/main/java/crazypants/enderio/EnderIO.java b/src/main/java/crazypants/enderio/EnderIO.java index 2e8d1283..5b17884a 100644 --- a/src/main/java/crazypants/enderio/EnderIO.java +++ b/src/main/java/crazypants/enderio/EnderIO.java @@ -49,6 +49,7 @@ 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.item.filter.ItemPowerItemFilter; import crazypants.enderio.conduit.liquid.ItemLiquidConduit; import crazypants.enderio.conduit.me.ItemMEConduit; import crazypants.enderio.conduit.power.ItemPowerConduit; @@ -214,6 +215,7 @@ public class EnderIO { public static ItemBasicItemFilter itemBasicFilterUpgrade; public static ItemExistingItemFilter itemExistingItemFilter; public static ItemModItemFilter itemModItemFilter; + public static ItemPowerItemFilter itemPowerItemFilter; public static ItemExtractSpeedUpgrade itemExtractSpeedUpgrade; // Machines @@ -387,6 +389,7 @@ public class EnderIO { itemBasicFilterUpgrade = ItemBasicItemFilter.create(); itemExistingItemFilter = ItemExistingItemFilter.create(); itemModItemFilter = ItemModItemFilter.create(); + itemPowerItemFilter = ItemPowerItemFilter.create(); itemExtractSpeedUpgrade = ItemExtractSpeedUpgrade.create(); itemBasicCapacitor = ItemCapacitor.create(); diff --git a/src/main/java/crazypants/enderio/ModObject.java b/src/main/java/crazypants/enderio/ModObject.java index d804cf16..6aea6a14 100644 --- a/src/main/java/crazypants/enderio/ModObject.java +++ b/src/main/java/crazypants/enderio/ModObject.java @@ -16,6 +16,7 @@ public enum ModObject { itemBasicFilterUpgrade, itemExistingItemFilter, itemModItemFilter, + itemPowerItemFilter, itemExtractSpeedUpgrade, // Power diff --git a/src/main/java/crazypants/enderio/conduit/ConduitRecipes.java b/src/main/java/crazypants/enderio/conduit/ConduitRecipes.java index b37d6b1f..ab3032ea 100644 --- a/src/main/java/crazypants/enderio/conduit/ConduitRecipes.java +++ b/src/main/java/crazypants/enderio/conduit/ConduitRecipes.java @@ -76,6 +76,9 @@ public class ConduitRecipes { ItemStack exFilt = new ItemStack(EnderIO.itemExistingItemFilter); GameRegistry.addShapedRecipe(exFilt, " r ", "rfr", " c ", 'c', new ItemStack(Items.comparator, 1, 0), 'r', Items.redstone, 'f', advFilter); + ItemStack powerFilt = new ItemStack(EnderIO.itemPowerItemFilter); + GameRegistry.addShapedRecipe(powerFilt, " p ", "pcp", " p ", 'p', Items.paper, 'c', EnderIO.itemConduitProbe); + ClearFilterRecipe clearRec = new ClearFilterRecipe(); MinecraftForge.EVENT_BUS.register(clearRec); GameRegistry.addRecipe(clearRec); diff --git a/src/main/java/crazypants/enderio/conduit/gui/item/ItemSettings.java b/src/main/java/crazypants/enderio/conduit/gui/item/ItemSettings.java index 144b9cfe..ffb90568 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/item/ItemSettings.java +++ b/src/main/java/crazypants/enderio/conduit/gui/item/ItemSettings.java @@ -18,6 +18,7 @@ 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.item.filter.PowerItemFilter; import crazypants.enderio.conduit.packet.PacketExtractMode; import crazypants.enderio.conduit.packet.PacketItemConduitFilter; import crazypants.enderio.gui.ColorButton; @@ -269,6 +270,8 @@ public class ItemSettings extends BaseSettingsPanel { return new ExistingItemFilterGui(gui, itemConduit, isInput); } else if(filter instanceof ModItemFilter) { return new ModItemFilterGui(gui, itemConduit, isInput); + } else if(filter instanceof PowerItemFilter) { + return new PowerItemFilterGui(gui, itemConduit, isInput); } return null; } diff --git a/src/main/java/crazypants/enderio/conduit/gui/item/PowerItemFilterGui.java b/src/main/java/crazypants/enderio/conduit/gui/item/PowerItemFilterGui.java new file mode 100644 index 00000000..9515d769 --- /dev/null +++ b/src/main/java/crazypants/enderio/conduit/gui/item/PowerItemFilterGui.java @@ -0,0 +1,129 @@ +package crazypants.enderio.conduit.gui.item; + +import net.minecraft.client.gui.GuiButton; +import crazypants.enderio.conduit.gui.GuiExternalConnection; +import crazypants.enderio.conduit.item.IItemConduit; +import crazypants.enderio.conduit.item.filter.PowerItemFilter; +import crazypants.enderio.conduit.packet.PacketItemConduitFilter; +import crazypants.enderio.gui.IconEIO; +import crazypants.enderio.gui.ToggleButtonEIO; +import crazypants.enderio.network.PacketHandler; +import crazypants.util.Lang; + +public class PowerItemFilterGui implements IItemFilterGui { + + private static final int ID_STICKY = GuiExternalConnection.nextButtonId(); + + private static final int ID_MORE = GuiExternalConnection.nextButtonId(); + private static final int ID_LEVEL = GuiExternalConnection.nextButtonId(); + + private final IItemConduit itemConduit; + private final GuiExternalConnection gui; + + private final ToggleButtonEIO stickyB; + + private final GuiButton modeB; + private final GuiButton levelB; + + private final boolean isInput; + + private final PowerItemFilter filter; + + public PowerItemFilterGui(GuiExternalConnection gui, IItemConduit itemConduit, boolean isInput) { + this.gui = gui; + this.itemConduit = itemConduit; + this.isInput = isInput; + + if(isInput) { + filter = (PowerItemFilter) itemConduit.getInputFilter(gui.getDir()); + } else { + filter = (PowerItemFilter) itemConduit.getOutputFilter(gui.getDir()); + } + + int butLeft = 37; + int x = butLeft; + int y = 68; + + x += 20; + stickyB = new ToggleButtonEIO(gui, ID_STICKY, x, y, IconEIO.FILTER_STICKY_OFF, IconEIO.FILTER_STICKY); + String[] lines = Lang.localizeList("gui.conduit.item.stickyEnabled"); + stickyB.setSelectedToolTip(lines); + stickyB.setUnselectedToolTip(Lang.localize("gui.conduit.item.stickyDisbaled")); + stickyB.setPaintSelectedBorder(false); + + modeB = new GuiButton(ID_MORE, 0, 0, 40, 20, ""); + levelB = new GuiButton(ID_LEVEL, 0, 0, 40, 20, ""); + } + + @Override + public void mouseClicked(int x, int y, int par3) { + } + + @Override + public void updateButtons() { + if(!isInput) { + stickyB.onGuiInit(); + stickyB.setSelected(filter.isSticky()); + } + + int x0 = gui.getGuiLeft() + 80; + int y0 = gui.getGuiTop() + 65; + int x1 = x0 + 45; + + modeB.xPosition = x0; + modeB.yPosition = y0; + + levelB.xPosition = x1; + levelB.yPosition = y0; + + switch(filter.getMode()) { + case LESS: modeB.displayString = "<"; break; + case LESS_EQUAL: modeB.displayString = "<="; break; + case EQUAL: modeB.displayString = "="; break; + case MORE_EQUAL: modeB.displayString = ">="; break; + case MORE: modeB.displayString = ">"; break; + default: modeB.displayString = "??"; break; + } + + levelB.displayString = String.format("%d%%", filter.getLevel() * 100 / PowerItemFilter.MAX_LEVEL); + + gui.addButton(modeB); + gui.addButton(levelB); + } + + @Override + public void actionPerformed(GuiButton guiButton) { + if(guiButton.id == ID_STICKY) { + filter.setSticky(stickyB.isSelected()); + sendFilterChange(); + } else if(guiButton.id == ID_MORE) { + filter.setMode(filter.getMode().next()); + sendFilterChange(); + } else if(guiButton.id == ID_LEVEL) { + filter.setLevel((filter.getLevel() + 1) % (PowerItemFilter.MAX_LEVEL + 1)); + sendFilterChange(); + } + } + + private void sendFilterChange() { + updateButtons(); + PacketHandler.INSTANCE.sendToServer(new PacketItemConduitFilter(itemConduit, gui.getDir())); + } + + @Override + public void deactivate() { + stickyB.detach(); + gui.removeButton(modeB); + gui.removeButton(levelB); + } + + @Override + public void renderCustomOptions(int top, float par1, int par2, int par3) { +// GL11.glColor3f(1, 1, 1); +// RenderUtil.bindTexture("enderio:textures/gui/itemFilter.png"); +// gui.drawTexturedModalRect(gui.getGuiLeft() + 32, gui.getGuiTop() + 68, 0, 238, 18 * 5, 18); +// if(filter.isAdvanced()) { +// gui.drawTexturedModalRect(gui.getGuiLeft() + 32, gui.getGuiTop() + 86, 0, 238, 18 * 5, 18); +// } + } +} diff --git a/src/main/java/crazypants/enderio/conduit/item/filter/ItemPowerItemFilter.java b/src/main/java/crazypants/enderio/conduit/item/filter/ItemPowerItemFilter.java new file mode 100644 index 00000000..7b9c410c --- /dev/null +++ b/src/main/java/crazypants/enderio/conduit/item/filter/ItemPowerItemFilter.java @@ -0,0 +1,65 @@ +package crazypants.enderio.conduit.item.filter; + +import java.util.List; + +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumChatFormatting; +import net.minecraft.util.IIcon; +import net.minecraft.util.MathHelper; +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.TooltipAddera; +import crazypants.util.Lang; + +/** + * + * @author matthias + */ +public class ItemPowerItemFilter extends Item implements IItemFilterUpgrade { + + public static ItemPowerItemFilter create() { + ItemPowerItemFilter result = new ItemPowerItemFilter(); + result.init(); + return result; + } + + protected ItemPowerItemFilter() { + setCreativeTab(EnderIOTab.tabEnderIO); + setUnlocalizedName(ModObject.itemPowerItemFilter.unlocalisedName); + setHasSubtypes(true); + setMaxDamage(0); + setMaxStackSize(64); + } + + protected void init() { + GameRegistry.registerItem(this, ModObject.itemPowerItemFilter.unlocalisedName); + } + + @Override + public IItemFilter createFilterFromStack(ItemStack stack) { + IItemFilter filter = new PowerItemFilter(); + 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:filterUpgradePower"); + } + + @Override + public String getUnlocalizedName(ItemStack stack) { + return getUnlocalizedName(); + } + +} diff --git a/src/main/java/crazypants/enderio/conduit/item/filter/PowerItemFilter.java b/src/main/java/crazypants/enderio/conduit/item/filter/PowerItemFilter.java new file mode 100644 index 00000000..fa6d73ae --- /dev/null +++ b/src/main/java/crazypants/enderio/conduit/item/filter/PowerItemFilter.java @@ -0,0 +1,142 @@ +package crazypants.enderio.conduit.item.filter; + +import io.netty.buffer.ByteBuf; + +import java.util.Collections; +import java.util.List; + +import cofh.api.energy.IEnergyContainerItem; + +import net.minecraft.inventory.Slot; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import crazypants.enderio.conduit.item.NetworkedInventory; +import crazypants.enderio.network.NetworkUtil; + +/** + * + * @author matthias + */ +public class PowerItemFilter implements IItemFilter { + + public enum CmpMode { + LESS, + LESS_EQUAL, + EQUAL, + MORE_EQUAL, + MORE; + + public CmpMode next() { + CmpMode[] values = values(); + return values[(ordinal() + 1) % values.length]; + } + } + + public static final int MAX_LEVEL = 4; + + CmpMode mode = CmpMode.EQUAL; + boolean sticky; + int level = MAX_LEVEL; + + @Override + public boolean doesItemPassFilter(NetworkedInventory inv, ItemStack item) { + if(item != null && item.getItem() instanceof IEnergyContainerItem) { + IEnergyContainerItem chargable = (IEnergyContainerItem) item.getItem(); + + int max = chargable.getMaxEnergyStored(item); + int cur = chargable.getEnergyStored(item); + int ref = (int)((long)max * level / MAX_LEVEL); + + switch (mode) { + case LESS: return cur < ref; + case LESS_EQUAL: return cur <= ref; + case EQUAL: return cur == ref; + case MORE_EQUAL: return cur >= ref; + case MORE: return cur > ref; + default: return false; + } + } + return false; + } + + @Override + public boolean doesFilterCaptureStack(NetworkedInventory inv, ItemStack item) { + boolean res = sticky && doesItemPassFilter(inv, item); + return res; + } + + @Override + public boolean isValid() { + return true; + } + + @Override + public boolean isSticky() { + return sticky; + } + + public void setSticky(boolean sticky) { + this.sticky = sticky; + } + + @Override + public List getSlots(int xOffset, int yOffset) { + return Collections.emptyList(); + } + + @Override + public int getSlotCount() { + return 0; + } + + public CmpMode getMode() { + return mode; + } + + public void setMode(CmpMode mode) { + this.mode = mode; + } + + public int getLevel() { + return level; + } + + public void setLevel(int level) { + this.level = level; + } + + @Override + public void readFromNBT(NBTTagCompound nbtRoot) { + readSettingsFromNBT(nbtRoot); + } + + protected void readSettingsFromNBT(NBTTagCompound nbtRoot) { + mode = CmpMode.values()[nbtRoot.getByte("mode") & 255]; + level = nbtRoot.getShort("level"); + sticky = nbtRoot.getBoolean("sticky"); + } + + @Override + public void writeToNBT(NBTTagCompound nbtRoot) { + writeSettingToNBT(nbtRoot); + } + + protected void writeSettingToNBT(NBTTagCompound nbtRoot) { + nbtRoot.setByte("mode", (byte)mode.ordinal()); + nbtRoot.setShort("level", (short)level); + nbtRoot.setBoolean("sticky", sticky); + } + + @Override + public void writeToByteBuf(ByteBuf buf) { + NBTTagCompound settingsTag = new NBTTagCompound(); + writeSettingToNBT(settingsTag); + NetworkUtil.writeNBTTagCompound(settingsTag, buf); + } + + @Override + public void readFromByteBuf(ByteBuf buf) { + NBTTagCompound settingsTag = NetworkUtil.readNBTTagCompound(buf); + readSettingsFromNBT(settingsTag); + } +}