diff --git a/resources/assets/enderio/lang/en_US.lang b/resources/assets/enderio/lang/en_US.lang index 15fb4808..fbe6b1b3 100644 --- a/resources/assets/enderio/lang/en_US.lang +++ b/resources/assets/enderio/lang/en_US.lang @@ -45,6 +45,11 @@ enderio.itemLiquidConduit.tooltip.tooltip.detailed.line3=viscosity enderio.itemItemConduit.name=Item Conduit enderio.itemItemConduitEmpowered.name=Empowered Item Conduit +enderio.filterUpgradeBasic.name=Basic Item Filter +enderio.filterUpgradeAdvanced.name=Advanced Item Filter +enderio.itemConduitFilterUpgrade=Upgrade for item conduits +enderio.itemConduitFilterUpgrade.configured=Configured + enderio.itemMeConduit.name=ME Conduit //Materials diff --git a/resources/assets/enderio/textures/items/filterUpgradeAdvanced.png b/resources/assets/enderio/textures/items/filterUpgradeAdvanced.png new file mode 100644 index 00000000..3e66086e Binary files /dev/null and b/resources/assets/enderio/textures/items/filterUpgradeAdvanced.png differ diff --git a/resources/assets/enderio/textures/items/filterUpgradeBasic.png b/resources/assets/enderio/textures/items/filterUpgradeBasic.png new file mode 100644 index 00000000..e9faeb65 Binary files /dev/null and b/resources/assets/enderio/textures/items/filterUpgradeBasic.png differ diff --git a/src/main/java/crazypants/enderio/EnderIO.java b/src/main/java/crazypants/enderio/EnderIO.java index 7a27e576..bc64d0b2 100644 --- a/src/main/java/crazypants/enderio/EnderIO.java +++ b/src/main/java/crazypants/enderio/EnderIO.java @@ -27,6 +27,7 @@ import crazypants.enderio.conduit.ConduitRecipes; import crazypants.enderio.conduit.facade.BlockConduitFacade; import crazypants.enderio.conduit.facade.ItemConduitFacade; import crazypants.enderio.conduit.geom.ConduitGeometryUtil; +import crazypants.enderio.conduit.item.ItemBasicItemFilter; import crazypants.enderio.conduit.item.ItemItemConduit; import crazypants.enderio.conduit.liquid.ItemLiquidConduit; import crazypants.enderio.conduit.power.ItemPowerConduit; @@ -138,6 +139,7 @@ public class EnderIO { public static ItemPowerConduit itemPowerConduit; public static ItemLiquidConduit itemLiquidConduit; public static ItemItemConduit itemItemConduit; + public static ItemBasicItemFilter itemBasicFilterUpgrade; // Machines public static BlockStirlingGenerator blockStirlingGenerator; @@ -247,6 +249,8 @@ public class EnderIO { itemPowerConduit = ItemPowerConduit.create(); itemLiquidConduit = ItemLiquidConduit.create(); itemItemConduit = ItemItemConduit.create(); + + itemBasicFilterUpgrade = itemBasicFilterUpgrade.create(); Fluid f = new Fluid(Fluids.NUTRIENT_DISTILLATION_NAME).setDensity(1500).setViscosity(3000); FluidRegistry.registerFluid(f); diff --git a/src/main/java/crazypants/enderio/ModObject.java b/src/main/java/crazypants/enderio/ModObject.java index 002bc689..271049f8 100644 --- a/src/main/java/crazypants/enderio/ModObject.java +++ b/src/main/java/crazypants/enderio/ModObject.java @@ -12,6 +12,7 @@ public enum ModObject { itemRedstoneConduit, itemItemConduit, itemMeConduit, + itemBasicFilterUpgrade, // Power itemPowerConduit, diff --git a/src/main/java/crazypants/enderio/conduit/AbstractConduit.java b/src/main/java/crazypants/enderio/conduit/AbstractConduit.java index 15ee1500..d6d14f39 100644 --- a/src/main/java/crazypants/enderio/conduit/AbstractConduit.java +++ b/src/main/java/crazypants/enderio/conduit/AbstractConduit.java @@ -11,6 +11,7 @@ import java.util.Set; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; @@ -70,6 +71,11 @@ public abstract class AbstractConduit implements IConduit { return ConnectionMode.IN_OUT; } + @Override + public List getDrops() { + return Collections.singletonList(createItem()); + } + @Override public void setConnectionMode(ForgeDirection dir, ConnectionMode mode) { ConnectionMode oldVal = conectionModes.get(dir); diff --git a/src/main/java/crazypants/enderio/conduit/BlockConduitBundle.java b/src/main/java/crazypants/enderio/conduit/BlockConduitBundle.java index 50169769..5fc87195 100644 --- a/src/main/java/crazypants/enderio/conduit/BlockConduitBundle.java +++ b/src/main/java/crazypants/enderio/conduit/BlockConduitBundle.java @@ -377,7 +377,7 @@ public class BlockConduitBundle extends BlockEio implements IGuiHandler { if(con.getConduitConnections().isEmpty() && con.getExternalConnections().isEmpty() && ConduitUtil.renderConduit(player, con)) { te.removeConduit(con); - drop.add(con.createItem()); + drop.addAll(con.getDrops()); droppedUnconected = true; } } @@ -386,7 +386,7 @@ public class BlockConduitBundle extends BlockEio implements IGuiHandler { for (IConduit con : cons) { if(ConduitUtil.renderConduit(player, con)) { te.removeConduit(con); - drop.add(con.createItem()); + drop.addAll(con.getDrops()); } } } @@ -394,7 +394,7 @@ public class BlockConduitBundle extends BlockEio implements IGuiHandler { IConduit con = te.getConduit(type); if(con != null) { te.removeConduit(con); - drop.add(con.createItem()); + drop.addAll(con.getDrops()); } } diff --git a/src/main/java/crazypants/enderio/conduit/IConduit.java b/src/main/java/crazypants/enderio/conduit/IConduit.java index 2b5d5ed9..76ab39ca 100644 --- a/src/main/java/crazypants/enderio/conduit/IConduit.java +++ b/src/main/java/crazypants/enderio/conduit/IConduit.java @@ -21,6 +21,8 @@ public interface IConduit { Class getBaseConduitType(); ItemStack createItem(); + + List getDrops(); int getLightValue(); diff --git a/src/main/java/crazypants/enderio/conduit/gui/BasicItemFilterGui.java b/src/main/java/crazypants/enderio/conduit/gui/BasicItemFilterGui.java index b2ea70f9..a2559729 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/BasicItemFilterGui.java +++ b/src/main/java/crazypants/enderio/conduit/gui/BasicItemFilterGui.java @@ -34,8 +34,7 @@ public class BasicItemFilterGui { private IconButtonEIO whiteListB; private ToggleButtonEIO useOreDictB; private ToggleButtonEIO stickyB; - - + boolean isAdvanced; boolean isInput; diff --git a/src/main/java/crazypants/enderio/conduit/gui/FilterUpgradeInventory.java b/src/main/java/crazypants/enderio/conduit/gui/FilterUpgradeInventory.java index eba22604..a6f33820 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/FilterUpgradeInventory.java +++ b/src/main/java/crazypants/enderio/conduit/gui/FilterUpgradeInventory.java @@ -5,6 +5,7 @@ import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraftforge.common.util.ForgeDirection; import crazypants.enderio.conduit.item.IItemConduit; +import crazypants.enderio.conduit.item.IItemFilterUpgrade; public class FilterUpgradeInventory implements IInventory { @@ -113,8 +114,11 @@ public class FilterUpgradeInventory implements IInventory { } @Override - public boolean isItemValidForSlot(int var1, ItemStack var2) { - return true; + public boolean isItemValidForSlot(int var1, ItemStack item) { + if(item == null) { + return false; + } + return item.getItem() instanceof IItemFilterUpgrade; } diff --git a/src/main/java/crazypants/enderio/conduit/item/FilterRegister.java b/src/main/java/crazypants/enderio/conduit/item/FilterRegister.java index aed62a85..65e66636 100644 --- a/src/main/java/crazypants/enderio/conduit/item/FilterRegister.java +++ b/src/main/java/crazypants/enderio/conduit/item/FilterRegister.java @@ -44,19 +44,20 @@ public class FilterRegister { if(stack == null) { return null; } - - IItemFilter res = null; - if(stack != null && stack.getItem() == Items.paper) { - res = new ItemFilter(true); - } else if(stack != null && stack.getItem() == Items.stick) { - res = new ItemFilter(false); - } - if(res != null && stack.stackTagCompound != null && stack.stackTagCompound.hasKey("filter")) { - res.readFromNBT(stack.stackTagCompound.getCompoundTag("filter")); - } + if( ! (stack.getItem() instanceof IItemFilterUpgrade) ) { + return null; + } + IItemFilterUpgrade upgrade = (IItemFilterUpgrade)stack.getItem(); + IItemFilter res = upgrade.createFilterFromStack(stack); return res; } + public static void loadFilterFromStack(IItemFilter filter, ItemStack stack) { + if(stack != null && stack.stackTagCompound != null && stack.stackTagCompound.hasKey("filter")) { + filter.readFromNBT(stack.stackTagCompound.getCompoundTag("filter")); + } + } + public static void writeFilterToStack(IItemFilter filter, ItemStack stack) { if(stack == null || filter == null) { return; @@ -66,12 +67,11 @@ public class FilterRegister { if(stack.stackTagCompound == null) { stack.stackTagCompound = new NBTTagCompound(); } - stack.stackTagCompound.setTag("filter", filterRoot); - stack.setStackDisplayName("Configured"); - - //System.out.println("FilterRegister.writeFilterToStack: " + stack.stackTagCompound); - - + stack.stackTagCompound.setTag("filter", filterRoot); + } + + public static boolean isFilterSet(ItemStack stack) { + return stack != null && stack.stackTagCompound != null && stack.stackTagCompound.hasKey("filter"); } } diff --git a/src/main/java/crazypants/enderio/conduit/item/IItemFilterUpgrade.java b/src/main/java/crazypants/enderio/conduit/item/IItemFilterUpgrade.java new file mode 100644 index 00000000..da962eb9 --- /dev/null +++ b/src/main/java/crazypants/enderio/conduit/item/IItemFilterUpgrade.java @@ -0,0 +1,9 @@ +package crazypants.enderio.conduit.item; + +import net.minecraft.item.ItemStack; + +public interface IItemFilterUpgrade { + + IItemFilter createFilterFromStack(ItemStack stack); + +} diff --git a/src/main/java/crazypants/enderio/conduit/item/ItemBasicItemFilter.java b/src/main/java/crazypants/enderio/conduit/item/ItemBasicItemFilter.java new file mode 100644 index 00000000..059cb272 --- /dev/null +++ b/src/main/java/crazypants/enderio/conduit/item/ItemBasicItemFilter.java @@ -0,0 +1,95 @@ +package crazypants.enderio.conduit.item; + +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.util.Lang; + +public class ItemBasicItemFilter extends Item implements IItemFilterUpgrade { + + public static ItemBasicItemFilter create() { + ItemBasicItemFilter result = new ItemBasicItemFilter(); + result.init(); + return result; + } + + private final IIcon[] icons; + + protected ItemBasicItemFilter() { + setCreativeTab(EnderIOTab.tabEnderIO); + setUnlocalizedName(ModObject.itemBasicFilterUpgrade.unlocalisedName); + setHasSubtypes(true); + setMaxDamage(0); + setMaxStackSize(64); + + icons = new IIcon[2]; + } + + protected void init() { + GameRegistry.registerItem(this, ModObject.itemBasicFilterUpgrade.unlocalisedName); + } + + @Override + public IItemFilter createFilterFromStack(ItemStack stack) { + int damage = MathHelper.clamp_int(stack.getItemDamage(), 0, 1); + ItemFilter filter; + if(damage == 0) { + filter = new ItemFilter(false); + } else { + filter = new ItemFilter(true); + } + FilterRegister.loadFilterFromStack(filter, stack); + return filter; + } + + @Override + public IIcon getIconFromDamage(int damage) { + damage = MathHelper.clamp_int(damage, 0, 1); + return icons[damage]; + } + + @Override + public void registerIcons(IIconRegister IIconRegister) { + + icons[0] = IIconRegister.registerIcon("enderio:filterUpgradeBasic"); + icons[1] = IIconRegister.registerIcon("enderio:filterUpgradeAdvanced"); + + } + + @Override + public String getUnlocalizedName(ItemStack par1ItemStack) { + int i = MathHelper.clamp_int(par1ItemStack.getItemDamage(), 0, 1); + return i == 0 ? "enderio.filterUpgradeBasic" : "enderio.filterUpgradeAdvanced"; + } + + @Override + @SuppressWarnings({ "rawtypes", "unchecked" }) + public void getSubItems(Item par1, CreativeTabs par2CreativeTabs, List par3List) { + for (int j = 0; j < 2; ++j) { + par3List.add(new ItemStack(this, 1, j)); + } + } + + @Override + @SideOnly(Side.CLIENT) + public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { + par3List.add(Lang.localize("itemConduitFilterUpgrade")); + if(FilterRegister.isFilterSet(par1ItemStack)) { + par3List.add(EnumChatFormatting.ITALIC + Lang.localize("itemConduitFilterUpgrade.configured")); + } + + } + +} diff --git a/src/main/java/crazypants/enderio/conduit/item/ItemConduit.java b/src/main/java/crazypants/enderio/conduit/item/ItemConduit.java index ad3e8139..11e45bac 100644 --- a/src/main/java/crazypants/enderio/conduit/item/ItemConduit.java +++ b/src/main/java/crazypants/enderio/conduit/item/ItemConduit.java @@ -1,5 +1,7 @@ package crazypants.enderio.conduit.item; +import java.util.ArrayList; +import java.util.Collections; import java.util.EnumMap; import java.util.HashMap; import java.util.List; @@ -123,6 +125,22 @@ public class ItemConduit extends AbstractConduit implements IItemConduit { extractRatePerTick = 0.2f; //four items a second } } + + @Override + public List getDrops() { + List res = new ArrayList(); + res.add(createItem()); + for(ItemStack stack : speedUpgrades.values()) { + res.add(stack); + } + for(ItemStack stack : inputFilterUpgrades.values()) { + res.add(stack); + } + for(ItemStack stack : outputFilterUpgrades.values()) { + res.add(stack); + } + return res; + } @Override public boolean onBlockActivated(EntityPlayer player, RaytraceResult res, List all) {