diff --git a/resources/assets/enderio/lang/en_US.lang b/resources/assets/enderio/lang/en_US.lang index 08fcea6c..a3bf4d63 100644 --- a/resources/assets/enderio/lang/en_US.lang +++ b/resources/assets/enderio/lang/en_US.lang @@ -58,6 +58,8 @@ enderio.itemItemConduit.name=Item Conduit enderio.filterUpgradeBasic.name=Basic Item Filter enderio.filterUpgradeAdvanced.name=Advanced Item Filter +enderio.filterUpgradeBig.name=Big Item Filter +enderio.filterUpgradeBigAdvanced.name=Big Advanced Item Filter enderio.itemConduitFilterUpgrade=Upgrade for item conduits enderio.itemConduitFilterUpgrade.configured=Configured diff --git a/resources/assets/enderio/textures/items/filterUpgradeBig.png b/resources/assets/enderio/textures/items/filterUpgradeBig.png new file mode 100644 index 00000000..d4b3bdba Binary files /dev/null and b/resources/assets/enderio/textures/items/filterUpgradeBig.png differ diff --git a/resources/assets/enderio/textures/items/filterUpgradeBigAdvanced.png b/resources/assets/enderio/textures/items/filterUpgradeBigAdvanced.png new file mode 100644 index 00000000..713ce9e4 Binary files /dev/null and b/resources/assets/enderio/textures/items/filterUpgradeBigAdvanced.png differ diff --git a/resources/assets/enderio/textures/items/filterUpgradeBigAdvanced.png.mcmeta b/resources/assets/enderio/textures/items/filterUpgradeBigAdvanced.png.mcmeta new file mode 100644 index 00000000..184cd629 --- /dev/null +++ b/resources/assets/enderio/textures/items/filterUpgradeBigAdvanced.png.mcmeta @@ -0,0 +1,10 @@ +{ + "animation": { + "frames": [ + {"index":0, "time":140}, + {"index":1, "time":2}, + {"index":0, "time":155}, + {"index":1, "time":3} + ] + } +} \ No newline at end of file diff --git a/src/main/java/crazypants/enderio/EnderIO.java b/src/main/java/crazypants/enderio/EnderIO.java index 51b833be..f6f916a6 100644 --- a/src/main/java/crazypants/enderio/EnderIO.java +++ b/src/main/java/crazypants/enderio/EnderIO.java @@ -450,7 +450,7 @@ public class EnderIO { itemOCConduit = ItemOCConduit.create(); itemBasicFilterUpgrade = ItemBasicItemFilter.create(); - // itemBigFilterUpgrade = ItemBigItemFilter.create(); + itemBigFilterUpgrade = ItemBigItemFilter.create(); itemExistingItemFilter = ItemExistingItemFilter.create(); itemModItemFilter = ItemModItemFilter.create(); itemPowerItemFilter = ItemPowerItemFilter.create(); diff --git a/src/main/java/crazypants/enderio/conduit/item/filter/ItemBigItemFilter.java b/src/main/java/crazypants/enderio/conduit/item/filter/ItemBigItemFilter.java index 1ff449d5..02c9bd00 100644 --- a/src/main/java/crazypants/enderio/conduit/item/filter/ItemBigItemFilter.java +++ b/src/main/java/crazypants/enderio/conduit/item/filter/ItemBigItemFilter.java @@ -48,6 +48,13 @@ public class ItemBigItemFilter extends ItemBasicItemFilter { return filter; } + @Override + @SideOnly(Side.CLIENT) + public IIcon getIconFromDamage(int damage) { + damage = MathHelper.clamp_int(damage, 0, 1); + return icons[damage]; + } + @Override @SideOnly(Side.CLIENT) public void registerIcons(IIconRegister IIconRegister) {